Commit Graph

245 Commits

Author SHA1 Message Date
TsjipTsjip
cc47fb2712 Kettle update (#20808)
* Kettle map upload

* Kettle map proto upload
2023-10-07 14:00:34 -06:00
TsjipTsjip
14256dee03 Barratry seniors (#20720)
* Update barratry proto to accomodate senior roles

* Add senior role spawnpoints to barratry
2023-10-05 03:14:36 -06:00
Moony
d5aa958421 Derotate Core pending improvement. (#20262)
Lot of long-standing problems with the map at this time. Derotating until resolved.
2023-09-16 14:09:05 -06:00
Ubaser
9c2f11d0eb Add map "Europa" (#19930)
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2023-09-13 22:22:21 +10:00
lzk
85de6ffcf4 Sort jobs in map prototypes (#19910)
* Update aspid.yml

* Update barratry.yml

* Update cluster.yml

* Update kettle.yml

* Update saltern.yml

* Update origin.yml
2023-09-08 13:43:19 -06:00
Nemanja
4d677f0685 1v1 me first to 31 no powerups [Deathmatch Gamemode] (#19467)
Co-authored-by: Kara <lunarautomaton6@gmail.com>
2023-08-30 18:06:15 -07:00
brainfood1183
8195690b8c Origin Station Update 26.08.2023 (jrpacman, borg roles) (#19568) 2023-08-26 19:33:24 -06:00
Emisse
8940ce9220 Fland update (#19524)
* fland update

* proto
2023-08-25 01:38:39 -06:00
Emisse
51e7ad1102 Meta update (#19520)
* meta update

* proto
2023-08-25 01:38:34 -06:00
Emisse
4db22b4b85 Marathon update (#19519)
* marathon update

* proto
2023-08-25 01:38:26 -06:00
Emisse
cdcd3497c9 Box update (#19518)
* box update

* proto
2023-08-25 01:36:47 -06:00
Emisse
580f947cf8 Bagel update (#19517)
* map

* proto
2023-08-25 01:36:40 -06:00
TsjipTsjip
222b40ad49 Kettle QoL (#19443)
* Robotics QoL

* Add note pointing chemists to the drain in morgue

* Add senior role spawns

* Add senior roles to kettle map prototype
2023-08-23 20:02:37 -06:00
LankLTE
2c21f48786 update s (#19453) 2023-08-23 20:00:19 -06:00
LankLTE
4e7f10498a boegs (#19466) 2023-08-23 19:58:51 -06:00
LankLTE
0ed40bd23a roundstart borgs (#19465) 2023-08-23 19:58:38 -06:00
LankLTE
1ca36a4e7b cyborg n seniors (#19464) 2023-08-23 19:57:21 -06:00
LankLTE
3589cb6002 borgs n warp points (#19463) 2023-08-23 19:56:56 -06:00
Nairod
1d9804ca4d Saltern Revamp (#19240)
* Saltern Revamp

* Review

* The pipes! What do they mean?
2023-08-18 03:57:36 -06:00
Emisse
1386daaed9 Barratry (#19190)
* barratry update

* Update barratry.yml
2023-08-15 18:37:30 -06:00
Pieter-Jan Briers
a242af506e Adds the thermo-electric generator (#18840)
* Basic TEG start.

Connects via node group.

* Basic TEG test map

* Sensor monitoring basics, TEG circulator flow

* Basic power generation (it doesn't work)

* More sensor monitoring work

* Battery (SMES) monitoring system.

* Sensor monitoring fixes

Make it work properly when mapped.

* Test map improvements

* Revise TEG power output mechanism.

Now uses a fixed supplier with a custom ramping system.

* TEG test map fixes

* Make air alarms and pumps open UI on activate.

* Clean up thermo machines power switch.

Removed separate Enabled bool from the component that always matched the power receiver's state.

This enables adding a PowerSwitch component to give us alt click/verb menu.

* TEG but now fancy

* Make sensor monitoring console obviously WiP to mappers.

* Vending machine sound, because of course.

* Terrible, terrible graph background color

* Examine improvements for the TEG.

* Account for electrical power when equalizing gas mixtures.

* Get rid of the TegCirculatorArrow logic.

Use TimedDespawn instead. The "no show in right-click menuu" goes into a new general-purpose component.

Thanks Julian.

* Put big notice of "not ready, here's why" on the sensor monitoring console.

* TryGetComponent -> TryComp

* Lol there's a HideContextMenu tag

* Test fixes

* Guidebook for TEG

Fixed rotation on GuideEntityEmbed not working correctly.

Added Margin property to GuideEntityEmbed

* Make TEG power bar default to invisible.

So it doesn't appear in the guidebook and spawn menu.
2023-08-12 15:41:55 -05:00
brainfood1183
7957a941c0 Origin Station Update 10.08.2023 (reporter added and new asteroid floors). (#18969) 2023-08-10 14:01:32 -06:00
Ubaser
f604d48c2e update (#18445)
- Remove cap gun ammo
- Add cameras around singulo
- Add wires below rd office grilles
- Remove tiles below rage cage grilles
- Add fax machine to library
- Make command and camera window be zappy
- Remove perma hatchet and scythe
- Fix sci artifact doors
- Add curtains to dorm rooms
- Power air alarm in command
- Fix apc outside sci
- Add a headslime to virology
- Remove the centcom gas mask
- Add a grille to chapel room
- Open up atmos a bit
- Add senior roles
- Dim maints by A LOT
- Change perma mv to lv
- Add mass news console to reporter room
- Fix engi floor outside ame room
- In ame room, move racks to left and controller/fuel to right
- Fix substation room below engineering, AA and missing tile
- Add roundstart telecomms and remove note
2023-07-29 23:27:21 -06:00
brainfood1183
b13c72b2ab added senior roles, added coffins and graves. (#18404) 2023-07-28 13:51:28 -06:00
Emisse
2ed9c7a229 Packed update (#18316)
* packed update

* Update packed.yml
2023-07-25 23:41:08 -06:00
Emisse
d42051d0e5 Omega update (#18315)
* omega update

* Update omega.yml
2023-07-25 23:41:02 -06:00
Emisse
28c5f37570 Meta update (#18314)
* meta update

* Update meta.yml

* Update meta.yml

* meta
2023-07-25 23:40:56 -06:00
Emisse
13da6841b1 Marathon update (#18313)
* marathon update

* Update marathon.yml
2023-07-25 23:32:37 -06:00
Emisse
7a4c30de2d Fland update (#18312)
* fland update

* fland

* Update fland.yml
2023-07-25 23:32:26 -06:00
Emisse
39a057f290 Box update (#18311)
* box update

* fuck

* Update box.yml

* box
2023-07-25 23:32:16 -06:00
Emisse
e38d4516e6 Bagel update (#18310)
* prototype cock and ball torture

* christ lives

* Update bagel.yml

* interrogator lamp i forgot existed

* so true
2023-07-25 23:32:08 -06:00
Emisse
84b6addf69 Retire Moose 2 (#18265)
* Delete moose.yml

* Update default.yml

* Delete moose.yml
2023-07-24 14:45:32 -06:00
Filler
809df62a8a Box station psychologist (#18174) 2023-07-20 00:50:47 -06:00
Ubaser
54fc803fdd Core: NEW station map (#17269)
* add map

(in resources)

* Edit 1

- replace transit evac with rod evac
- add prototype for map

* Add reporter in the list of jobs

* add to pools

* fix issues

* fix more issues

* reintroduced transit

i was dumb and removed it for whatever reason

* Minor changes

- fixed an atmos light
- removed a bunch of tiny fans
- removed ratking spawns
- switched out microwave in evac
- lower weh count
- change some dorm glass to wall
- fix some maint doors not being locked
- change reinforced window to normal one in tool room and boxer hallway
- add janitorial trolley
- greatly shorten solar array
- increase size of disposal pad
- fix airlocks in bridge
- change entrance into vault room
- fix SMES bank
- change kitchen table
- change posters being on top of windows
- add more gear to the armory
- change rails to directional reinforced windows in security
- change sec entrance to brig
- change warden doors to armory
- remove a spare light in med
- adjust chem layout and add a secondary entrance
- have the chem entrance accessible to maints
- remove defib in cargo
- shrink QM's room
- add missing blast door button in cargo
- fixed one of the maints doors being engi locked
- switch det drobe in maints to a winterdrobe
- changed a wall to a door in maints
- remove a couple lights in med
- add missing tiles in med
- removed microwave and grinder in maints
- add med-maints connection
- change maints gold room to solid and rusted walls
- change carp room to a butchering room
- move atmos fireaxe further
- change cat ears for magician tophat

* power fix

- electrified the singulo grilles
- (hopefully?) fixed the save file
- potentially fixed grav SMES
- add more APCs to fix power in sci

* improve arrivals and other misc fixes

- fix sci and maints APCs
- improve arrivals
- add new decal
- add myself in map_attributions.txt
- add latejoin spawnpoint

* address other fixes

- change png to lowercase (potentially fixing the "invalid rsi" error)
- add reporter spawns
- add more fire alarms
- add a note to cryo

* small changes

- expand maints around atmos
- add rad shutters to singulo
- remove a tiny fan i missed in engi
- add windows in maints around the bottom of the artifact room
- remove the double wall in disposals
- replace a couple beds in med with stasis ones
- remove the table with the charger in sec and move the charger to warden desk
- change front det walls to reinforced

* balanced solar panels

- made the south solar panel smaller
- added a new solar panel around maints bar

* improve med slightly and temp. remove arrivals

- add a missing medirobe
- add more chairs to med
- increase the number of starting med kits
- TEMPORARILY remove arrivals

* readd arrivals and add more maints + minor tweaks

tweaks include adding an electric fence around perma

* tweaks

- add a couple hardsuits to atmos
- add robotics to sci
- add atv to sci
- half the gold count in maints
- fixed a double meal spawner in dining
- clown now has a spare backpack and mime has a spare crayon
- bridge has less chairs

* hopefully fix conflict

* fix conflicts (maybe)

(and actually add the tweaks since i forgot to copy it over)

* attempt to fix conflict

* re-add core to map pool

* temporarily remove evac rod

* delete map pools

* re-add map pool

* for the final time i am re-adding the rod

* forgot to re-add to map pool

* changes

kind of too tired to write, but lots of tweaks and ai room+ computer board room, and uh pondering orb + onstation asteroid

* next update

- shrink solars
- fix some cabling going under walls
- fix evac substation not recieving power
- made the arrivals "disposals" have a stronger indication
- changed reinforced windows to normal windows in maints (the thin type)
- remove most double walls
- add flap to disposals
- fix SMES crossings, removed one at solar + other issues
- moved a set of cafeteria/dining area airlocks up
- removed a bardrobe in maints
- added extra dining tables to the north of kitchen
- add more maints around security
- removed maints mine
- added exam signs to medical
- added toolboxes to greytider church
- removed one of the booze-o-mats from maints
- changed the floor in the artifact corridor
- added rusted door to a secret room
- removed spare R&D server
- improved flooring in captain bedroom
- moved the firelocks touching R&D blast doors
- moved the water cooler that was outside engineering
- added water cups to engineering break room
- added a bunch of missing tiles underneath doors
- changed the maints chemistry door to an actual maints door
- changed a couple tile types beneath doors
- added bananaphone to clown room
- added missing bedsheets
- removed some food from cafeteria/dining hall
- switched vendomat in warden office to the security one
- slightly redecorated chapel decals
- switched out hop's mass scanner for a station record one
- rotated medical front desk computer to face north and added a crew monitor one as well
- moved medical techfab and added two paramedic lockers

* forgot to add some changes

- rotated salvage magnet up
- added filing cabinets to head rooms (QM, captain, HOS)
- replace surgical prep beds with normal ones
- add more decor to exam rooms including medical items and posters
- added a couple tools on the surgery room table

* updating minor things

yes

* Playtest+review changes

- add librarian bedsheet
- remove sink in janitor room
- fix eva disposals
- add chem clothing vendor
- fix north solar door not being locked
- add mice spawns
- add more microwaves
- change med front door to glass variant
- add more food vending machines to cargo + med
- add tools+insuls to cargo
- add more radiation suits
- add more cig vendors
- replace an R&D computer with spare command telecomms (currently in vault)
- fix atmos by replacing the gas room air vents with passive variant
- add spare crowbars in arrivals
- name the radiation shutters button
- add extra spray and mop to janitorials
- fixed an apc
- add screwdriver to telecomms crate
- fix armory closet
- remove a couple oxygen/nitrogen canisters in atmos
- change eva room permissions
- fixed some tiles below airlocks being missing
- fix double wall in cargo
- added a couple windows to treatment rooms in med
- remove soda and booze dispenser in bridge
- POTENTIALLY fix power around PA
- slightly tweaked the asteroid
- slightly tweaked atmos
- added an extra secret
- added joints to musician room
- add an autodrobe
- added another clothesmate
- potentially fixing broken maints airlocks
- make the rad shutters be down by default

* re-add missing files that break the map

* forgot to add core to pool

* updates

- change externals airlocks in arrivals to glass
- change the tiles below medical doors to the mono type
- switch the unused tabls in tool storage to chairs
- add an anatomy poster to medical
- change the glass wall in front of the bookshelf at QM office to solid
- switch two of the blast doors at cargo to airtight plastic flaps
- rename the cargo blast door button
- relocating the firelock in the arcade room to under the maints door and adding a black carpet
- add the command encryption key to the spare vault telecomms
- add a pai to bridge and a couple station maps
- add a couple cryoxadone and cryostasis beakers to cryo
- add radiation signs for the corridors outside singulo
- add a couple butterfly spawners to zookeeper enclosure
- add random t3 part spawner to science
- add DAW board to board room
- add a cursed chair randomly in maints
- change warden secure window to armory locked
- add an omega soap to hop bathroom
- add a christmas-themed maintenance room to the right of perma
- add bunny ears as a maints spawn
- add a rage cage in maintenance (including thunderdome helmets)
- add a fancy and xmas crown to maints
- add an extra large beaker to medical
- tweaked the flooring slightly in evac lounge
- another seperated small asteroid to the south
- change how the prison grilles look slightly
- add a few commons keys to the rack in telecomms
- change sci anom lights to normal type
- add a few chairs to ame room
- put ame scribbles in ame room, and removed the one in chapel
- add a microphone to reporter room
- covered the waste pipe above disposals so you cant see it

* more and fixes

- add a defib cabinet to rage cage
- change rage cage grilles to entirely LV using APC in power room
- add a window to the other side of the desk with greytider church
- add another way into maints through salvage door on other side of surgery
- add a cup next to the poison wine bottle
- add ambuzol syringe to viro
- add more reinforced glass floors and fix flooring issues
- add a button to blast door perma
- add trash to perma + trash bag
- add phone to bridge
- add a body bag to chapel
- add glass shards in maints
- make an engineering room with spare thrusters and other mats
- change number of vault lights from 3 to 2
- add "antenna" lattice spikes to exterior
- add a scrubber/vent to rage cage

* additions

- add more radiation meds, specifically in medical and all head lockers
- added a broken down ship connected to maints
- remove one light in weh room
- add wooden baton spawn in maints
- add a blast door to vault front that only captain has a remote signaller to
- slightly redecorated perma
- switch the glass floors in dorms to reinforced
- add cleanbot spawn to the cafeteria
- add the sign "THE SINGULO" to bar
- add bee mask to maints loot
- add blue banners to conference room
- add default body bag spawn to cloner/shredder
- add brigmed headset spawn to the brigmed secret
- add medical beret spawn to medical
- add combat medical kit to hos spawn

* more

- added blahaj to medical front desk
- add power monitoring + solar control computer to engineering
- add a jetpack to engineering
- add CE winter coat to CE
- switch the burger on kitchen front desk to jelly donut
- add tool closet to tool room
- add bar stools outside kitchen
- add wall emergency closets/fire closets
- add toolboxes to tool room
- change one of the doors leading to grav to highseccommandlocked
- add a spare appraisal tool and two hand labellers to QM's office
 -add a cargo bounty computer to cargo
- add a button to optionally close shutters in the two stasis rooms
- add genedrobe to cloner/shredder room
- fix the tile underneath cmo office
- add rusted wall to weh room
- remove an extra mv in rage cage room
- add medical beret spawn to med
- fix rage cage power

* fix broken shuttle object rotations

* tiny tweaks

- switch one of the nitrogen canisters in atmos to plasma
- switch brigmed secret to bananium honker

* emisse review

- remove zookeeper spawn and make the room accessible
- double reinforce armory and add an optional blast door
- make maints in sec more accessible
- remvoe disablers in armory and put disabler safe in sec gear room
- fix missing door in christmas room
- switch maints nitrous oxide tank to storage type
- remove presents under christmas tree and put cookies on table
- add another maints entrance around singulo
- add nutrimax to hydroponics
- add intercom to engi front door
- remove golden clown shoes in vault
- switch bananium golden horn for gilded variant
- remove regal crown thing
- add a window into cloner/shredder room
- delete the generator/substation/mini-grav/red phone from broken shuttle
- fix power regarding PA

* BYE BYE SIGN

i loved the sign, but :(

* minor tweaks

- add deckard in vault freezer
- switch one of the gilded horn secrets to a rainbow crayon

* fix missing decal and removing my custom one

* emisse review

- remove the plant spawner overlapping baricade in sec
- switch insuls in sec maints to the budget type
- change exam room windows to tinted
- add more decor where the suitsign was
- add state laws sign to ai room
- fix map prototype

* reduce atmos job count by 1

* reorder pools

* temp remove the dock between broken ship
2023-07-19 01:23:48 -06:00
Chief-Engineer
e0e8394246 update non-command role requirements (#17440)
* adjust non-head role timers

* double intern role caps

requested by emisse

* reduce base intern requirement to 4 hrs
2023-07-18 13:04:26 -06:00
Emisse
2005bae178 Packed (#17864)
* map

* prototype

* pools

* real proto

* latejoinspawnpoints
2023-07-06 18:30:23 -06:00
Ubaser
e1034d0193 Rod: NEW Evacuation shuttle (#17129)
* add shuttle

* change station

Changes from Box to Marathon

* address issues

- switch one of the glass walls for a shuttle wall
- added another generator and redesigned the engineering compartment
- added directional reinforced walls for the seating area
- added more chairs!
- another seat for medbay
- shrunk the size of bar and moved bridge doors
- rotated the fireaxe, APCs and wall cabinets to face the correct way
- removed the bardrobe and clothesmate
- other miscellaneous fixes
2023-06-29 12:46:39 -06:00
Nemanja
06fc0122fe don't require salvage map prototypes to specify their bounds (#17652) 2023-06-26 12:29:45 +10:00
Sailor
8ce0370544 Commit trolling (#17607) 2023-06-24 13:57:56 -06:00
Ubaser
35ebcc66df Transit: NEW Evacuation shuttle (#17095)
* add shuttle

* fix mistakes, improve consistency

- adds tiny fans to airlock
- changes LED to lights
- adds supplies to med
- engineering door changed to not be glass
- added tile beneath engi and medbay door
- changed security cell
- added SMES to power
- added variety (variantize)
- saved as grid instead of map

* apply changes

- replaced plastic tiles with steel
- removed fireaxe in bridge
- rotated defib the correct way
- switched a couple LED lights out
- replaced potted plants and vending machines with their appropriate spawner
- adds more chairs

* fix defib

changed from empty to filled

---------

Co-authored-by: Ubaser <ubaserblueknight2@gmail.com>
2023-06-04 20:52:57 -06:00
Sailor
7252b9e1e9 Origin update (#17119)
* Origin update

* Update psychologist desc loc

* I👉😏👈, Eva X🆒😎, humbly😶 submit😐 , a 🍷toast🍞, to Nikolas😮Alexander🇷🇺, for ✔successfully✔managing 🆓️ to pirate🏴 Warcraft 3👹, so 🙄 that 😏 he 😐👉♂️ may  play 💻Defense🛡️of The⚔Ancients🏛. 👏👏👏Congratulations 👏👏👏, Nik😎🥛. Enjoy 😍 your 😮👊 dota 📀.
2023-06-04 14:11:15 -06:00
Checkraze
fd6d4653d5 Aspid 1.0.7 (#16732) 2023-05-23 01:00:44 -06:00
Checkraze
596833a37d kettle 1.7.2 (#16731) 2023-05-23 01:00:29 -06:00
Moony
e92a8fedab Refactor stations to properly use entity prototypes. (stationsv3) (#16570)
* Update StationSpawningSystem.cs

Web-edit to allow feeding in an existing entity.

* Update StationSpawningSystem.cs

value type moment

* Update StationSpawningSystem.cs

* Oh goddamnit this is a refactor now.

* awawawa

* aaaaaaaaaaa

* ee

* forgot records.

* no records? no records.

* What's in a name?

* Sloth forcing me to do the refactor properly smh.

* e

* optional evac in test.

* tests pls work

* awa

---------

Co-authored-by: moonheart08 <moonheart08@users.noreply.github.com>
2023-05-19 15:45:09 -05:00
deltanedas
1cb0de11f6 [map] saltern 4.7 (#16527)
* saltern 4.7

* proto

* recharges

* VALIIIIID

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-05-17 14:27:34 -06:00
Emisse
46d8d3ef43 derotate aspid and kettle and moose temporarily for publish (#16472)
* Update default.yml

* Update default.yml
2023-05-15 11:50:24 -06:00
Checkraze
2df2aa22df Kettle 1.7.1 (#16323) 2023-05-11 02:24:35 -06:00
Checkraze
5634c1e68d Aspid 1.0.6 (#16322) 2023-05-11 02:24:21 -06:00
deltanedas
d81b61bcd1 saltern 4.3 (#16311)
* saltern 4.3

* more

* fixgridatmos + no next

* ci sus

* fire/air alarms, secret room

* punpun!!!

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-05-10 15:29:27 -06:00
metalgearsloth
c40f2aa671 Fix omeg (#16150) 2023-05-06 17:46:31 +10:00