Ed 5b2020d708 Merge remote-tracking branch 'upstream/master' into ed-08-09-2024-upstream ...

# Conflicts:
#	.github/PULL_REQUEST_TEMPLATE.md
#	Content.Server/Station/Systems/StationSpawningSystem.cs
#	Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
#	Resources/Prototypes/Maps/box.yml
#	Resources/Prototypes/Maps/marathon.yml
#	Resources/Prototypes/Maps/meta.yml

2024-09-08 21:20:54 +03:00

..

_CP14

Cucumber! Potato! (#430)

2024-09-01 16:14:56 +03:00

Dungeon

tweak(experiment): Reduce diamond stack from 30 to 1 (#31025)

2024-08-15 09:51:22 +03:00

Misc

Remove CRLF, enforce with workflow (#26401)

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

Nonstations

Remove cubes from nukie outpost. (#30547)

2024-08-01 14:00:30 -06:00

Ruins

Adds 2 new space ruins (#28971)

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

Salvage

tweak(hospital): Reduce diamond stack from 30 to 1 (#31027)

2024-08-15 09:50:09 +03:00

Shuttles

Lost evac pod thing tiny fan (#31915)

2024-09-07 03:17:27 -06:00

Test

Station AI (#30944)

2024-08-28 10:57:12 +10:00

bagel.yml

bagel update (#31944)

2024-09-08 00:33:59 -06:00

box.yml

box update (#31945)

2024-09-08 00:34:09 -06:00

centcomm.yml

Remove CRLF, enforce with workflow (#26401)

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

cog.yml

Updated cog (Maints edition) (#31935)

2024-09-07 13:58:16 -06:00

core.yml

Update core (#31942)

2024-09-07 23:32:02 -06:00

fland.yml

fland update (#31946)

2024-09-08 00:34:35 -06:00

marathon.yml

marathon update (#31947)

2024-09-08 00:35:20 -06:00

meta.yml

meta update (#31948)

2024-09-08 00:37:06 -06:00

oasis.yml

Oasis Update (AI movin fast) (#31859)

2024-09-05 02:56:47 -06:00

omega.yml

omega update (#31949)

2024-09-08 00:39:24 -06:00

packed.yml

packed update (#31950)

2024-09-08 00:41:03 -06:00

reach.yml

Adds a salvage jobspawn to reach (#31712)

2024-09-01 22:37:02 -06:00

saltern.yml

remove(Saltern): Remove the material recalimer (#31268)

2024-08-21 12:41:20 -06:00

train.yml

remove(Train): Remove the material recalimer (#31266)

2024-08-21 12:40:59 -06:00