Ed dbdb81381b Merge remote-tracking branch 'upstream/master' into ed-30-06-2024-upstream ...

# Conflicts:
#	Resources/Prototypes/Maps/box.yml
#	Resources/Prototypes/Maps/meta.yml
#	Resources/Prototypes/Maps/oasis.yml
#	Resources/Prototypes/Maps/origin.yml
#	Resources/Prototypes/lobbyscreens.yml

2024-06-30 11:18:30 +03:00

..

_CP14

cool hat, delete cave arena (#256)

2024-06-17 23:48:42 +03:00

Dungeon

SS14-26480 Roll Traversal Distorter into regular Artifact Analyzers (#26545)

2024-04-21 12:09:26 -04:00

Misc

Remove CRLF, enforce with workflow (#26401)

2024-03-24 22:06:17 +01:00

Nonstations

fix: Adds a missing defribilator to nukie planet (#28362)

2024-06-23 02:04:09 -06:00

Ruins

Adds 2 new space ruins (#28971)

2024-06-15 00:02:56 -06:00

Salvage

Revert "Ed 09 06 2024 upstream (#230)"

2024-06-11 15:20:47 +03:00

Shuttles

tweak(emergency_box): Swap out Salvage Material crate with Engineering crate (#29269)

2024-06-23 01:59:57 -06:00

Test

You can bless more containers with a bible (#26526)

2024-04-20 16:16:55 +10:00

atlas.yml

fix(atlas): Replace mindshield crate with implanter crate (#29184)

2024-06-23 02:04:31 -06:00

bagel.yml

nuke actions from map files (#28589)

2024-06-16 23:03:01 -04:00

box.yml

Update box (#28348)

2024-06-16 13:37:37 -06:00

centcomm.yml

Remove CRLF, enforce with workflow (#26401)

2024-03-24 22:06:17 +01:00

cluster.yml

fix(cluster): Replace mindshield crate with implanter crate (#29182)

2024-06-23 02:02:08 -06:00

core.yml

Rejig device link sink & source startup & shutdown (#29035)

2024-06-20 01:03:32 +10:00

europa.yml

Component of planet initialization on the map (#26510)

2024-04-18 21:27:54 +10:00

fland.yml

tweak(fland): Add radiation shutters to front of PA (#29265)

2024-06-23 02:00:13 -06:00

marathon.yml

tweak(marathon): Fix some stuff (#29256)

2024-06-23 02:01:11 -06:00

meta.yml

tweak(meta): Swap around some of the computers in bridge (#29263)

2024-06-23 02:00:42 -06:00

oasis.yml

Oasis Atmos department rework (#29549)

2024-06-28 23:35:14 -06:00

omega.yml

fix(omega): Connect the disposal unit in medbay to the disposal "network" (#29305)

2024-06-23 01:57:20 -06:00

origin.yml

fix(origin): Replace mindshield crate with implanter crate (#29183)

2024-06-23 02:01:54 -06:00

packed.yml

fix(packed): Fill the medical lockers in medbay (#29319)

2024-06-23 01:57:04 -06:00

reach.yml

Reach Fixes (#28913)

2024-06-12 20:09:10 -06:00

saltern.yml

tweak(saltern): Place a red phone in bridge meeting room, add another artifact spawn (#29359)

2024-06-23 01:59:07 -06:00

train.yml

Update train (#28345)

2024-06-16 13:37:17 -06:00