Merge upstream 07.12.24 (#854)

## About The Pull Request мерге
ss220club · Dec 7, 2024 · aa8e107 · aa8e107
2 parents 5040f82 + 71c4cf7
commit aa8e107
Show file tree

Hide file tree

Showing 195 changed files with 1,420 additions and 893 deletions.
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/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/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/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" = (
@@ -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{

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,

diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm
@@ -803,7 +803,7 @@
 	dir = 4
 	},
 /turf/open/floor/plating/icemoon,
-/area/station/science/ordnance/bomb)
+/area/station/science/ordnance/bomb/planet)
 "anP" = (
 /obj/structure/table,
 /obj/machinery/light_switch/directional/north,
@@ -3327,7 +3327,7 @@
 	dir = 10
 	},
 /turf/open/floor/plating/icemoon,
-/area/station/science/ordnance/bomb)
+/area/station/science/ordnance/bomb/planet)
 "aWc" = (
 /obj/structure/railing{
 	dir = 8
@@ -4003,7 +4003,7 @@
 	desc = "A wall impregnated with Fixium, able to withstand massive explosions with ease";
 	name = "hyper-reinforced wall"
 	},
-/area/station/science/ordnance/bomb)
+/area/station/science/ordnance/bomb/planet)
 "bff" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
 /turf/open/floor/iron,
@@ -4828,7 +4828,7 @@
 /obj/structure/window/reinforced/spawner/directional/north,
 /obj/effect/turf_decal/stripes/line,
 /turf/open/floor/plating/icemoon,
-/area/station/science/ordnance/bomb)
+/area/station/science/ordnance/bomb/planet)
 "bqt" = (
 /obj/machinery/airalarm/directional/west,
 /turf/open/floor/circuit,
@@ -5503,7 +5503,7 @@
 "byB" = (
 /obj/effect/spawner/random/engineering/tracking_beacon,
 /turf/open/floor/plating/icemoon,
-/area/station/science/ordnance/bomb)
+/area/station/science/ordnance/bomb/planet)
 "byH" = (
 /obj/machinery/atmospherics/pipe/smart/simple/green/visible,
 /turf/open/floor/iron/dark,
@@ -9895,7 +9895,7 @@
 	dir = 9
 	},
 /turf/open/floor/plating/icemoon,
-/area/station/science/ordnance/bomb)
+/area/station/science/ordnance/bomb/planet)
 "cJC" = (
 /obj/structure/closet,
 /obj/effect/spawner/random/maintenance/four,
@@ -15815,7 +15815,7 @@
 /area/station/security/prison/rec)
 "evT" = (
 /turf/open/floor/plating/icemoon,
-/area/station/science/ordnance/bomb)
+/area/station/science/ordnance/bomb/planet)
 "ewi" = (
 /obj/machinery/navbeacon{
 	codes_txt = "delivery;dir=8";
@@ -18953,7 +18953,7 @@
 	pixel_x = -4;
 	pixel_y = 3
 	},
-/obj/item/surgery_tray/full,
+/obj/effect/spawner/surgery_tray/full,
 /obj/effect/turf_decal/tile/blue/half/contrasted{
 	dir = 1
 	},
@@ -25910,7 +25910,7 @@
 /area/station/science/xenobiology)
 "hvt" = (
 /obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/item/surgery_tray/full/morgue,
+/obj/effect/spawner/surgery_tray/full/morgue,
 /obj/structure/table/reinforced,
 /obj/machinery/requests_console/auto_name/directional/north,
 /obj/effect/turf_decal/bot_white,
@@ -26458,7 +26458,7 @@
 "hDA" = (
 /obj/effect/turf_decal/stripes/line,
 /turf/open/floor/plating/icemoon,
-/area/station/science/ordnance/bomb)
+/area/station/science/ordnance/bomb/planet)
 "hDG" = (
 /obj/docking_port/stationary/random/icemoon{
 	dir = 4;
@@ -30139,7 +30139,7 @@
 	dir = 10
 	},
 /turf/open/floor/plating/icemoon,
-/area/station/science/ordnance/bomb)
+/area/station/science/ordnance/bomb/planet)
 "iJK" = (
 /obj/structure/lattice/catwalk,
 /obj/structure/railing,
@@ -30183,7 +30183,7 @@
 	dir = 1
 	},
 /turf/open/floor/plating/icemoon,
-/area/station/science/ordnance/bomb)
+/area/station/science/ordnance/bomb/planet)
 "iKd" = (
 /obj/structure/window/reinforced/spawner/directional/south,
 /obj/effect/turf_decal/siding/white,
@@ -38618,7 +38618,7 @@
 	dir = 6
 	},
 /turf/open/floor/plating/icemoon,
