Merge remote-tracking branch 'tg/master' into update-10

DopplerShift13 · Dec 11, 2024 · 2e0d8a4 · 2e0d8a4
2 parents c07b7e8 + 873d87f
commit 2e0d8a4
Show file tree

Hide file tree

Showing 347 changed files with 5,171 additions and 3,502 deletions.
diff --git a/.github/workflows/ci_suite.yml b/.github/workflows/ci_suite.yml
@@ -295,3 +295,4 @@ jobs:
         uses: re-actors/alls-green@release/v1
         with:
           jobs: ${{ toJSON(needs) }}
+          allowed-skips: compare_screenshots
diff --git a/.github/workflows/generate_documentation.yml b/.github/workflows/generate_documentation.yml
@@ -27,7 +27,7 @@ jobs:
           touch dmdoc/.nojekyll
           echo codedocs.tgstation13.org > dmdoc/CNAME
       - name: Deploy
-        uses: JamesIves/[email protected].1
+        uses: JamesIves/[email protected].2
         with:
           branch: gh-pages
           clean: true

diff --git a/_maps/RandomRuins/IceRuins/icemoon_surface_phonebooth.dmm b/_maps/RandomRuins/IceRuins/icemoon_surface_phonebooth.dmm
@@ -1,99 +1,119 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
 "a" = (
-/obj/machinery/holopad,
-/turf/open/floor/iron/dark/smooth_edge{
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
 	dir = 4
 	},
+/turf/open/floor/iron/dark/smooth_large,
 /area/ruin/powered/icemoon_phone_booth)
 "c" = (
-/obj/machinery/door/window/left/directional/north,
-/obj/machinery/door/window/left/directional/south,
-/turf/open/floor/iron/dark/smooth_edge{
-	dir = 4
-	},
-/area/ruin/powered/icemoon_phone_booth)
+/turf/open/floor/plating/snowed/smoothed/icemoon,
+/area/icemoon/underground/explored)
 "e" = (
+/obj/structure/lattice,
 /turf/open/misc/asteroid/snow/icemoon,
-/area/ruin/powered/icemoon_phone_booth)
+/area/icemoon/underground/explored)
 "k" = (
-/obj/machinery/vending/coffee,
+/obj/machinery/vending/cigarette{
+	all_products_free = 0
+	},
 /obj/structure/window/reinforced/spawner/directional/east,
-/turf/open/floor/plating/icemoon,
-/area/ruin/powered/icemoon_phone_booth)
-"q" = (
-/obj/machinery/airalarm/directional/south,
 /obj/effect/turf_decal/tile/yellow/half/contrasted{
-	dir = 4
+	dir = 8
 	},
-/obj/machinery/atmospherics/components/tank/air/layer4{
+/obj/effect/turf_decal/weather/snow/corner{
 	dir = 8
 	},
-/obj/structure/window/reinforced/spawner/directional/west,
+/obj/effect/turf_decal/weather/snow,
 /turf/open/floor/plating/icemoon,
 /area/ruin/powered/icemoon_phone_booth)
-"v" = (
+"q" = (
 /obj/structure/lattice,
 /obj/structure/billboard/Phone_booth,
 /turf/open/misc/asteroid/snow/icemoon,
-/area/ruin/powered/icemoon_phone_booth)
-"z" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+/area/icemoon/underground/explored)
+"v" = (
+/obj/structure/window/reinforced/spawner/directional/west,
+/obj/machinery/light/small/directional/north,
+/obj/effect/turf_decal/tile/yellow/half/contrasted{
 	dir = 4
 	},
+/obj/item/gps/spaceruin{
+	gpstag = "Public Holophone"
+	},
+/obj/effect/turf_decal/weather/snow/corner{
+	dir = 5
+	},
+/obj/effect/turf_decal/weather/snow,
+/turf/open/floor/plating/icemoon,
+/area/ruin/powered/icemoon_phone_booth)
+"z" = (
+/obj/machinery/door/window/left/directional/north,
+/obj/machinery/door/window/left/directional/south,
+/obj/effect/turf_decal/weather/snow/corner,
 /turf/open/floor/iron/dark/smooth_edge{
-	dir = 4
+	dir = 1
 	},
 /area/ruin/powered/icemoon_phone_booth)
 "J" = (
 /obj/effect/turf_decal/tile/yellow/half/contrasted{
 	dir = 4
 	},
-/obj/item/gps/spaceruin{
-	gpstag = "Public Holophone"
-	},
-/obj/machinery/light/small{
-	dir = 1
+/obj/machinery/atmospherics/components/tank/air/layer4{
+	dir = 8
 	},
 /obj/structure/window/reinforced/spawner/directional/west,
+/obj/effect/turf_decal/weather/snow/corner{
+	dir = 4
+	},
+/obj/effect/turf_decal/weather/snow,
 /turf/open/floor/plating/icemoon,
 /area/ruin/powered/icemoon_phone_booth)
 "M" = (
 /turf/closed/wall/ice,
 /area/ruin/powered/icemoon_phone_booth)
 "R" = (
-/obj/effect/spawner/structure/window/hollow/reinforced,
-/turf/open/floor/plating/icemoon,
+/obj/machinery/holopad,
+/obj/machinery/airalarm/directional/north,
+/obj/effect/mapping_helpers/airalarm/all_access,
+/turf/open/floor/iron/dark/smooth_large,
 /area/ruin/powered/icemoon_phone_booth)
 "V" = (
-/obj/structure/lattice,
-/turf/open/misc/asteroid/snow/icemoon,
-/area/ruin/powered/icemoon_phone_booth)
-"W" = (
-/obj/machinery/vending/cigarette{
-	all_products_free = 0
-	},
+/obj/machinery/vending/coffee,
 /obj/structure/window/reinforced/spawner/directional/east,
+/obj/effect/turf_decal/tile/yellow/half/contrasted{
+	dir = 8
+	},
+/obj/effect/turf_decal/weather/snow/corner{
+	dir = 8
+	},
+/obj/effect/turf_decal/weather/snow,
 /turf/open/floor/plating/icemoon,
 /area/ruin/powered/icemoon_phone_booth)
+"W" = (
+/turf/open/misc/asteroid/snow/icemoon,
+/area/icemoon/underground/explored)
 
 (1,1,1) = {"
-v
+q
 M
+V
 k
-W
 M
+c
 "}
 (2,1,1) = {"
-e
+W
+M
 R
 a
 z
 c
 "}
 (3,1,1) = {"
-V
+e
 M
+v
 J
-q
 M
+c
 "}
diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_frozen_comms.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_frozen_comms.dmm
@@ -311,7 +311,7 @@
 	},
 /obj/structure/rack,
 /obj/item/wrench,
-/obj/item/crowbar/large/heavy,
+/obj/item/crowbar/large/twenty_force,
 /obj/machinery/light/small/built/directional/south,
 /turf/open/floor/plating/icemoon,
 /area/ruin/powered/shuttle)

diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_syndidome.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_syndidome.dmm
@@ -3503,7 +3503,7 @@
 /area/ruin/syndibiodome)
 "Pw" = (
 /obj/structure/table/reinforced/plastitaniumglass,
-/obj/item/surgery_tray/full,
+/obj/effect/spawner/surgery_tray/full,
 /obj/effect/turf_decal/siding/wideplating/dark{
 	dir = 5
 	},

diff --git a/_maps/RandomRuins/SpaceRuins/DJstation/kitchen_1.dmm b/_maps/RandomRuins/SpaceRuins/DJstation/kitchen_1.dmm
@@ -30,7 +30,6 @@
 /area/ruin/space/djstation)
 "t" = (
 /obj/structure/closet/secure_closet/freezer/fridge/all_access,
-/obj/machinery/light/directional/south,
 /obj/effect/turf_decal/tile/bar/opposingcorners,
 /obj/machinery/light/small/directional/south,
 /turf/open/floor/iron,

diff --git a/_maps/RandomRuins/SpaceRuins/anomaly_research.dmm b/_maps/RandomRuins/SpaceRuins/anomaly_research.dmm
@@ -351,7 +351,7 @@
 "kp" = (
 /obj/effect/spawner/random/environmentally_safe_anomaly/immobile,
 /turf/template_noop,
-/area/space)
+/area/space/nearstation)
 "kt" = (
 /obj/effect/turf_decal/tile/purple/half/contrasted{
 	dir = 1

diff --git a/_maps/RandomRuins/SpaceRuins/bus.dmm b/_maps/RandomRuins/SpaceRuins/bus.dmm
@@ -285,7 +285,7 @@
 /turf/open/misc/asteroid/airless,
 /area/ruin/space)
 "ET" = (
-/mob/living/basic/lizard,
+/mob/living/basic/lizard/space,
 /turf/open/misc/asteroid/airless,
 /area/ruin/space)
 "Fo" = (

diff --git a/_maps/RandomRuins/SpaceRuins/dangerous_research.dmm b/_maps/RandomRuins/SpaceRuins/dangerous_research.dmm
@@ -98,7 +98,7 @@
 /turf/open/floor/iron/white,
 /area/ruin/space/has_grav/dangerous_research/medical)
 "aZ" = (
-/obj/item/surgery_tray/full,
+/obj/effect/spawner/surgery_tray/full,
 /obj/structure/table,
 /turf/open/floor/plating/rust,
 /area/ruin/space/has_grav/dangerous_research/medical)

diff --git a/_maps/RandomRuins/SpaceRuins/garbagetruck4.dmm b/_maps/RandomRuins/SpaceRuins/garbagetruck4.dmm
@@ -122,7 +122,6 @@
 /area/ruin/space/has_grav/garbagetruck/toystore)
 "lm" = (
 /obj/structure/spider/stickyweb,
-/obj/structure/spider/stickyweb/very_sticky,
 /turf/open/floor/plating,
 /area/ruin/space/has_grav/garbagetruck/toystore)
 "mf" = (
@@ -182,7 +181,6 @@
 /turf/open/floor/plating,
 /area/ruin/space/has_grav/garbagetruck/toystore)
 "qX" = (
-/obj/structure/spider/stickyweb/very_sticky,
 /obj/item/food/badrecipe/moldy,
 /obj/structure/spider/stickyweb,
 /obj/item/food/spidereggs{

diff --git a/_maps/RandomRuins/SpaceRuins/interdyne.dmm b/_maps/RandomRuins/SpaceRuins/interdyne.dmm
@@ -1015,7 +1015,7 @@
 /turf/open/floor/mineral/plastitanium/red,
 /area/ruin/space/has_grav/interdyne)
 "PD" = (
-/obj/item/surgery_tray/full,
+/obj/effect/spawner/surgery_tray/full,
 /obj/structure/table/reinforced/rglass,
 /turf/open/floor/mineral/plastitanium,
 /area/ruin/space/has_grav/interdyne)

diff --git a/_maps/RandomRuins/SpaceRuins/meatderelict.dmm b/_maps/RandomRuins/SpaceRuins/meatderelict.dmm
@@ -484,7 +484,7 @@
 /obj/effect/turf_decal/siding/blue{
 	dir = 6
 	},
-/obj/item/surgery_tray/full/deployed,
+/obj/effect/spawner/surgery_tray/full/deployed,
 /turf/open/indestructible/white,
 /area/ruin/space/has_grav/powered/biooutpost)
 "kh" = (

diff --git a/_maps/RandomRuins/SpaceRuins/prison_shuttle.dmm b/_maps/RandomRuins/SpaceRuins/prison_shuttle.dmm
@@ -147,8 +147,8 @@
 /turf/open/floor/iron/dark/airless,
 /area/ruin/space/prison_shuttle)
 "O" = (
-/mob/living/basic/cockroach,
 /obj/effect/turf_decal/tile/brown/fourcorners,
+/obj/effect/decal/cleanable/xenoblood/xsplatter,
 /turf/open/floor/iron/dark/airless,
 /area/ruin/space/prison_shuttle)
 "P" = (

diff --git a/_maps/RandomRuins/SpaceRuins/russian_derelict.dmm b/_maps/RandomRuins/SpaceRuins/russian_derelict.dmm
@@ -5893,8 +5893,8 @@
 /turf/open/floor/plating,
 /area/ruin/space/ks13/science/ordnance)
 "Nk" = (
-/obj/effect/spawner/random/maintenance,
 /obj/structure/lattice,
+/obj/effect/spawner/random/maintenance/no_decals,
 /turf/template_noop,
 /area/space/nearstation)
 "Nl" = (

diff --git a/_maps/RandomRuins/SpaceRuins/shuttlerelic.dmm b/_maps/RandomRuins/SpaceRuins/shuttlerelic.dmm
@@ -63,7 +63,7 @@
 /obj/structure/chair/old{
 	dir = 1
 	},
-/obj/item/crowbar/large/heavy,
+/obj/item/crowbar/large/twenty_force,
 /turf/open/floor/oldshuttle,
 /area/ruin/space/has_grav/powered)
 "o" = (

diff --git a/_maps/RandomRuins/SpaceRuins/the_outlet.dmm b/_maps/RandomRuins/SpaceRuins/the_outlet.dmm
@@ -701,7 +701,7 @@
 /area/ruin/space/has_grav/the_outlet/employeesection)
 "rF" = (
 /obj/structure/table/reinforced/rglass,
-/obj/item/surgery_tray/full,
+/obj/effect/spawner/surgery_tray/full,
 /obj/item/reagent_containers/syringe/lethal/execution,
 /turf/open/floor/iron/freezer,
 /area/ruin/space/has_grav/the_outlet/researchrooms)

diff --git a/_maps/deathmatch/species_warfare.dmm b/_maps/deathmatch/species_warfare.dmm
@@ -23,7 +23,7 @@
 	dir = 1
 	},
 /obj/structure/table/glass,
-/obj/item/surgery_tray/full,
+/obj/effect/spawner/surgery_tray/full,
 /turf/open/indestructible/white,
 /area/deathmatch)
 "bX" = (
@@ -228,7 +228,7 @@
 "iM" = (
 /obj/effect/turf_decal/tile/blue/half/contrasted,
 /obj/structure/table/glass,
-/obj/item/surgery_tray/full,
+/obj/effect/spawner/surgery_tray/full,
 /turf/open/indestructible/white,
 /area/deathmatch)
 "iV" = (

diff --git a/_maps/map_files/Birdshot/birdshot.dmm b/_maps/map_files/Birdshot/birdshot.dmm
@@ -130,7 +130,7 @@
 /obj/effect/turf_decal/siding/white,
 /obj/machinery/light/small/directional/south,
 /obj/structure/table/reinforced,
-/obj/item/surgery_tray/full/morgue,
+/obj/effect/spawner/surgery_tray/full/morgue,
 /turf/open/floor/iron/small,
 /area/station/medical/morgue)
 "adL" = (
@@ -10716,7 +10716,7 @@
 /obj/machinery/camera/autoname/directional/north,
 /obj/structure/sign/poster/official/random/directional/north,
 /obj/machinery/status_display/ai/directional/west,
-/obj/item/surgery_tray/full/deployed,
+/obj/effect/spawner/surgery_tray/full/deployed,
 /turf/open/floor/iron/showroomfloor,
 /area/station/medical/surgery/theatre)
 "dZk" = (
@@ -33933,7 +33933,7 @@
 /obj/effect/turf_decal/tile/dark_red/opposingcorners,
 /obj/machinery/airalarm/directional/north,
 /obj/structure/rack,
-/obj/item/crowbar/large/heavy,
+/obj/item/crowbar/large,
 /obj/item/wirecutters,
 /obj/item/wrench,
 /turf/open/floor/iron,
@@ -34878,7 +34878,7 @@
 /area/station/tcommsat/server)
 "lPO" = (
 /obj/structure/table,
-/obj/item/surgery_tray/full{
+/obj/effect/spawner/surgery_tray/full{
 	pixel_y = -5
 	},
 /obj/item/wirecutters{
@@ -43772,7 +43772,7 @@
 /area/station/science/ordnance/burnchamber)
 "oZL" = (
 /obj/structure/table,
-/obj/item/crowbar/large/heavy,
+/obj/item/crowbar/large,
 /obj/item/stack/cable_coil,
 /obj/machinery/light/small/directional/south,
 /turf/open/floor/iron,
@@ -47524,7 +47524,7 @@
 /obj/machinery/door/airlock/maintenance{
 	name = "Atmospherics Maintenance"
 	},
-/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
+/obj/effect/mapping_helpers/airlock/access/any/engineering/general,
 /turf/open/floor/plating,
 /area/station/maintenance/department/engine/atmos)
 "qmz" = (

diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm
@@ -75220,7 +75220,7 @@
 /area/station/service/abandoned_gambling_den/gaming)
 "sOp" = (
 /obj/structure/table/glass,
-/obj/item/surgery_tray/full,
+/obj/effect/spawner/surgery_tray/full,
 /obj/structure/window/reinforced/spawner/directional/west,
 /obj/item/clothing/gloves/latex,
 /obj/item/clothing/suit/apron/surgical,
@@ -79128,7 +79128,7 @@
 	dir = 4
 	},
 /obj/structure/table/reinforced,
-/obj/item/surgery_tray/full/morgue,
+/obj/effect/spawner/surgery_tray/full/morgue,
 /obj/effect/turf_decal/tile/dark_blue/half/contrasted{
 	dir = 4
 	},
@@ -94584,7 +94584,7 @@
 /area/station/cargo/storage)
 "xES" = (
 /obj/structure/table/glass,
-/obj/item/surgery_tray/full,
+/obj/effect/spawner/surgery_tray/full,
 /obj/item/clothing/gloves/latex,
 /obj/item/clothing/suit/apron/surgical,
 /obj/effect/turf_decal/tile/neutral/fourcorners,