Ed ab1e071fdf Merge remote-tracking branch 'upstream/master' into ed-03-10-2024-upstream ...

# Conflicts:
#	Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml

2024-10-03 17:34:08 +03:00

..

_CP14

Mist + Lampposts (#472)

2024-09-29 13:07:30 +03:00

Dungeon

Mining Asteroid Treasure Vaults (#31638)

2024-09-10 21:33:41 -06:00

Misc

Remove CRLF, enforce with workflow (#26401)

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

Nonstations

Adds the syndicate Booze-O-Mat (Bruise-O-Mat) to nukie planet (#32107)

2024-09-16 02:59:00 -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

Add the Syndicate Instigator Shuttle (#32083)

2024-09-22 17:27:48 -07:00

Test

Dev mouse acorgillation (#32040)

2024-09-15 02:21:33 +10:00

bagel.yml

Fix bagel vox box (#32208)

2024-09-18 10:37:35 +03: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

Cog update (#32585)

2024-10-01 19:45:54 -06:00

core.yml

Update core (#31942)

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

fland.yml

Fland change - Add glasslocks to the Contiguous Fland Hallway Volume (#32264)

2024-09-19 13:17:18 -06:00

marathon.yml

Added LV cables to Marathon SMES room (#32574)

2024-10-01 23:30:58 -06:00

meta.yml

Update Meta (#32238)

2024-09-19 07:36:12 -06:00

oasis.yml

Oasis updoot. (#32133)

2024-09-19 07:35:39 -06:00

omega.yml

Add missing LV cables in Omega atmos (#32417)

2024-09-23 22:48:14 -06:00

packed.yml

packed update (#31950)

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

reach.yml

reach update :3 (#32387)

2024-09-22 14:08:56 -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