From 38b71f1005df9fe47770357091c7971a08baf12a Mon Sep 17 00:00:00 2001 From: Roxy <75404941+TealSeer@users.noreply.github.com> Date: Thu, 15 May 2025 17:25:13 -0400 Subject: [PATCH] Fixes for #91090 part 1 --- .../SpaceRuins/skyrat/prisonshuttle.dmm | 1 - .../SpaceRuins/skyrat/scrapheap.dmm | 2 +- _maps/map_files/BoxStation/BoxStation.dmm | 19 +++---------------- _maps/map_files/KiloStation/KiloStation.dmm | 12 ++++-------- _maps/map_files/VoidRaptor/VoidRaptor.dmm | 6 +----- _maps/map_files/biodome/biodome.dmm | 12 ++---------- .../metastation/metastation_arrivals.dmm | 11 +++-------- _maps/skyrat/lazy_templates/reebe.dmm | 18 +----------------- .../code/modules/clothing/head/_head.dm | 2 +- 9 files changed, 16 insertions(+), 67 deletions(-) diff --git a/_maps/RandomRuins/SpaceRuins/skyrat/prisonshuttle.dmm b/_maps/RandomRuins/SpaceRuins/skyrat/prisonshuttle.dmm index ae368666c28..e7f06b64ee4 100644 --- a/_maps/RandomRuins/SpaceRuins/skyrat/prisonshuttle.dmm +++ b/_maps/RandomRuins/SpaceRuins/skyrat/prisonshuttle.dmm @@ -83,7 +83,6 @@ /turf/open/floor/mineral/plastitanium/red, /area/ruin/space/has_grav/powered/prison_shuttle) "io" = ( -/obj/effect/spawner/structure/window/reinforced/shuttle, /obj/effect/spawner/structure/window/reinforced/plasma/plastitanium, /turf/open/floor/plating, /area/ruin/space/has_grav/powered/prison_shuttle) diff --git a/_maps/RandomRuins/SpaceRuins/skyrat/scrapheap.dmm b/_maps/RandomRuins/SpaceRuins/skyrat/scrapheap.dmm index 51ce0d9d1e1..d1131b7db33 100644 --- a/_maps/RandomRuins/SpaceRuins/skyrat/scrapheap.dmm +++ b/_maps/RandomRuins/SpaceRuins/skyrat/scrapheap.dmm @@ -1011,7 +1011,7 @@ "Cl" = ( /obj/effect/spawner/structure/window/reinforced/plasma/plastitanium, /obj/machinery/atmospherics/pipe/smart/manifold4w/orange/visible, -/turf/closed/wall/mineral/titanium, +/turf/open/space/basic, /area/ruin/space/has_grav/powered/skyrat/scrapheap) "Cs" = ( /obj/structure/door_assembly/door_assembly_hatch, diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 40981dea6fa..8cf41294884 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -37757,10 +37757,6 @@ /mob/living/basic/slime, /turf/open/floor/engine, /area/station/science/xenobiology) -"fBI" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/closed/wall, -/area/station/maintenance/port/fore) "fBM" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, @@ -40362,10 +40358,6 @@ "hnO" = ( /turf/open/floor/plating, /area/station/security/prison) -"hnW" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/closed/wall, -/area/station/maintenance/starboard/aft) "hou" = ( /obj/structure/chair, /obj/machinery/light/directional/north, @@ -60471,11 +60463,6 @@ /obj/effect/spawner/random/trash/moisture_trap, /turf/open/floor/plating, /area/station/maintenance/fore) -"tQX" = ( -/obj/effect/spawner/structure/window/reinforced/plasma, -/obj/effect/spawner/structure/window/reinforced/plasma, -/turf/open/floor/plating, -/area/station/engineering/main) "tRa" = ( /obj/effect/turf_decal/stripes/line{ dir = 5 @@ -86525,7 +86512,7 @@ sUX sUX alU amF -fBI +alU amC alU xzh @@ -95881,7 +95868,7 @@ cMD cFL cGf kQq -tQX +cMm ciZ cGS cAu @@ -113866,7 +113853,7 @@ cNW cNW cNW cNW -hnW +cNW xzh xzh xzh diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index e51d9333d3d..502712992a5 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -12757,10 +12757,6 @@ }, /turf/open/floor/iron/showroomfloor, /area/station/science/xenobiology) -"epN" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/closed/wall, -/area/station/maintenance/port/greater) "eqx" = ( /obj/machinery/conveyor{ dir = 5; @@ -86866,9 +86862,9 @@ vOl jhy aHB vjh -epN +eNQ slM -epN +eNQ vjh kQf fXy @@ -87380,9 +87376,9 @@ fUp hBJ cYy vjh -epN +eNQ qHG -epN +eNQ ycx aNp gHe diff --git a/_maps/map_files/VoidRaptor/VoidRaptor.dmm b/_maps/map_files/VoidRaptor/VoidRaptor.dmm index 127099dcf6a..e5b9e6c155f 100644 --- a/_maps/map_files/VoidRaptor/VoidRaptor.dmm +++ b/_maps/map_files/VoidRaptor/VoidRaptor.dmm @@ -20107,10 +20107,6 @@ /obj/effect/turf_decal/tile/green/diagonal_centre, /turf/open/floor/iron/dark/diagonal, /area/station/hallway/primary/fore) -"fUk" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/closed/wall, -/area/station/maintenance/department/medical/central) "fUo" = ( /obj/structure/chair/office{ dir = 8 @@ -108588,7 +108584,7 @@ jqH vIY xrG oQo -fUk +hxT ttw ttw cgZ diff --git a/_maps/map_files/biodome/biodome.dmm b/_maps/map_files/biodome/biodome.dmm index 515af3b4531..3966ccdeb99 100644 --- a/_maps/map_files/biodome/biodome.dmm +++ b/_maps/map_files/biodome/biodome.dmm @@ -53172,10 +53172,6 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/station/engineering/supermatter/room) -"seP" = ( -/obj/effect/spawner/structure/window/reinforced/tinted, -/turf/closed/wall/mineral/wood, -/area/station/service/theater) "sfD" = ( /obj/machinery/door/airlock/maintenance, /obj/effect/mapping_helpers/airlock/access/any/science/maintenance, @@ -65801,10 +65797,6 @@ /obj/structure/sign/warning/yes_smoking/circle/directional/south, /turf/open/floor/wood/large, /area/station/biodome/fore) -"wzl" = ( -/obj/effect/spawner/structure/window/reinforced/tinted, -/turf/closed/wall/mineral/wood, -/area/station/asteroid) "wzu" = ( /obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/visible{ dir = 4 @@ -162269,7 +162261,7 @@ hHc hHc hNy hNy -wzl +cwy mCq gdH hNy @@ -172356,7 +172348,7 @@ sZD sZD sZD kKT -seP +eGs xou uOC eGs diff --git a/_maps/skyrat/automapper/templates/metastation/metastation_arrivals.dmm b/_maps/skyrat/automapper/templates/metastation/metastation_arrivals.dmm index a0f7268c7d4..07c35c87189 100644 --- a/_maps/skyrat/automapper/templates/metastation/metastation_arrivals.dmm +++ b/_maps/skyrat/automapper/templates/metastation/metastation_arrivals.dmm @@ -621,11 +621,6 @@ }, /turf/open/space/basic, /area/space) -"uw" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/station/hallway/secondary/entry) "uy" = ( /obj/effect/turf_decal/stripes{ dir = 10 @@ -2721,9 +2716,9 @@ FF (21,1,1) = {" ki zd -uw -uw -uw +aJ +aJ +aJ FF FF FF diff --git a/_maps/skyrat/lazy_templates/reebe.dmm b/_maps/skyrat/lazy_templates/reebe.dmm index 852d14d41c5..be7d4001e5e 100644 --- a/_maps/skyrat/lazy_templates/reebe.dmm +++ b/_maps/skyrat/lazy_templates/reebe.dmm @@ -59,11 +59,6 @@ /obj/effect/decal/cleanable/blood/drip, /turf/open/floor/bronze, /area/ruin/powered/reebe) -"hB" = ( -/obj/effect/spawner/structure/window/bronze, -/obj/structure/fluff/clockwork/blind_eye, -/turf/open/floor/bronze, -/area/ruin/powered/reebe) "hU" = ( /obj/structure/fluff/clockwork/alloy_shards, /turf/open/floor/bronze/flat, @@ -187,17 +182,6 @@ "vA" = ( /obj/structure/table/bronze, /obj/item/gun/ballistic/rifle/lionhunter/clockwork, -/obj/item/ammo_box/a762/lionhunter/clock{ - pixel_x = 12; - pixel_y = 9 - }, -/obj/item/ammo_box/a762/lionhunter/clock{ - pixel_x = -12; - pixel_y = 9 - }, -/obj/item/ammo_box/a762/lionhunter/clock{ - pixel_y = 9 - }, /turf/open/floor/bronze/flat, /area/ruin/powered/reebe) "vV" = ( @@ -1112,7 +1096,7 @@ QX QX ve ve -hB +ve qS aj To diff --git a/modular_skyrat/master_files/code/modules/clothing/head/_head.dm b/modular_skyrat/master_files/code/modules/clothing/head/_head.dm index 768af4efe37..65102cfeb11 100644 --- a/modular_skyrat/master_files/code/modules/clothing/head/_head.dm +++ b/modular_skyrat/master_files/code/modules/clothing/head/_head.dm @@ -24,7 +24,7 @@ RegisterSignal(user, COMSIG_MOB_UNEQUIPPED_ITEM, PROC_REF(update_on_removed)) /// After the hat has actually been removed from the mob, we can update what needs to be updated here -/obj/item/clothing/head/proc/update_on_removed(mob/living/carbon/human/user, /obj/item/hat, slot) +/obj/item/clothing/head/proc/update_on_removed(mob/living/carbon/human/user, obj/item/hat, slot) SIGNAL_HANDLER if(istype(user) && user.ears) user.update_worn_ears()