Ed cc02a133e0 Merge remote-tracking branch 'upstream/master' into ed-17-09-2024-upstream2 ...

# Conflicts:
#	Content.Server/GameTicking/GameTicker.Spawning.cs

2024-09-17 11:54:36 +03:00

..

_CP14

Cucumber! Potato! (#430)

2024-09-01 16:14:56 +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

Revert Unknown Shuttle Antagonists (#32052)

2024-09-10 17:26:58 -06:00

Test

Dev mouse acorgillation (#32040)

2024-09-15 02:21:33 +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

Cog update (#32022)

2024-09-09 18:47:49 -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 (#32045)

2024-09-10 14:10:20 -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