-/area/station/science/ordnance/bomb)
+/area/station/science/ordnance/bomb/planet)
 "lhu" = (
 /obj/machinery/camera/directional/north{
 	c_tag = "Xenobiology Lab Access";
@@ -41112,7 +41112,7 @@
 	dir = 9
 	},
 /turf/open/floor/plating/icemoon,
-/area/station/science/ordnance/bomb)
+/area/station/science/ordnance/bomb/planet)
 "lRf" = (
 /obj/machinery/teleport/station,
 /turf/open/floor/plating,
@@ -42518,7 +42518,7 @@
 	dir = 1
 	},
 /turf/open/floor/plating/icemoon,
-/area/station/science/ordnance/bomb)
+/area/station/science/ordnance/bomb/planet)
 "mpH" = (
 /obj/effect/landmark/event_spawn,
 /obj/effect/turf_decal/tile/neutral/fourcorners,
@@ -42635,7 +42635,7 @@
 	pixel_x = -4;
 	pixel_y = 3
 	},
-/obj/item/surgery_tray/full,
+/obj/effect/spawner/surgery_tray/full,
 /obj/effect/turf_decal/tile/blue/half/contrasted{
 	dir = 1
 	},
@@ -42913,7 +42913,7 @@
 "mvE" = (
 /obj/effect/spawner/structure/window/reinforced,
 /turf/open/floor/plating/icemoon,
-/area/station/science/ordnance/bomb)
+/area/station/science/ordnance/bomb/planet)
 "mvG" = (
 /obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible{
 	dir = 8
@@ -44043,7 +44043,7 @@
 	dir = 5
 	},
 /turf/open/floor/plating/icemoon,
-/area/station/science/ordnance/bomb)
+/area/station/science/ordnance/bomb/planet)
 "mNi" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
@@ -50619,7 +50619,7 @@
 	dir = 8
 	},
 /turf/open/floor/plating/icemoon,
-/area/station/science/ordnance/bomb)
+/area/station/science/ordnance/bomb/planet)
 "oDg" = (
 /obj/structure/chair/stool/directional/west,
 /obj/effect/decal/cleanable/dirt,
@@ -51275,7 +51275,7 @@
 	dir = 6
 	},
 /turf/open/floor/plating/icemoon,
-/area/station/science/ordnance/bomb)
+/area/station/science/ordnance/bomb/planet)
 "oLz" = (
 /obj/structure/disposalpipe/segment,
 /obj/structure/cable,
@@ -55096,7 +55096,7 @@
 /area/station/medical/treatment_center)
 "pRa" = (
 /turf/closed/wall,
-/area/station/science/ordnance/bomb)
+/area/station/science/ordnance/bomb/planet)
 "pRj" = (
 /turf/closed/wall,
 /area/station/maintenance/port/aft)
@@ -58093,7 +58093,7 @@
 	dir = 5
 	},
 /turf/open/floor/plating/icemoon,
-/area/station/science/ordnance/bomb)
+/area/station/science/ordnance/bomb/planet)
 "qKQ" = (
 /obj/effect/spawner/structure/window/reinforced,
 /obj/structure/cable,
@@ -71028,7 +71028,7 @@
 	dir = 4
 	},
 /turf/open/floor/plating/icemoon,
-/area/station/science/ordnance/bomb)
+/area/station/science/ordnance/bomb/planet)
 "uyW" = (
 /obj/machinery/washing_machine,
 /obj/effect/turf_decal/siding/blue{
@@ -79919,7 +79919,7 @@
 	name = "BOMB RANGE"
 	},
 /turf/closed/wall,
-/area/station/science/ordnance/bomb)
+/area/station/science/ordnance/bomb/planet)
 "xgK" = (
 /obj/structure/table,
 /obj/item/transfer_valve{

diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm
@@ -9670,7 +9670,7 @@
 /obj/effect/turf_decal/tile/blue/fourcorners,
 /obj/machinery/status_display/evac/directional/west,
 /obj/machinery/digital_clock/directional/south,
-/obj/item/surgery_tray/full,
+/obj/effect/spawner/surgery_tray/full,
 /turf/open/floor/iron/white,
 /area/station/medical/surgery/theatre)
 "dyr" = (
@@ -12775,7 +12775,7 @@
 /obj/effect/turf_decal/tile/blue/half/contrasted{
 	dir = 1
 	},
-/obj/item/surgery_tray/full,
+/obj/effect/spawner/surgery_tray/full,
 /obj/item/clothing/gloves/latex,
 /obj/item/clothing/suit/apron/surgical,
 /turf/open/floor/iron/white,
@@ -15055,7 +15055,7 @@
 /obj/structure/table/glass,
 /obj/effect/turf_decal/tile/blue/fourcorners,
 /obj/machinery/status_display/evac/directional/west,
-/obj/item/surgery_tray/full,
+/obj/effect/spawner/surgery_tray/full,
 /turf/open/floor/iron/white,
 /area/station/medical/surgery/theatre)
 "fpj" = (
@@ -61156,7 +61156,7 @@
 	dir = 8
 	},
 /obj/machinery/light/small/directional/north,
-/obj/item/surgery_tray/full/morgue,
+/obj/effect/spawner/surgery_tray/full/morgue,
 /turf/open/floor/iron/dark/smooth_edge{
 	dir = 8
 	},