From d7c2e4da5b38404274e3233f70fb155d4283b24e Mon Sep 17 00:00:00 2001 From: CHOMPStation2StaffMirrorBot <94713762+CHOMPStation2StaffMirrorBot@users.noreply.github.com> Date: Wed, 9 Jul 2025 03:53:26 -0700 Subject: [PATCH] [MIRROR] fix floors on turf change (#11159) Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com> --- code/game/turfs/unsimulated/floor.dm | 5 +++ maps/groundbase/gb-centcomm.dmm | 54 +++++--------------------- maps/stellar_delight/ship_centcom.dmm | 54 +++++--------------------- maps/tether/submaps/tether_centcom.dmm | 54 +++++--------------------- 4 files changed, 32 insertions(+), 135 deletions(-) diff --git a/code/game/turfs/unsimulated/floor.dm b/code/game/turfs/unsimulated/floor.dm index 6601917c19..ce13e84f08 100644 --- a/code/game/turfs/unsimulated/floor.dm +++ b/code/game/turfs/unsimulated/floor.dm @@ -15,3 +15,8 @@ name = "floor" icon = 'icons/turf/floors.dmi' icon_state = "elevatorshaft" + +/turf/unsimulated/floor/reinforced + name = "reinforced floor" + icon = 'icons/turf/flooring/tiles.dmi' + icon_state = "reinforced" diff --git a/maps/groundbase/gb-centcomm.dmm b/maps/groundbase/gb-centcomm.dmm index c6a7c04d63..34a1ab992f 100644 --- a/maps/groundbase/gb-centcomm.dmm +++ b/maps/groundbase/gb-centcomm.dmm @@ -336,11 +336,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 1 }, -/turf/unsimulated/floor{ - icon = 'icons/turf/flooring/tiles.dmi'; - icon_state = "reinforced"; - name = "reinforced floor" - }, +/turf/unsimulated/floor/reinforced, /area/centcom) "be" = ( /turf/simulated/floor/tiled, @@ -3182,11 +3178,7 @@ /obj/effect/floor_decal/industrial/warning/corner{ dir = 4 }, -/turf/unsimulated/floor{ - icon = 'icons/turf/flooring/tiles.dmi'; - icon_state = "reinforced"; - name = "reinforced floor" - }, +/turf/unsimulated/floor/reinforced, /area/centcom) "ll" = ( /obj/effect/floor_decal/industrial/outline/grey, @@ -3606,11 +3598,7 @@ /obj/effect/floor_decal/industrial/warning/corner{ dir = 1 }, -/turf/unsimulated/floor{ - icon = 'icons/turf/flooring/tiles.dmi'; - icon_state = "reinforced"; - name = "reinforced floor" - }, +/turf/unsimulated/floor/reinforced, /area/centcom) "mM" = ( /obj/machinery/pipedispenser/orderable, @@ -3937,11 +3925,7 @@ /area/shuttle/ccboat) "nN" = ( /obj/effect/floor_decal/industrial/warning/corner, -/turf/unsimulated/floor{ - icon = 'icons/turf/flooring/tiles.dmi'; - icon_state = "reinforced"; - name = "reinforced floor" - }, +/turf/unsimulated/floor/reinforced, /area/centcom) "nO" = ( /obj/structure/table/rack, @@ -4311,11 +4295,7 @@ /obj/effect/floor_decal/industrial/warning/corner{ dir = 8 }, -/turf/unsimulated/floor{ - icon = 'icons/turf/flooring/tiles.dmi'; - icon_state = "reinforced"; - name = "reinforced floor" - }, +/turf/unsimulated/floor/reinforced, /area/centcom) "oV" = ( /obj/machinery/door/airlock/security{ @@ -7241,11 +7221,7 @@ /area/centcom/command) "ys" = ( /obj/effect/floor_decal/industrial/warning, -/turf/unsimulated/floor{ - icon = 'icons/turf/flooring/tiles.dmi'; - icon_state = "reinforced"; - name = "reinforced floor" - }, +/turf/unsimulated/floor/reinforced, /area/centcom) "yu" = ( /obj/machinery/power/thermoregulator, @@ -7467,11 +7443,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 8 }, -/turf/unsimulated/floor{ - icon = 'icons/turf/flooring/tiles.dmi'; - icon_state = "reinforced"; - name = "reinforced floor" - }, +/turf/unsimulated/floor/reinforced, /area/centcom) "zm" = ( /obj/structure/closet{ @@ -8972,11 +8944,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 4 }, -/turf/unsimulated/floor{ - icon = 'icons/turf/flooring/tiles.dmi'; - icon_state = "reinforced"; - name = "reinforced floor" - }, +/turf/unsimulated/floor/reinforced, /area/centcom) "EA" = ( /obj/structure/bed/chair/office/dark{ @@ -11457,11 +11425,7 @@ /turf/simulated/floor/tiled/dark, /area/centcom/security/residential) "Mn" = ( -/turf/unsimulated/floor{ - icon = 'icons/turf/flooring/tiles.dmi'; - icon_state = "reinforced"; - name = "reinforced floor" - }, +/turf/unsimulated/floor/reinforced, /area/centcom) "Mp" = ( /obj/effect/floor_decal/borderfloorwhite{ diff --git a/maps/stellar_delight/ship_centcom.dmm b/maps/stellar_delight/ship_centcom.dmm index 66fed5dced..9dad652592 100644 --- a/maps/stellar_delight/ship_centcom.dmm +++ b/maps/stellar_delight/ship_centcom.dmm @@ -2107,11 +2107,7 @@ /area/centcom/security/residential) "gF" = ( /obj/effect/floor_decal/industrial/warning/corner, -/turf/unsimulated/floor{ - icon = 'icons/turf/flooring/tiles.dmi'; - icon_state = "reinforced"; - name = "reinforced floor" - }, +/turf/unsimulated/floor/reinforced, /area/centcom) "gN" = ( /obj/effect/floor_decal/emblem/stellardelight{ @@ -4315,11 +4311,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 4 }, -/turf/unsimulated/floor{ - icon = 'icons/turf/flooring/tiles.dmi'; - icon_state = "reinforced"; - name = "reinforced floor" - }, +/turf/unsimulated/floor/reinforced, /area/centcom) "pl" = ( /obj/effect/floor_decal/emblem/stellardelight{ @@ -4692,11 +4684,7 @@ /obj/effect/floor_decal/industrial/warning/corner{ dir = 8 }, -/turf/unsimulated/floor{ - icon = 'icons/turf/flooring/tiles.dmi'; - icon_state = "reinforced"; - name = "reinforced floor" - }, +/turf/unsimulated/floor/reinforced, /area/centcom) "rM" = ( /obj/structure/bed/chair/shuttle, @@ -5370,11 +5358,7 @@ /obj/effect/floor_decal/industrial/warning/corner{ dir = 4 }, -/turf/unsimulated/floor{ - icon = 'icons/turf/flooring/tiles.dmi'; - icon_state = "reinforced"; - name = "reinforced floor" - }, +/turf/unsimulated/floor/reinforced, /area/centcom) "vR" = ( /obj/structure/flora/pottedplant{ @@ -5515,11 +5499,7 @@ /area/tdome/tdome1) "wj" = ( /obj/effect/floor_decal/industrial/warning, -/turf/unsimulated/floor{ - icon = 'icons/turf/flooring/tiles.dmi'; - icon_state = "reinforced"; - name = "reinforced floor" - }, +/turf/unsimulated/floor/reinforced, /area/centcom) "wk" = ( /obj/structure/table/rack, @@ -5942,11 +5922,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 8 }, -/turf/unsimulated/floor{ - icon = 'icons/turf/flooring/tiles.dmi'; - icon_state = "reinforced"; - name = "reinforced floor" - }, +/turf/unsimulated/floor/reinforced, /area/centcom) "yI" = ( /obj/effect/floor_decal/borderfloorwhite{ @@ -6116,11 +6092,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 1 }, -/turf/unsimulated/floor{ - icon = 'icons/turf/flooring/tiles.dmi'; - icon_state = "reinforced"; - name = "reinforced floor" - }, +/turf/unsimulated/floor/reinforced, /area/centcom) "zy" = ( /obj/effect/floor_decal/derelict/d11, @@ -6137,11 +6109,7 @@ /obj/effect/floor_decal/industrial/warning/corner{ dir = 1 }, -/turf/unsimulated/floor{ - icon = 'icons/turf/flooring/tiles.dmi'; - icon_state = "reinforced"; - name = "reinforced floor" - }, +/turf/unsimulated/floor/reinforced, /area/centcom) "zG" = ( /obj/structure/bed/chair/wood/wings, @@ -10487,11 +10455,7 @@ /turf/simulated/floor/tiled, /area/centcom/command) "MS" = ( -/turf/unsimulated/floor{ - icon = 'icons/turf/flooring/tiles.dmi'; - icon_state = "reinforced"; - name = "reinforced floor" - }, +/turf/unsimulated/floor/reinforced, /area/centcom) "MT" = ( /obj/structure/table/glass, diff --git a/maps/tether/submaps/tether_centcom.dmm b/maps/tether/submaps/tether_centcom.dmm index ef1cc3498a..fedd6b98a1 100644 --- a/maps/tether/submaps/tether_centcom.dmm +++ b/maps/tether/submaps/tether_centcom.dmm @@ -2331,11 +2331,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 1 }, -/turf/unsimulated/floor{ - icon = 'icons/turf/flooring/tiles.dmi'; - icon_state = "reinforced"; - name = "reinforced floor" - }, +/turf/unsimulated/floor/reinforced, /area/centcom) "hv" = ( /obj/machinery/light/flamp/noshade, @@ -3295,11 +3291,7 @@ /obj/effect/floor_decal/industrial/warning/corner{ dir = 4 }, -/turf/unsimulated/floor{ - icon = 'icons/turf/flooring/tiles.dmi'; - icon_state = "reinforced"; - name = "reinforced floor" - }, +/turf/unsimulated/floor/reinforced, /area/centcom) "kS" = ( /obj/effect/floor_decal/borderfloor, @@ -4659,11 +4651,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 8 }, -/turf/unsimulated/floor{ - icon = 'icons/turf/flooring/tiles.dmi'; - icon_state = "reinforced"; - name = "reinforced floor" - }, +/turf/unsimulated/floor/reinforced, /area/centcom) "qY" = ( /obj/machinery/account_database{ @@ -10293,11 +10281,7 @@ /obj/effect/floor_decal/industrial/warning/corner{ dir = 1 }, -/turf/unsimulated/floor{ - icon = 'icons/turf/flooring/tiles.dmi'; - icon_state = "reinforced"; - name = "reinforced floor" - }, +/turf/unsimulated/floor/reinforced, /area/centcom) "Mx" = ( /obj/structure/closet/secure_closet/freezer/fridge, @@ -11164,11 +11148,7 @@ /turf/simulated/floor/tiled, /area/centcom/security) "Oz" = ( -/turf/unsimulated/floor{ - icon = 'icons/turf/flooring/tiles.dmi'; - icon_state = "reinforced"; - name = "reinforced floor" - }, +/turf/unsimulated/floor/reinforced, /area/centcom) "OA" = ( /obj/effect/floor_decal/steeldecal/steel_decals5, @@ -12007,11 +11987,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 4 }, -/turf/unsimulated/floor{ - icon = 'icons/turf/flooring/tiles.dmi'; - icon_state = "reinforced"; - name = "reinforced floor" - }, +/turf/unsimulated/floor/reinforced, /area/centcom) "QL" = ( /obj/structure/grille, @@ -14929,11 +14905,7 @@ /area/centcom/terminal/shuttlefluff) "Yf" = ( /obj/effect/floor_decal/industrial/warning/corner, -/turf/unsimulated/floor{ - icon = 'icons/turf/flooring/tiles.dmi'; - icon_state = "reinforced"; - name = "reinforced floor" - }, +/turf/unsimulated/floor/reinforced, /area/centcom) "Yh" = ( /obj/effect/floor_decal/borderfloorwhite{ @@ -15125,11 +15097,7 @@ /area/centcom/control) "YF" = ( /obj/effect/floor_decal/industrial/warning, -/turf/unsimulated/floor{ - icon = 'icons/turf/flooring/tiles.dmi'; - icon_state = "reinforced"; - name = "reinforced floor" - }, +/turf/unsimulated/floor/reinforced, /area/centcom) "YH" = ( /obj/structure/bed/chair/office/dark, @@ -15186,11 +15154,7 @@ /obj/effect/floor_decal/industrial/warning/corner{ dir = 8 }, -/turf/unsimulated/floor{ - icon = 'icons/turf/flooring/tiles.dmi'; - icon_state = "reinforced"; - name = "reinforced floor" - }, +/turf/unsimulated/floor/reinforced, /area/centcom) "YQ" = ( /turf/simulated/shuttle/floor{