From d67019ce68e73e17dd61532eda2c96ef5dd84cf0 Mon Sep 17 00:00:00 2001 From: Erika Fox <94164348+Bjarl@users.noreply.github.com> Date: Sun, 15 Sep 2024 21:22:09 -0400 Subject: [PATCH] kills stupid beacons --- .../WasteRuins/wasteplanet_tradepost.dmm | 132 +++--------------- .../mining/equipment/marker_beacons.dm | 22 --- 2 files changed, 21 insertions(+), 133 deletions(-) diff --git a/_maps/RandomRuins/WasteRuins/wasteplanet_tradepost.dmm b/_maps/RandomRuins/WasteRuins/wasteplanet_tradepost.dmm index 7ab987ac043b..7416fcd96329 100644 --- a/_maps/RandomRuins/WasteRuins/wasteplanet_tradepost.dmm +++ b/_maps/RandomRuins/WasteRuins/wasteplanet_tradepost.dmm @@ -197,7 +197,6 @@ dir = 9 }, /obj/effect/turf_decal/industrial/warning/corner, -/obj/structure/marker_beacon/acidproof, /turf/open/floor/plating/wasteplanet, /area/overmap_encounter/planetoid/cave/explored) "cL" = ( @@ -397,7 +396,6 @@ icon_state = "streak4" }, /obj/effect/decal/cleanable/dirt/dust, -/obj/structure/marker_beacon/acidproof, /turf/open/floor/concrete/pavement/wasteplanet, /area/overmap_encounter/planetoid/cave/explored) "eH" = ( @@ -800,7 +798,6 @@ dir = 9 }, /obj/item/ammo_casing/spent, -/obj/structure/marker_beacon/acidproof, /turf/open/floor/concrete/pavement/wasteplanet, /area/overmap_encounter/planetoid/cave/explored) "jn" = ( @@ -898,10 +895,6 @@ /obj/item/ammo_casing/spent, /turf/open/floor/pod, /area/ruin/wasteplanet/tradepost/center) -"kM" = ( -/obj/structure/marker_beacon/acidproof, -/turf/open/floor/concrete/pavement/wasteplanet, -/area/overmap_encounter/planetoid/cave/explored) "kP" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{ @@ -948,12 +941,6 @@ }, /obj/effect/turf_decal/industrial/warning, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/cable{ - icon_state = "1-2" - }, /turf/open/floor/plasteel/tech, /area/ruin/wasteplanet/tradepost/barracks) "lp" = ( @@ -978,7 +965,6 @@ "lv" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4, -/obj/structure/marker_beacon/acidproof, /turf/open/floor/concrete/pavement/wasteplanet, /area/overmap_encounter/planetoid/cave/explored) "lw" = ( @@ -1198,7 +1184,6 @@ /area/ruin/wasteplanet/tradepost/center) "nL" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/marker_beacon/acidproof, /obj/effect/decal/cleanable/glass, /turf/open/floor/concrete/pavement/wasteplanet, /area/overmap_encounter/planetoid/cave/explored) @@ -1243,10 +1228,6 @@ /obj/item/stack/sheet/mineral/sandbags, /turf/open/floor/concrete/pavement/wasteplanet/lit, /area/overmap_encounter/planetoid/wasteplanet/explored) -"oL" = ( -/obj/structure/marker_beacon/acidproof, -/turf/open/floor/plating/asteroid/wasteplanet, -/area/overmap_encounter/planetoid/cave/explored) "oQ" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt, @@ -1299,11 +1280,6 @@ }, /turf/open/floor/plasteel/tech, /area/ruin/wasteplanet/tradepost/warehouse) -"pA" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/marker_beacon/acidproof, -/turf/open/floor/concrete/pavement/wasteplanet, -/area/overmap_encounter/planetoid/cave/explored) "pL" = ( /obj/structure/window/reinforced/fulltile, /obj/structure/grille, @@ -1451,10 +1427,6 @@ }, /turf/open/floor/wood/walnut, /area/ruin/wasteplanet/tradepost/center) -"rm" = ( -/obj/structure/marker_beacon/acidproof, -/turf/open/floor/concrete/pavement/wasteplanet/lit, -/area/overmap_encounter/planetoid/wasteplanet/explored) "ro" = ( /obj/structure/extinguisher_cabinet/directional/east, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{ @@ -1488,12 +1460,6 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4, /turf/open/floor/plasteel/patterned/grid, /area/ruin/wasteplanet/tradepost/barracks) -"rP" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt, -/obj/structure/marker_beacon/acidproof, -/turf/open/floor/concrete/pavement/wasteplanet, -/area/overmap_encounter/planetoid/cave/explored) "rQ" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{ dir = 4 @@ -1534,17 +1500,6 @@ /obj/item/clothing/head/soft/inteq, /turf/open/floor/concrete/pavement/wasteplanet, /area/overmap_encounter/planetoid/cave/explored) -"so" = ( -/obj/structure/barricade/sandbags, -/obj/effect/turf_decal/industrial/warning{ - dir = 8 - }, -/obj/effect/turf_decal/industrial/warning{ - dir = 4 - }, -/obj/structure/marker_beacon/acidproof, -/turf/open/floor/plating/wasteplanet, -/area/overmap_encounter/planetoid/cave/explored) "su" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ @@ -1723,11 +1678,7 @@ "uf" = ( /obj/effect/turf_decal/industrial/warning/full, /obj/structure/closet/crate, -/obj/item/stack/marker_beacon/acidproof/thirty, -/obj/item/stack/marker_beacon/acidproof/thirty, /obj/machinery/light/small/broken/directional/south, -/obj/item/stack/marker_beacon/acidproof/thirty, -/obj/item/stack/marker_beacon/acidproof/thirty, /turf/open/floor/pod/dark, /area/ruin/wasteplanet/tradepost/warehouse) "ug" = ( @@ -1735,7 +1686,6 @@ /obj/effect/turf_decal/industrial/warning/cee{ dir = 4 }, -/obj/structure/marker_beacon/acidproof, /turf/open/floor/plating/wasteplanet, /area/overmap_encounter/planetoid/cave/explored) "um" = ( @@ -1883,7 +1833,6 @@ "vQ" = ( /obj/effect/decal/cleanable/molten_object/large, /obj/effect/decal/cleanable/dirt, -/obj/structure/marker_beacon/acidproof, /turf/open/floor/concrete/pavement/wasteplanet, /area/overmap_encounter/planetoid/cave/explored) "vR" = ( @@ -2340,7 +2289,6 @@ /obj/effect/decal/cleanable/blood/old{ icon_state = "drip5" }, -/obj/structure/marker_beacon/acidproof, /turf/open/floor/concrete/pavement/wasteplanet, /area/overmap_encounter/planetoid/cave/explored) "AQ" = ( @@ -2634,10 +2582,6 @@ /obj/effect/decal/cleanable/oil/streak, /turf/open/floor/concrete/pavement/wasteplanet, /area/overmap_encounter/planetoid/cave/explored) -"Eg" = ( -/obj/structure/marker_beacon/acidproof, -/turf/open/floor/plating/wasteplanet/rust, -/area/overmap_encounter/planetoid/cave/explored) "Ei" = ( /obj/structure/cable{ icon_state = "0-5" @@ -2750,7 +2694,6 @@ "Fn" = ( /obj/structure/barricade/sandbags, /obj/effect/turf_decal/industrial/warning/cee, -/obj/structure/marker_beacon/acidproof, /turf/open/floor/plating/wasteplanet, /area/overmap_encounter/planetoid/cave/explored) "Ft" = ( @@ -3388,11 +3331,6 @@ /obj/structure/table, /turf/open/floor/pod/light, /area/ruin/wasteplanet/tradepost/center) -"Mj" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/marker_beacon/acidproof, -/turf/open/floor/concrete/pavement/wasteplanet/lit, -/area/overmap_encounter/planetoid/wasteplanet/explored) "Ml" = ( /turf/open/floor/plating/wasteplanet/rust/lit, /area/overmap_encounter/planetoid/wasteplanet/explored) @@ -3838,7 +3776,6 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4{ dir = 8 }, -/obj/structure/marker_beacon/acidproof, /turf/open/floor/concrete/pavement/wasteplanet, /area/overmap_encounter/planetoid/cave/explored) "Rk" = ( @@ -4064,20 +4001,6 @@ }, /turf/open/floor/wood/walnut, /area/ruin/wasteplanet/tradepost/center) -"Tf" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ - dir = 4 - }, -/obj/structure/marker_beacon/acidproof, -/turf/open/floor/concrete/pavement/wasteplanet, -/area/overmap_encounter/planetoid/cave/explored) "Tg" = ( /obj/machinery/atmospherics/pipe/layer_manifold, /turf/closed/wall, @@ -4151,7 +4074,6 @@ /turf/open/floor/plating/wasteplanet, /area/overmap_encounter/planetoid/cave/explored) "TC" = ( -/obj/structure/marker_beacon/acidproof, /obj/structure/cable{ icon_state = "1-10" }, @@ -4267,11 +4189,6 @@ /obj/item/soap, /turf/open/floor/pod/light, /area/ruin/wasteplanet/tradepost/center) -"Vm" = ( -/obj/effect/gibspawner/robot, -/obj/structure/marker_beacon/acidproof, -/turf/open/floor/concrete/pavement/wasteplanet, -/area/overmap_encounter/planetoid/cave/explored) "Vw" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ @@ -4305,11 +4222,6 @@ }, /turf/open/floor/wood/walnut, /area/ruin/wasteplanet/tradepost/center) -"VU" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/marker_beacon/acidproof, -/turf/open/floor/plating/wasteplanet/rust, -/area/overmap_encounter/planetoid/cave/explored) "VY" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/item/stack/ore/salvage/scrapgold, @@ -4367,7 +4279,6 @@ /turf/open/floor/concrete/pavement/wasteplanet, /area/overmap_encounter/planetoid/cave/explored) "WF" = ( -/obj/structure/marker_beacon/acidproof, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ dir = 9 }, @@ -4511,7 +4422,6 @@ /obj/effect/turf_decal/industrial/warning/corner{ dir = 4 }, -/obj/structure/marker_beacon/acidproof, /turf/open/floor/plating/wasteplanet, /area/overmap_encounter/planetoid/cave/explored) "Xz" = ( @@ -5019,7 +4929,7 @@ Ma HV JG Fc -Mj +iq HV em em @@ -5230,7 +5140,7 @@ BN sH HV iq -rm +Wg AT HV Fc @@ -5276,7 +5186,7 @@ en en en en -so +TB TB Xw QB @@ -5387,7 +5297,7 @@ FV ug QB Yt -rP +AV AV cJ cL @@ -5491,7 +5401,7 @@ QB FP HH AV -rP +AV AV QZ QB @@ -5858,7 +5768,7 @@ hO Ps QB uC -Tf +pk GQ hg xA @@ -5922,14 +5832,14 @@ QB sL QB QB -VU +UQ PZ Hc Hc UQ Hc sL -VU +UQ QB QB QB @@ -6068,7 +5978,7 @@ dS gA Yt Yt -Tf +pk sL Yt QB @@ -6118,7 +6028,7 @@ MS MS MS Ie -Vm +km Yt GQ do @@ -6181,13 +6091,13 @@ QZ QZ dB lq -rP +AV AV wA eF LO sv -kM +Yt PZ sL sL @@ -6487,7 +6397,7 @@ Wy Wy Hv Ki -pA +QZ hV Yt Yt @@ -6505,14 +6415,14 @@ bW tp zD QB -VU +UQ sL UQ SE Hc UQ sL -Eg +sL QB QB kd @@ -6806,7 +6716,7 @@ QB Nh QB Bk -kM +Yt vz ua ua @@ -6921,7 +6831,7 @@ WG Yt Yt qi -kM +Yt QB QB QB @@ -7035,7 +6945,7 @@ QB QB QB sL -oL +QB QB jy Nl @@ -7192,7 +7102,7 @@ QB QB QB QB -oL +QB QB Nl en @@ -7296,7 +7206,7 @@ QB QB QB QB -Eg +sL QB QB QB @@ -7345,7 +7255,7 @@ cZ vu qb QB -oL +QB FP PZ sL diff --git a/code/modules/mining/equipment/marker_beacons.dm b/code/modules/mining/equipment/marker_beacons.dm index 9829cbfdd9cd..5c6845498a5e 100644 --- a/code/modules/mining/equipment/marker_beacons.dm +++ b/code/modules/mining/equipment/marker_beacons.dm @@ -158,25 +158,3 @@ GLOBAL_LIST_INIT(marker_beacon_colors, sortList(list( if(input_color) picked_color = input_color update_appearance() - -/obj/item/stack/marker_beacon/acidproof - name = "Acid-Proof Marker Beacon" - desc = "Prism-brand path illumination devices. Used by miners to mark paths and warn of danger. This one has a reinforced casing" - resistance_flags = 100 - merge_type = /obj/item/stack/marker_beacon/acidproof - custom_price = 400 //more expensive than normal ones - structure_type = /obj/structure/marker_beacon/acidproof - -/obj/item/stack/marker_beacon/acidproof/ten - amount = 10 - -/obj/item/stack/marker_beacon/acidproof/thirty - amount = 30 - -//and the structure - -/obj/structure/marker_beacon/acidproof - name = "acid proof marker beacon" - desc = "Prism-brand path illumination device. It is anchored in place and glowing steadily. This one has a reinforced casing" - resistance_flags = 100 - stack_type = /obj/item/stack/marker_beacon/acidproof