Commit Graph
1653 Commits
Author SHA1 Message Date
deltanedasanddeltanedas 567af7c4f8 lighthouse update (#1142)
* lighthouse cryo pods

* add thermomachines to atmosia

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-04-27 19:06:18 -05:00
Colin-Tel ac38b4a6e3 Edge Station - Returned box evac & small changes (#1136)
* Returned box evac & small changes

Small adjustments made to the map, in addition to resolving issue with improperly docking evac shuttle.

* Removed prior box shuttle

* Added criminal records computer
2024-04-25 11:27:41 -05:00
rosieposie c57859e9c8 Subpatch 14 (Shuttle changes, jukeboxes, n2 lockers) (#1134)
* subpatch 14

* fix pesky invalids
2024-04-25 01:28:45 -05:00
UnicornOnLSD 84a6f1cb86 pebble patch (#1133)
jukie, robust armory, N2 lockers
2024-04-24 18:25:27 -05:00
VelcroboyandVelcroboy b43f0335d7 Map Edits (#1131)
Co-authored-by: Velcroboy <velcroboy333@hotmail.com>
2024-04-24 19:20:38 +00:00
deltanedasanddeltanedas bb04a96f8f lighthouse jukebox and n2 (#1132)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-04-24 18:51:19 +00:00
deltanedasanddeltanedas f03b7737b2 lighthouse update (#1120)
* lighthouse update

* more update

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-04-22 16:03:45 -05:00
Null 51ae93409b Merge pull request #1119 from NullWanderer/2024/04/21-merge
Merge upstream
2024-04-22 19:25:32 +02:00
rosieposie 6679835d16 initial commit (#1117)
- added an interior exit button to the xenoarch chambers
- added some extra wires in the engi outpost
- moved corpsman medicine locker
- gave det back their extra rubbers that somehow got deleted
- fixed maints above singulo not having power
- put a mass scanner on salv dock, gave them one handheld to start with
- gave perma a dinnerware crate and more instruments
- improved firing range (conveyors!!!)
2024-04-22 00:11:04 -05:00
Hannah Giovanna DawsonandNemanja 4edf577b1b SS14-26480 Roll Traversal Distorter into regular Artifact Analyzers (#26545)
* SS14-26480 Roll Traversal Distorter into regular Artifact Analyzers

Bit of a grab-bag of cleanup of Xenoarchaeology prompted by #26480.

1. Traversal distortion biases are now "up" and "down" instead of "in" and "out".
2. Node generation has been tidied up to make it a little clearer how it works.
3. Traversal Distorters have been removed from the game along with their board.
4. Traversal distortion is now done by the artifact analyzers by default.
5. Some loc strings have been made clearer.
6. The Abnormal Artifact Manipulation tech has been made slightly cheaper.
7. The aformentioned tech is now localized as Artifact Recycling, given all it does is unlock the crusher.
8. The Xenoarchaeology guidebook entry has been given a bit of a rewrite, putting all information into
one page and making sure to cover the basics that otherwise would require someone typing "Liltenhead
artifact tutorial" into Youtube.

* Fix references to deleted guidebook entry

* Add fancy button to console because @EmoGarbage404 asked me to

* migration comprete

* Fixed a goober comment

* maint fails to resolve conflicts: more at 11

* Resolve PR comments

* Make UI nice

---------

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>

(cherry picked from commit f059714a75)
2024-04-21 23:46:34 +02:00
Verm 21208c94f8 You can bless more containers with a bible (#26526)
* Made more things blessable

* Removed junk

* Remove whatever that was

* Make bowls blessable

* New mixablesolution component, converted everything to work with it

* Fix minor mishaps

* Fix extra spaces in bottle yml

* Fix last extra space, fix bottle havign the wrong solution name

* Remvoe unneeded event(I think), fix alcohol bottles not being mixable

* I missed cans
2024-04-21 23:31:16 +02:00
NullWanderer b88e0a7606 Folded bodybag migration 2024-04-21 21:43:08 +02:00
VelcroboyandVelcroboy 817c365be1 Map Edits (#1106)
* Map Edits

* Adjust prefixes

* Fix invalids and reagent nulls

---------

Co-authored-by: Velcroboy <velcroboy333@hotmail.com>
2024-04-19 03:36:06 +00:00
rosieposie c9575e9483 Submarine Patch 12 (#1099)
* Update submarine.yml

- made TEG engi-accessible
- gave hos a different gun (again)
- added more roundstart SMES, in maints near the singulo, to give more time before power goes out
- gave mime a zebra scarf
- added blast shutters between epi substation and bridge docking area
- changed up theatre dorm doors a bit (main dorm room is AA, all doors are glass now)

* fixed cloner
2024-04-18 12:37:15 -05:00
rosieposie 1df11f210c Submarine Patch 11 (#1075)
initial commit

- removed unsuls
- fixed maints access at bridge entrance
- added instruments to perma, books, altered visitation window
- removed secglasses from ward & hos office since theyre roundstart anyway
- removed the random spawn pill canisters because they can have ambuzol -_-
- connected toilets in perma to disposals
- perma windows made only reinforced glass since the damage from electrocution is changed
- gave sec some labellers for evidence lockers; evidence lockers added just outside brig
- door'd the entrance to sec so it was less wildly open every time the power went out; doors are now all lawyers also in the hall; gave them a generator
- adjusted role numbers slightly (less interns, more even dept counts)
2024-04-11 21:14:54 -05:00
deltanedas f163f9aebe fix nukie planet whitelist (#1081) 2024-04-11 18:38:35 +00:00
deltanedasanddeltanedas 33712a2b1b lighthouse mini fix (#1070)
* lighthouse mini fix

* more fix#

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-04-09 22:16:38 -05:00
rosieposie f2c07ee837 Submarine Patch 10(?): Re-Pressurized Disposals Edition (#1068)
Update submarine.yml

- removed duplicate jetpacks from paramedic lockers
- moved det office back to sec; old room is now a general-purpose rec room
- unspaced disposals :(
- gave bars sinks
- unlocked booze-o-mat at perma & in maints bar
- fixed dupe windoor in salv
2024-04-09 22:12:06 -05:00
deltanedasanddeltanedas 520fab78b9 lighthouse mini fix (#1066)
* lighthouse mini fix

* trolled

* more fixy

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-04-08 22:54:52 -05:00
rosieposie 14e247faaa Subpatch 4-4-24: I Really Need To Get Better At Naming These Edition (#1058)
* initial commit

- improved park theatre
- moved bridge fireaxe
- gave reporter a fax machine
- secfab moved to armory counter per ramona's suggestion
- armory is less of a cramped PITA to be in
- gave hos a lecter safe instead
- made TEG instructions similarly indestructible and immovable like the med counter paper; at this point i should really just PR some kind of plaque or something,
- singulo room got the substation treatment :)

* canisters

* minor fixes

- fixed jani maints being AA (oops!)
- fixed ID console being in AA bridge counter (made door glass so its clearer its AA too)

* Update submarine.yml

* Update submarine.yml

- west wing of med was unlocked ????
- removed sec intercom in perma
- gave perma the substation :)
- service locked the service autolathe
- fixed space area east of hospital being hard to get into
2024-04-07 15:06:51 -05:00
VelcroboyandVelcroboy 9b5b42b4c2 Map Edits: Lighthouse (#1065)
Co-authored-by: Velcroboy <velcroboy333@hotmail.com>
2024-04-07 15:06:10 -05:00
UnicornOnLSD f27e972c8d Edge FIX: cursed steel (#1064)
FIX: cursed steel
2024-04-07 14:56:08 -05:00
deltanedasanddeltanedas 52bfd9143d lighthouse fixes (#1063)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-04-07 14:53:01 -05:00
deltanedasanddeltanedas 37c0bc8795 port lighthouse real (#883)
* port lighthouse and dosome work

* fix evil things

* add to pool and test

* most of the logi rework, replace viro with some cryo beds

* more reworks

* fixes

* updatey

* more fix

* techie spawn and more suit storage

* actually add the techie spawns

* name every door

* gaming

* mostly fix/add cameras

* warp point gaming

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-04-06 18:38:40 -05:00
Adrian16199 42c8923144 Shoukou's quick patch (#1059) 2024-04-06 03:13:55 -05:00
rosieposie ea4f281ab6 The Superior Subpatch 4-2-24: 4-3-24 Edition (#1053)
* Update submarine.yml

* mowed astrograss!!!
2024-04-03 21:44:14 +02:00
rosieposie 2c8cb54d96 Revert "Subpatch 4-2-24 (#1050)" (#1051)
This reverts commit 4f91d7ab41.
2024-04-03 03:55:04 -05:00
rosieposie 4f91d7ab41 Subpatch 4-2-24 (#1050)
* tweaks

- removed lockable crate go fuck yourself. use the COUNTER.
- added red phone to bridge
- flipped spare ID so it is accessible. haha oops
- goodbye bibles
- added bridge fax machine
- gave sec checkpoints two buttons for N/S blast doors
- added atmos into the court defendant/prosecutor boxes (lol)
- one billion more station maps
- gave chem counter a smartfridge

* fix invalids

* Update submarine.yml

- wrenched the med paper (lol)
- added a 'barrier stockpile' by singulo
- gave sec jetpacks (honest to god thought they came in the sec suit storage for some reason)
- tweaked salv dock a bit
- removed salv shuttle console which definitely shouldnt still be there lol
- used black shuttle tiles in more places instead of reinf
- removed that one hall bush outside of the court that always annoys me
2024-04-02 21:21:24 -05:00
deltanedasanddeltanedas 1f515677f5 shoukou atmos rework and tweaks (#1049)
* shoukou atmos rework

* air alarm

* missing pipe in kitchen /!\

* exit button and some button frames

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-04-02 21:10:51 -05:00
VelcroboyandVelcroboy b87a0b7aea Map Edits: The Hive (#1027)
Co-authored-by: Velcroboy <velcroboy333@hotmail.com>
2024-03-28 12:59:40 -05:00
deltanedasanddeltanedas beb718cca1 submarine atmosia update real (#1022)
* submarine atmosia update real

* tweak 2 pump pressures, add newtons guides to atmos

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-03-28 10:27:57 -05:00
VelcroboyandVelcroboy c78ae883c1 Map Edits (#1019)
Co-authored-by: Velcroboy <velcroboy333@hotmail.com>
2024-03-28 01:29:21 -05:00
VelcroboyandVelcroboy e91a89fa47 Map Edits: Shoukou (#1017)
Co-authored-by: Velcroboy <velcroboy333@hotmail.com>
2024-03-27 21:56:23 -05:00
VelcroboyandVelcroboy b08953faef Map Edits: Hammurabi (#1016)
Co-authored-by: Velcroboy <velcroboy333@hotmail.com>
2024-03-27 21:31:17 -05:00
Null df4b17e4bb CRLF 2024-03-27 17:53:28 +00:00
Leon Friedrich 7ecc968f8c Run fixgridatmos for cargo & emergency shuttle (#26382)
Fix cargo & emergency shuttle

(cherry picked from commit ec761114ea)
2024-03-27 18:32:40 +01:00
Emisse 2c493a1fd0 Haunted dungeon template (#23768)
* haunted dungeon

* Initial work

Still needs prefab gen work to make it interesting.

* ime a worm

* weh

* Work

* Slight tweaks

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
(cherry picked from commit 952b7f4c4e)
2024-03-27 18:28:44 +01:00
rosieposieandVelcroboy 680c0d457f Submarine Patch - RE-TEG Edition (#988)
* initial commit

* Update submarine.yml

* cable & lights fixes

* add spawns

* Update submarine.yml

* emergency lights & cameras

* fix training ammo

also added basketballs around & posters in engi

---------

Co-authored-by: Velcroboy <107660393+IamVelcroboy@users.noreply.github.com>
2024-03-27 16:57:09 +00:00
Null 0cdd16bc4d Convert to Unix 2024-03-27 11:05:48 +00:00
Adrian16199 cccd4cfb04 A quick fix to shoukou (#990)
Basicly just does small fixes that were told to me.
Warden's wall monitor is now located on the table because previously it was on a wall that wasnt even accesable
Salvage was readjusted due to no shuttle and given conveyors to help moving the cargo inside
Prisoner wall lockers now contain jumpsuit and jumpskirt for any new prisoners
2024-03-25 13:02:26 -05:00
UnicornOnLSD 97487b69c7 fixed tortuga cryo (#1003)
fixed cryo pump, won't kill patients
2024-03-25 11:21:20 -05:00
VelcroboyandVelcroboy 82d700ffe8 Map Edits (#997)
Co-authored-by: Velcroboy <velcroboy333@hotmail.com>
2024-03-22 19:47:53 -05:00
rosieposie 5e32b2f6f6 Subpatch 3/20/24 (#987)
* fixed a bunch of issues

* fixes

* bar power

* remove ghost role slimes
2024-03-21 01:10:41 -05:00
rosieposie d78050be8a Submarine Itty Bitty Baby Patch (#981)
* initial commit

* more fixes

* forgot a cable

* minor fixes

* Update submarine.yml

* fuck that one cable

* we're so back

* its so over

* more wires fix & clown pie
2024-03-20 00:07:35 -05:00
rosieposie bc19445e42 Submarine Patches 2/10 (#809)
* various retooling

- moved bar & arcade to food court
- retooled west wing of hospital
- fixed atmos markers in gas area
- fixed some misc emergency lights, lowered overall emergency light amount in maints
- removed barbershop, laundry made smaller and slid over a bit
- epi gets their maints back for real
- SIX SMES's. power problems better be fixed or im eating my hat
- removed any labyrinth loot of value pending a full labyrinth redo out of scope for this patch
- WIP supply room for the big hole left by the old bar & arcade/cafe area

* minor touchups

* Update submarine.yml

- added a park substation
- minor tweaks & cleanup

* remove unnecessary extra SMESs

* fix erroneous tiles

* fixgridatmos & variantize

* Update submarine.yml

- added a central hospital substation
- retooled the sec & engi outposts
- labyrinth REMOVED.
- made the robotics room """bigger"""

* sorry prototypes file

* Update submarine.yml

- bingus room
- ai containment room
- minor tweaks & cleanup

* minor fixes again

* cave time

* further refinement of cave area

* old xenobio lab

* decal'd up

* 1 more light

* glass airlocks in xenolab

* ICU door & cave prison

* Update submarine.yml

- added some railings / line stuff
- borg chargers at logi lobby
- fixed some tiles
- retooled ICU a little

* signage babeyyyyy

* Update submarine.yml

removed laika, added SOME stalagmites but not all

* Update submarine.yml

stalagmites, sec main area rejiggering, detailing

* button fixes

- made all buttons directional
- named janitor service light buttons
- added some missing jani lights

* stuff

- moved brigmedics room into sec
- moved detective out of sec
- prettified more substations
- added martial artist, tweaked some crew numbers

* custom escape pod

* custom evac shuttle - NTES Propeller

* fix some wiring on evac shuttle

* rotate some items & telecomms added

also intercomms

* more room at arrivals in case evac shuttle flips

* swap to metem machines

* strengthen armory

* armory touch-ups

* a treat for the warden

* fix stinky decals

* added laser box

and fixed armory more and also apparently never added the metem machine ??????? i swear i did this, must have not saved it

* add secondary sec entrance

also added some posters

* swap armory & wardens room

* armory touchups

* Update submarine.yml

- added blast doors to holding cells
- fixed corpsman door
- added some more cameras
- stuck some secret doors around
- added ninja bombing targets
- minor touchups

* fix some connections

* Update submarine.yml

* Update submarine.yml

* Update submarine.yml

* Update submarine.yml

* Update submarine.yml

* Update submarine.yml

* Update submarine.yml

* Update submarine.yml

* Update submarine.yml

* Update submarine.yml

* Update submarine.yml

* sec checkpoint 2

* minor fixes + panopticon

* fix power near arrivals

* missed two wires fuck

* Update submarine.yml

* atmos maint changes

* more external access points

* camera monitor fixes

* fix area around camera router a bit

power, etc

* fix test failure

PROTIP: dont throw darts

* inconsistent windows at bars

* Update submarine.yml

* Update submarine.yml

* retool cargo dock significantly

* single tile that was gonna annoy me

* forgot lights oops

* Update submarine.yml

* improved ICU way more

* Update submarine.yml

- contraband crate
- minor ICU touchups

* minor fixes

* cloning room tweaks

* decal'd up the bar
2024-03-19 18:50:02 -05:00
UnicornOnLSD 627e535e37 pebble minor patch 3² (#977)
fixed beacons, BS, cryo and moved east solars at tad
2024-03-18 13:35:38 -05:00
Debug e1c1a7e805 SlowContacts is SpeedModifierContacts 2024-03-17 18:00:27 +01:00
wafehling 17ca360528 Trading Outpost now has half buy-only and half sell-only pallets (#25955)
* Added new Buy & Sell specific cargo pallets

* Remapped trading outpost with new pallets, tweaked texture

* Removed debug message

* Fixed/Compacted conditional checking to let old pallets still work for backwards compatability

* Update Content.Server/Cargo/Components/CargoPalletComponent.cs

Alright, updating all the references to it.

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>

* Changed textures, changed to enum instead of string for pallet type check

* Few minor code tweaks/formatting fixes

* Missed the prototype change

* Update Content.Server/Cargo/Components/CargoPalletComponent.cs

* Update Content.Server/Cargo/Systems/CargoSystem.Shuttle.cs

---------

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
(cherry picked from commit c0bbbc33c1)
2024-03-17 15:06:02 +01:00
Emisse 6a4763ef4c infiltrator update (#25923)
(cherry picked from commit 463817056e)
2024-03-17 14:43:51 +01:00
Alzore 55483dca32 Vegan Meatball (#24650)
* veganmeatball

* testedthis

* moreplant

(cherry picked from commit 5f61380209)
2024-03-17 14:41:35 +01:00