From ca4d72b34a666c1b403ed8348318ec2eb4696372 Mon Sep 17 00:00:00 2001 From: Heroman Date: Sat, 5 Nov 2022 16:17:05 +1000 Subject: [PATCH] Removes all cabinets instead of making functional ones spawn empty --- code/game/objects/structures/fireaxe.dm | 6 +++--- maps/groundbase/gb-z1.dmm | 3 --- maps/groundbase/gb-z3.dmm | 3 --- maps/stellar_delight/stellar_delight1.dmm | 3 --- maps/stellar_delight/stellar_delight2.dmm | 6 ------ maps/tether/tether-03-surface3.dmm | 3 --- 6 files changed, 3 insertions(+), 21 deletions(-) diff --git a/code/game/objects/structures/fireaxe.dm b/code/game/objects/structures/fireaxe.dm index c1bac02dfd..7234baf50e 100644 --- a/code/game/objects/structures/fireaxe.dm +++ b/code/game/objects/structures/fireaxe.dm @@ -12,7 +12,7 @@ var/hitstaken = 0 var/locked = 1 var/smashed = 0 - var/starts_with_axe = FALSE + var/starts_with_axe = TRUE /obj/structure/fireaxecabinet/Initialize() . = ..() @@ -189,5 +189,5 @@ icon_state = text("fireaxe[][][][]",hasaxe,open,hitstaken,smashed) -/obj/structure/fireaxecabinet/full - starts_with_axe = TRUE +/obj/structure/fireaxecabinet/empty + starts_with_axe = FALSE diff --git a/maps/groundbase/gb-z1.dmm b/maps/groundbase/gb-z1.dmm index 1dd654eac8..eaf8506958 100644 --- a/maps/groundbase/gb-z1.dmm +++ b/maps/groundbase/gb-z1.dmm @@ -539,9 +539,6 @@ "bq" = ( /obj/machinery/vending/wardrobe/atmosdrobe, /obj/machinery/atmospherics/unary/vent_pump/on, -/obj/structure/sign/scenery/fakefireaxe{ - pixel_y = 32 - }, /turf/simulated/floor/tiled, /area/groundbase/engineering/atmos/monitoring) "br" = ( diff --git a/maps/groundbase/gb-z3.dmm b/maps/groundbase/gb-z3.dmm index 43ec24f24c..5284e42d07 100644 --- a/maps/groundbase/gb-z3.dmm +++ b/maps/groundbase/gb-z3.dmm @@ -4,9 +4,6 @@ /area/groundbase/exploration/equipment) "ab" = ( /obj/machinery/suit_cycler/medical, -/obj/structure/sign/scenery/fakefireaxe{ - pixel_y = 32 - }, /turf/simulated/floor/tiled/white, /area/groundbase/medical/paramedic) "ac" = ( diff --git a/maps/stellar_delight/stellar_delight1.dmm b/maps/stellar_delight/stellar_delight1.dmm index 4fcbbdcde0..8c2fe66caf 100644 --- a/maps/stellar_delight/stellar_delight1.dmm +++ b/maps/stellar_delight/stellar_delight1.dmm @@ -19580,9 +19580,6 @@ /area/security/detectives_office) "Pz" = ( /obj/structure/table/bench/marble, -/obj/structure/fireaxecabinet{ - pixel_y = -32 - }, /obj/effect/landmark/start/paramedic, /turf/simulated/floor/tiled/eris/white/bluecorner, /area/stellardelight/deck1/paramedic) diff --git a/maps/stellar_delight/stellar_delight2.dmm b/maps/stellar_delight/stellar_delight2.dmm index dfdb9fa4a6..6b278aa92c 100644 --- a/maps/stellar_delight/stellar_delight2.dmm +++ b/maps/stellar_delight/stellar_delight2.dmm @@ -1903,9 +1903,6 @@ /obj/machinery/camera/network/engineering{ dir = 4 }, -/obj/structure/sign/scenery/fakefireaxe{ - pixel_x = -32 - }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/monitoring) "dU" = ( @@ -18682,9 +18679,6 @@ /obj/structure/flora/pottedplant/smallcactus{ pixel_y = 14 }, -/obj/structure/fireaxecabinet{ - pixel_y = 28 - }, /turf/simulated/floor/wood, /area/stellardelight/deck2/briefingroom) "Pm" = ( diff --git a/maps/tether/tether-03-surface3.dmm b/maps/tether/tether-03-surface3.dmm index cf3d07ebaa..aa820929d4 100644 --- a/maps/tether/tether-03-surface3.dmm +++ b/maps/tether/tether-03-surface3.dmm @@ -6527,9 +6527,6 @@ /area/tether/surfacebase/outside/outside3) "ajH" = ( /obj/machinery/computer/secure_data, -/obj/structure/fireaxecabinet{ - pixel_y = 30 - }, /turf/simulated/floor/tiled/dark, /area/bridge) "ajI" = (