Ed 955145a9a5 Merge remote-tracking branch 'upstream/master' into ed-06-11-2024-upstream ...

# Conflicts:
#	Resources/Changelog/Changelog.yml
#	Resources/Credits/GitHub.txt
#	Resources/Prototypes/Entities/Mobs/Player/silicon.yml

2024-11-06 16:53:24 +03:00

..

_CP14

Blacksmith role (#534)

2024-11-04 16:25:19 +03:00

Dungeon

Demiplan polishing 2 (#528)

2024-11-02 00:59:55 +03:00

Misc

Remove CRLF, enforce with workflow (#26401)

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

Nonstations

Give Nukies a Hand Labeler (#33053)

2024-11-02 01:44:15 +01: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

Update omega evac (#32748)

2024-10-12 13:03:55 -06:00

Test

Revert "Merge remote-tracking branch 'upstream/master' into ed-06-11-2024-upstream"

2024-11-06 16:52:08 +03:00

bagel.yml

Revert "Merge remote-tracking branch 'upstream/master' into ed-06-11-2024-upstream"

2024-11-06 16:52:08 +03:00

box.yml

Revert "Merge remote-tracking branch 'upstream/master' into ed-06-11-2024-upstream"

2024-11-06 16:52:08 +03:00

centcomm.yml

Fix Centcom cloning scanner (#32746)

2024-10-11 03:00:54 -06:00

cog.yml

Revert "Merge remote-tracking branch 'upstream/master' into ed-06-11-2024-upstream"

2024-11-06 16:52:08 +03:00

core.yml

Revert "Merge remote-tracking branch 'upstream/master' into ed-06-11-2024-upstream"

2024-11-06 16:52:08 +03:00

fland.yml

Fland AI core LV change (#32770)

2024-10-17 12:18:43 -06:00

marathon.yml

Marathon: Add EVA Helmets to Perma and add Disposal Unit front of Atmos (#32799)

2024-10-14 05:23:41 -06:00

meta.yml

Update Meta (#32238)

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

oasis.yml

Revert "Merge remote-tracking branch 'upstream/master' into ed-06-11-2024-upstream"

2024-11-06 16:52:08 +03:00

omega.yml

Add missing LV cables in Omega atmos (#32417)

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

packed.yml

Packed Update (#32971)

2024-10-23 16:19:35 -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