Ed 2367085160 Merge remote-tracking branch 'upstream/master' into ed-23-07-2024-upstream ...

# Conflicts:
#	.github/PULL_REQUEST_TEMPLATE.md
#	Content.Client/Clothing/ClientClothingSystem.cs
#	Content.Client/Hands/Systems/HandsSystem.cs
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
#	Content.Shared/Hands/Components/HandsComponent.cs
#	Content.Shared/Inventory/InventoryComponent.cs
#	Content.Shared/Storage/StorageComponent.cs
#	Resources/Prototypes/Accents/word_replacements.yml
#	Resources/Prototypes/Entities/Mobs/Player/human.yml
#	Resources/Prototypes/Maps/Pools/default.yml
#	Resources/Prototypes/Maps/fland.yml
#	Resources/Prototypes/Maps/oasis.yml
#	Resources/Prototypes/Maps/packed.yml
#	Resources/Prototypes/Maps/saltern.yml

2024-07-23 12:24:42 +03:00

..

_CP14

Deleting all CP14 guns proto (#346)

2024-07-22 19:11:07 +03:00

Dungeon

add an arabian lamp. (#27270)

2024-07-21 01:24:28 -06:00

Misc

Remove CRLF, enforce with workflow (#26401)

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

Nonstations

Nukie Outpost is no longer a station map (#30090)

2024-07-21 01:26:30 -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

Update Cluster and evac (#30003)

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

Test

fix(dev_map): resave dev map (#30098)

2024-07-18 10:17:57 +03:00

atlas.yml

Update Atlas (#30192)

2024-07-21 01:20:54 -06:00

bagel.yml

Update Bagel (#30191)

2024-07-21 01:43:16 -06:00

box.yml

Update Box (#30190)

2024-07-21 01:20:43 -06:00

centcomm.yml

Remove CRLF, enforce with workflow (#26401)

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

cluster.yml

Update Cluster and evac (#30003)

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

core.yml

Update Core (#29880)

2024-07-10 11:42:45 -06: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

fix(marathon): Fixing more issues (#29411)

2024-07-04 03:01:31 -06:00

meta.yml

Make artifact analyzer obey laws of physics (#28117)

2024-07-03 01:27:33 -04:00

oasis.yml

Update oasis (#30182)

2024-07-20 00:22:47 -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

Added cryosleep UnitSpawner and UnitSpawnerLate to the map Origin (#29761)

2024-07-06 11:33:20 -06:00

packed.yml

fix(packed): Fix a couple of issues (#29422)

2024-07-04 03:02:02 -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

Train map fix (#30145)

2024-07-21 01:44:18 -06:00