From 7118da887bc78ff5c57ed062ea538f481cf8d9ac Mon Sep 17 00:00:00 2001 From: ShizCalev Date: Tue, 23 Jan 2018 17:21:01 -0500 Subject: [PATCH] Fixes derelict area issues --- _maps/RandomRuins/SpaceRuins/TheDerelict.dmm | 506 ++++++++---------- _maps/RandomRuins/SpaceRuins/abandonedzoo.dmm | 2 +- _maps/RandomRuins/SpaceRuins/oldAIsat.dmm | 2 +- _maps/RandomRuins/SpaceRuins/onehalf.dmm | 24 +- _maps/RandomZLevels/moonoutpost19.dmm | 6 +- code/modules/power/cable.dm | 55 +- 6 files changed, 277 insertions(+), 318 deletions(-) diff --git a/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm b/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm index 4ca72b28d88..97aa4f45e20 100644 --- a/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm +++ b/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm @@ -440,10 +440,8 @@ /turf/open/floor/plasteel, /area/ruin/space/derelict/solar_control) "br" = ( -/obj/item/stack/cable_coil/cut{ - amount = 2; - dir = 2; - icon_state = "coil_red2" +/obj/item/stack/cable_coil/cut/red{ + amount = 2 }, /turf/open/floor/plasteel, /area/ruin/space/derelict/solar_control) @@ -498,10 +496,8 @@ }, /area/ruin/space/derelict/solar_control) "bC" = ( -/obj/item/stack/cable_coil/cut{ - amount = 2; - dir = 2; - icon_state = "coil_red2" +/obj/item/stack/cable_coil/cut/red{ + amount = 2 }, /turf/open/floor/plasteel{ icon_state = "damaged3" @@ -562,9 +558,6 @@ /obj/item/stack/sheet/glass, /turf/template_noop, /area/ruin/space/derelict/bridge/ai_upload) -"bN" = ( -/turf/open/floor/circuit/airless, -/area/ruin/space/derelict/bridge/ai_upload) "bO" = ( /turf/open/floor/plating/airless, /area/ruin/space/derelict/bridge/ai_upload) @@ -646,7 +639,7 @@ /turf/open/floor/plasteel/airless{ icon_state = "damaged4" }, -/area/template_noop) +/area/ruin/unpowered/no_grav) "cc" = ( /obj/structure/cable{ icon_state = "1-2" @@ -833,12 +826,6 @@ }, /turf/open/floor/plasteel, /area/ruin/space/derelict/bridge/access) -"cL" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/plasteel, -/area/ruin/space/derelict/bridge/access) "cM" = ( /obj/structure/cable{ icon_state = "4-8" @@ -858,7 +845,7 @@ /turf/open/floor/plasteel/airless, /area/ruin/space/derelict/gravity_generator) "cP" = ( -/obj/item/stack/cable_coil/cut, +/obj/item/stack/cable_coil/cut/red, /turf/open/floor/plasteel/airless{ icon_state = "damaged4" }, @@ -887,8 +874,8 @@ dir = 4 }, /obj/structure/rack, -/obj/item/stack/cable_coil/cut, -/obj/item/stack/cable_coil/cut, +/obj/item/stack/cable_coil/cut/red, +/obj/item/stack/cable_coil/cut/red, /turf/open/floor/plasteel, /area/ruin/space/derelict/bridge/access) "cT" = ( @@ -998,7 +985,7 @@ /turf/open/floor/plasteel/airless/solarpanel, /area/ruin/unpowered/no_grav) "dk" = ( -/obj/item/stack/cable_coil/cut, +/obj/item/stack/cable_coil/cut/red, /turf/template_noop, /area/template_noop) "dl" = ( @@ -1202,7 +1189,7 @@ }, /area/ruin/space/derelict/singularity_engine) "dR" = ( -/obj/item/stack/cable_coil/cut, +/obj/item/stack/cable_coil/cut/red, /obj/machinery/light/small{ dir = 1 }, @@ -1393,12 +1380,6 @@ icon_state = "damaged2" }, /area/ruin/space/derelict/singularity_engine) -"eA" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/open/floor/plasteel, -/area/ruin/space/derelict/bridge/access) "eB" = ( /obj/machinery/door/window/eastleft{ name = "Heads of Staff"; @@ -1430,7 +1411,7 @@ }, /area/ruin/space/derelict/singularity_engine) "eG" = ( -/obj/item/stack/cable_coil/cut, +/obj/item/stack/cable_coil/cut/red, /turf/open/floor/plasteel/airless{ icon_state = "damaged4" }, @@ -1465,12 +1446,6 @@ }, /turf/open/floor/plasteel, /area/ruin/space/derelict/bridge) -"eL" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/plasteel, -/area/ruin/space/derelict/bridge) "eM" = ( /obj/structure/cable{ icon_state = "2-8" @@ -1683,7 +1658,7 @@ /turf/open/floor/plating/airless, /area/ruin/space/derelict/singularity_engine) "fu" = ( -/obj/item/stack/cable_coil/cut, +/obj/item/stack/cable_coil/cut/red, /turf/open/floor/plasteel/airless{ icon_state = "damaged5" }, @@ -1750,17 +1725,11 @@ /turf/open/floor/plasteel/airless, /area/ruin/space/derelict/bridge/access) "fG" = ( -/obj/item/stack/cable_coil/cut, +/obj/item/stack/cable_coil/cut/red, /turf/open/floor/plasteel/airless{ icon_state = "damaged3" }, /area/ruin/space/derelict/singularity_engine) -"fH" = ( -/obj/item/stack/cable_coil/cut, -/turf/open/floor/plasteel/airless{ - icon_state = "damaged2" - }, -/area/ruin/space/derelict/singularity_engine) "fI" = ( /obj/effect/spawner/structure/window/hollow/reinforced/directional{ dir = 10 @@ -1862,7 +1831,7 @@ /obj/item/shard{ icon_state = "medium" }, -/obj/item/stack/cable_coil/cut, +/obj/item/stack/cable_coil/cut/red, /turf/open/floor/plating/airless, /area/ruin/space/derelict/singularity_engine) "fY" = ( @@ -1879,10 +1848,8 @@ /turf/closed/wall, /area/ruin/space/derelict/hallway/primary) "ga" = ( -/obj/item/stack/cable_coil/cut{ - amount = 2; - dir = 2; - icon_state = "coil_red2" +/obj/item/stack/cable_coil/cut/red{ + amount = 2 }, /turf/open/floor/plasteel/airless{ icon_state = "damaged3" @@ -2130,10 +2097,8 @@ /turf/open/floor/plating/airless, /area/ruin/space/derelict/singularity_engine) "gU" = ( -/obj/item/stack/cable_coil/cut{ - amount = 2; - dir = 2; - icon_state = "coil_red2" +/obj/item/stack/cable_coil/cut/red{ + amount = 2 }, /turf/open/floor/plating/airless, /area/ruin/space/derelict/hallway/primary) @@ -2364,12 +2329,6 @@ icon_state = "damaged4" }, /area/ruin/space/derelict/singularity_engine) -"hO" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/open/floor/plating/airless, -/area/ruin/space/derelict/hallway/primary) "hP" = ( /turf/open/floor/plating, /area/ruin/space/derelict/arrival) @@ -2440,7 +2399,7 @@ }, /area/ruin/unpowered/no_grav) "ib" = ( -/obj/item/stack/cable_coil/cut, +/obj/item/stack/cable_coil/cut/red, /turf/open/floor/plating/airless, /area/ruin/unpowered/no_grav) "ic" = ( @@ -2515,10 +2474,8 @@ /turf/open/floor/plating/airless, /area/ruin/space/derelict/singularity_engine) "ip" = ( -/obj/item/stack/cable_coil/cut{ - amount = 2; - dir = 2; - icon_state = "coil_red2" +/obj/item/stack/cable_coil/cut/red{ + amount = 2 }, /turf/open/floor/plasteel/airless{ icon_state = "damaged2" @@ -2802,18 +2759,14 @@ /turf/open/floor/plasteel/airless/white, /area/ruin/space/derelict/medical) "ji" = ( -/obj/item/stack/cable_coil/cut{ - amount = 2; - dir = 2; - icon_state = "coil_red2" +/obj/item/stack/cable_coil/cut/red{ + amount = 2 }, /turf/open/floor/plasteel/airless/white, /area/ruin/space/derelict/medical) "jj" = ( -/obj/item/stack/cable_coil/cut{ - amount = 2; - dir = 2; - icon_state = "coil_red2" +/obj/item/stack/cable_coil/cut/red{ + amount = 2 }, /turf/open/floor/plasteel/airless{ icon_state = "damaged3" @@ -2855,12 +2808,6 @@ "jp" = ( /turf/open/floor/plasteel/airless/white, /area/ruin/unpowered/no_grav) -"jq" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/open/floor/plasteel/airless, -/area/ruin/space/derelict/hallway/primary) "jr" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on, /turf/open/floor/plasteel/airless{ @@ -2934,10 +2881,8 @@ /turf/open/floor/plasteel/airless/white, /area/ruin/space/derelict/medical) "jD" = ( -/obj/item/stack/cable_coil/cut{ - amount = 2; - dir = 2; - icon_state = "coil_red2" +/obj/item/stack/cable_coil/cut/red{ + amount = 2 }, /turf/open/floor/plasteel/airless{ icon_state = "damaged2" @@ -3022,10 +2967,8 @@ /turf/open/floor/plasteel/airless, /area/ruin/space/derelict/hallway/primary) "jR" = ( -/obj/item/stack/cable_coil/cut{ - amount = 2; - dir = 2; - icon_state = "coil_red2" +/obj/item/stack/cable_coil/cut/red{ + amount = 2 }, /turf/open/floor/plating/airless, /area/ruin/unpowered/no_grav) @@ -3158,11 +3101,7 @@ /turf/open/floor/plasteel/airless, /area/ruin/space/derelict/medical/chapel) "km" = ( -/obj/item/stack/cable_coil/cut{ - amount = 2; - dir = 2; - icon_state = "coil_red2" - }, +/obj/item/stack/cable_coil/cut/red, /turf/open/floor/plasteel/airless{ icon_state = "floorscorched1" }, @@ -3201,12 +3140,6 @@ /obj/machinery/portable_atmospherics/scrubber, /turf/open/floor/plasteel, /area/ruin/space/derelict/arrival) -"kt" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/plating/airless, -/area/ruin/space/derelict/hallway/primary) "ku" = ( /obj/structure/cable{ icon_state = "4-8" @@ -3215,12 +3148,6 @@ icon_state = "floorscorched1" }, /area/ruin/space/derelict/hallway/primary) -"kv" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/plasteel/airless, -/area/ruin/space/derelict/hallway/primary) "kw" = ( /obj/machinery/door/window{ base_state = "right"; @@ -3280,17 +3207,6 @@ }, /turf/open/floor/plasteel/airless, /area/ruin/space/derelict/hallway/primary) -"kF" = ( -/obj/machinery/door/window{ - base_state = "right"; - dir = 4; - icon_state = "right" - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/plasteel/airless, -/area/ruin/space/derelict/hallway/primary) "kG" = ( /obj/structure/cable{ icon_state = "0-8" @@ -3312,7 +3228,7 @@ "kI" = ( /obj/machinery/vending/hydronutrients, /turf/open/floor/plasteel/airless, -/area/ruin/space/derelict/hallway/primary) +/area/ruin/space/derelict/hallway/primary/port) "kJ" = ( /obj/structure/girder, /turf/open/floor/plasteel/airless, @@ -3409,21 +3325,17 @@ /obj/structure/table, /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plasteel/airless, -/area/ruin/unpowered/no_grav) +/area/ruin/space/derelict/hallway/primary/port) "lc" = ( /obj/structure/window/reinforced{ dir = 8 }, -/obj/item/stack/cable_coil/cut{ - amount = 2; - dir = 2; - icon_state = "coil_red2" - }, +/obj/item/stack/cable_coil/cut/red, /turf/open/floor/plasteel/airless, -/area/ruin/unpowered/no_grav) +/area/ruin/space/derelict/hallway/primary/port) "ld" = ( /obj/structure/lattice, -/obj/item/stack/cable_coil/cut, +/obj/item/stack/cable_coil/cut/red, /turf/template_noop, /area/template_noop) "le" = ( @@ -3451,15 +3363,13 @@ dir = 8 }, /turf/open/floor/plasteel/airless, -/area/ruin/unpowered/no_grav) +/area/ruin/space/derelict/hallway/primary/port) "lj" = ( -/obj/item/stack/cable_coil/cut{ - amount = 2; - dir = 2; - icon_state = "coil_red2" +/obj/item/stack/cable_coil/cut/red{ + amount = 2 }, /turf/open/floor/plasteel/airless, -/area/ruin/unpowered/no_grav) +/area/ruin/space/derelict/hallway/primary/port) "lk" = ( /obj/structure/closet/wardrobe/orange, /obj/effect/spawner/lootdrop/maintenance{ @@ -3469,7 +3379,7 @@ /obj/item/shovel/spade, /obj/item/cultivator, /turf/open/floor/plasteel/airless, -/area/ruin/unpowered/no_grav) +/area/ruin/space/derelict/hallway/primary/port) "ll" = ( /obj/structure/grille, /turf/open/floor/plating, @@ -3545,32 +3455,32 @@ /area/ruin/space/derelict/atmospherics) "lz" = ( /turf/template_noop, -/area/ruin/unpowered/no_grav) +/area/ruin/space/derelict/hallway/primary/port) "lA" = ( /obj/structure/lattice, /turf/template_noop, -/area/ruin/unpowered/no_grav) +/area/ruin/space/derelict/hallway/primary/port) "lB" = ( /obj/structure/cable{ icon_state = "1-2" }, /obj/structure/window/reinforced, /turf/open/floor/plasteel/airless, -/area/ruin/unpowered/no_grav) +/area/ruin/space/derelict/hallway/primary/port) "lC" = ( /obj/structure/window/reinforced, /turf/open/floor/plasteel/airless, -/area/ruin/unpowered/no_grav) +/area/ruin/space/derelict/hallway/primary/port) "lD" = ( /obj/effect/spawner/structure/window/hollow/reinforced/middle{ dir = 4 }, /turf/open/floor/plating/airless, -/area/ruin/unpowered/no_grav) +/area/ruin/space/derelict/hallway/primary/port) "lE" = ( /obj/structure/bed, /turf/open/floor/plasteel/airless, -/area/ruin/unpowered/no_grav) +/area/ruin/space/derelict/hallway/primary/port) "lF" = ( /turf/open/floor/plasteel/airless/floorgrime, /area/ruin/space/derelict/hallway/primary) @@ -3638,13 +3548,7 @@ icon_state = "1-2" }, /turf/open/floor/plasteel/airless, -/area/ruin/unpowered/no_grav) -"lR" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/middle{ - dir = 4 - }, -/turf/open/floor/plating/airless, -/area/ruin/unpowered/no_grav) +/area/ruin/space/derelict/hallway/primary/port) "lS" = ( /obj/structure/closet/wardrobe/mixed, /obj/effect/spawner/lootdrop/maintenance{ @@ -3681,7 +3585,7 @@ "lX" = ( /obj/effect/spawner/structure/window/hollow/reinforced/end, /turf/open/floor/plating/airless, -/area/ruin/unpowered/no_grav) +/area/ruin/space/derelict/hallway/primary/port) "lY" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -3700,9 +3604,9 @@ /area/ruin/space/derelict/atmospherics) "mb" = ( /obj/structure/lattice, -/obj/item/stack/cable_coil/cut, +/obj/item/stack/cable_coil/cut/red, /turf/template_noop, -/area/ruin/unpowered/no_grav) +/area/ruin/space/derelict/hallway/primary/port) "mc" = ( /obj/machinery/door/window{ dir = 8 @@ -3711,7 +3615,7 @@ icon_state = "medium" }, /turf/open/floor/plasteel/airless, -/area/ruin/unpowered/no_grav) +/area/ruin/space/derelict/hallway/primary/port) "md" = ( /turf/closed/wall, /area/ruin/space/derelict/hallway/secondary) @@ -3835,9 +3739,9 @@ /turf/template_noop, /area/ruin/space/derelict/atmospherics) "mA" = ( -/obj/item/stack/cable_coil/cut, +/obj/item/stack/cable_coil/cut/red, /turf/template_noop, -/area/ruin/unpowered/no_grav) +/area/ruin/space/derelict/hallway/primary/port) "mB" = ( /obj/structure/door_assembly/door_assembly_mai{ name = "airlock assembly" @@ -3877,7 +3781,7 @@ /turf/open/floor/plasteel/airless{ icon_state = "damaged2" }, -/area/ruin/unpowered/no_grav) +/area/ruin/space/derelict/hallway/primary/port) "mI" = ( /obj/structure/cable{ icon_state = "1-2" @@ -3885,7 +3789,7 @@ /turf/open/floor/plasteel/airless, /area/ruin/space/derelict/hallway/secondary) "mJ" = ( -/obj/item/stack/cable_coil/cut, +/obj/item/stack/cable_coil/cut/red, /turf/open/floor/plating/airless, /area/ruin/space/derelict/hallway/primary) "mK" = ( @@ -3910,7 +3814,7 @@ "mO" = ( /obj/effect/spawner/lootdrop/maintenance, /turf/template_noop, -/area/ruin/unpowered/no_grav) +/area/ruin/space/derelict/hallway/primary/port) "mP" = ( /obj/machinery/portable_atmospherics/pump, /turf/open/floor/plating/airless, @@ -3927,9 +3831,6 @@ /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating/airless, /area/ruin/space/derelict/hallway/primary) -"mS" = ( -/turf/template_noop, -/area/ruin/space/derelict/atmospherics) "mT" = ( /obj/machinery/light/small, /turf/open/floor/plasteel/airless, @@ -3983,6 +3884,7 @@ /area/ruin/space/derelict/hallway/secondary) "nc" = ( /obj/machinery/power/apc{ + areastring = "/area/ruin/space/derelict/atmospherics"; dir = 1; name = "Worn-out APC"; pixel_y = 24 @@ -3991,7 +3893,7 @@ icon_state = "0-4" }, /turf/open/floor/plasteel/airless, -/area/ruin/space/derelict/atmospherics) +/area/ruin/space/derelict/hallway/secondary) "nd" = ( /obj/structure/cable{ icon_state = "4-8" @@ -4143,10 +4045,6 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on, /turf/open/floor/plasteel/airless, /area/ruin/space/derelict/hallway/secondary) -"nx" = ( -/obj/structure/lattice, -/turf/template_noop, -/area/ruin/space/derelict/hallway/secondary) "ny" = ( /obj/effect/spawner/structure/window/hollow/reinforced/directional, /turf/open/floor/plating/airless, @@ -4336,14 +4234,6 @@ /obj/item/stack/rods, /turf/open/floor/plating/airless, /area/ruin/space/derelict/hallway/secondary) -"od" = ( -/obj/machinery/door/window{ - base_state = "right"; - dir = 4; - icon_state = "right" - }, -/turf/open/floor/plasteel/airless, -/area/ruin/unpowered/no_grav) "oe" = ( /obj/machinery/light/small, /turf/open/floor/plasteel/airless, @@ -4556,12 +4446,50 @@ }, /turf/open/floor/plasteel, /area/ruin/space/derelict/bridge) -"oF" = ( -/obj/structure/frame/computer{ - dir = 1 +"wK" = ( +/turf/open/floor/plasteel/airless{ + icon_state = "damaged3" }, -/turf/open/floor/plasteel, -/area/ruin/space/derelict/bridge) +/area/ruin/space/derelict/se_solar) +"Av" = ( +/obj/item/stack/rods, +/turf/open/floor/plating/airless, +/area/ruin/space/derelict/hallway/primary/port) +"Ih" = ( +/turf/open/floor/plasteel/airless{ + icon_state = "damaged3" + }, +/area/ruin/space/derelict/hallway/primary/port) +"KN" = ( +/turf/closed/wall, +/area/ruin/space/derelict/hallway/primary/port) +"KT" = ( +/obj/item/stack/cable_coil/cut/red{ + amount = 2 + }, +/turf/open/floor/plating/airless, +/area/ruin/space/derelict/hallway/primary/port) +"OT" = ( +/turf/closed/wall/r_wall, +/area/ruin/space/derelict/hallway/primary/port) +"Rd" = ( +/obj/item/stack/cable_coil/red, +/turf/open/floor/plasteel/airless{ + icon_state = "damaged4" + }, +/area/ruin/space/derelict/singularity_engine) +"Tm" = ( +/turf/open/floor/plating/airless, +/area/ruin/space/derelict/hallway/primary/port) +"Vz" = ( +/turf/open/floor/plasteel/airless, +/area/ruin/space/derelict/hallway/primary/port) +"Xq" = ( +/obj/item/stack/cable_coil/cut/red, +/turf/open/floor/plasteel/airless{ + icon_state = "damaged2" + }, +/area/ruin/space/derelict/singularity_engine) (1,1,1) = {" aa @@ -7592,7 +7520,7 @@ aa me mU mZ -nx +ab ay aa aa @@ -7661,7 +7589,7 @@ dr dr dr dr -fH +Xq fd ft ft @@ -7743,14 +7671,14 @@ ax aX be ax -bj -bj -bj -bj -bj -bj -bO -bO +ac +ac +ac +ac +ac +ac +ay +ay cb aa aa @@ -8379,7 +8307,7 @@ lt ls lt lx -mS +aa md mU mU @@ -8492,8 +8420,8 @@ ls lt mP lx -mS -lx +aa +md nc mU nz @@ -8583,7 +8511,7 @@ dr hv iD gP -hI +jp fZ go go @@ -9349,8 +9277,8 @@ dr dr dO dO -ez -dP +Xq +Rd dO ez fd @@ -9396,7 +9324,7 @@ mp mp mt lx -mS +aa md nk nu @@ -9507,9 +9435,9 @@ mt lx lx mt -mz -mz -mS +ab +ab +aa md nl nv @@ -9607,19 +9535,19 @@ go gc go gk -gr -ay +Vz +Tm lz lz lz lz -aY +OT lz lA lA lz -gP -gP +Ih +Ih lz lA lz @@ -9720,13 +9648,13 @@ go gc go gk -gr -ay +Vz +Tm lz lA lA lA -aY +OT lA lA lA @@ -9834,20 +9762,20 @@ gc go gk lb -ay +Tm lA lA lz lA -aY +OT lz -gP +Ih lA lA lA lA lA -ch +KN lz md nd @@ -9946,22 +9874,22 @@ go gc go gk -gr -ay -eu +Vz +Tm +Av lA lz lA -aY +OT lA -aY +OT mH lA -aY -ay -ch -ch -ch +OT +Tm +KN +KN +KN md nd mU @@ -10059,9 +9987,9 @@ jc kz go gk -gr -gr -ay +Vz +Vz +Tm lA lz mb @@ -10070,8 +9998,8 @@ lz mA lA lz -aY -ay +OT +Tm lz lA lz @@ -10174,10 +10102,10 @@ jc kR lc li -gr -ay -ay -ay +Vz +Tm +Tm +Tm lz lz lz @@ -10198,8 +10126,8 @@ nI ab ab ld -ay -ay +nV +nV aY aa aa @@ -10285,13 +10213,13 @@ go gk gk gk -gr +Vz lj lB lQ lj -ay -jR +Tm +KT lz lz lA @@ -10307,12 +10235,12 @@ mU nz ac aa -ay +nV ab -ay -ay -gP -gr +nV +nV +wK +nR aa aa aa @@ -10398,13 +10326,13 @@ fZ gk kI kS -gr -gr +Vz +Vz lC -gr -gr -gr -aY +Vz +Vz +Vz +OT lA lA lA @@ -10413,19 +10341,19 @@ lA lA lA lA -ay +Tm md nd mU nz ac aa -ay -ay -ay -gP -od -gr +nV +nV +nV +wK +og +nR nB aa aa @@ -10511,22 +10439,22 @@ go gk gk kT -aY -aY +OT +OT lD lD lX mc -aY -ay -ay +OT +Tm +Tm lz lz lA lz lz -ay -gr +Tm +Vz md nd mU @@ -10624,22 +10552,22 @@ ko go gk gk -aY +OT lb -gr -gr -gr -gr -aY -gr -jR -ay +Vz +Vz +Vz +Vz +OT +Vz +KT +Tm lz lA lz lz -ay -gr +Tm +Vz md nd mU @@ -10737,22 +10665,22 @@ gn go kJ fZ -ch -gr -gr +KN +Vz +Vz lE lE -gr -aY -gr -ay -ay -ay -aY +Vz +OT +Vz +Tm +Tm +Tm +OT lz -ay -gr -gr +Tm +Vz +Vz md nd mU @@ -10850,22 +10778,22 @@ gn go gn fZ -ch +KN lk lE lE lE -gr -aY -gr +Vz +OT +Vz lj -gr -gr -aY -ay -gr -gr -gr +Vz +Vz +OT +Tm +Vz +Vz +Vz md nm mI diff --git a/_maps/RandomRuins/SpaceRuins/abandonedzoo.dmm b/_maps/RandomRuins/SpaceRuins/abandonedzoo.dmm index da3f343fd7a..379be838e9d 100644 --- a/_maps/RandomRuins/SpaceRuins/abandonedzoo.dmm +++ b/_maps/RandomRuins/SpaceRuins/abandonedzoo.dmm @@ -546,7 +546,7 @@ }, /area/ruin/space/has_grav/abandonedzoo) "bq" = ( -/obj/item/stack/cable_coil/cut, +/obj/item/stack/cable_coil/cut/red, /obj/item/stack/tile/plasteel{ pixel_x = 3; pixel_y = -4 diff --git a/_maps/RandomRuins/SpaceRuins/oldAIsat.dmm b/_maps/RandomRuins/SpaceRuins/oldAIsat.dmm index 174761d6f72..c690c3c5f30 100644 --- a/_maps/RandomRuins/SpaceRuins/oldAIsat.dmm +++ b/_maps/RandomRuins/SpaceRuins/oldAIsat.dmm @@ -181,7 +181,7 @@ /turf/open/floor/plating/airless, /area/tcommsat/chamber) "aJ" = ( -/obj/item/stack/cable_coil/cut{ +/obj/item/stack/cable_coil/cut/red{ amount = 1 }, /turf/open/floor/plating/airless, diff --git a/_maps/RandomRuins/SpaceRuins/onehalf.dmm b/_maps/RandomRuins/SpaceRuins/onehalf.dmm index 0b48599ae24..1615a67600f 100644 --- a/_maps/RandomRuins/SpaceRuins/onehalf.dmm +++ b/_maps/RandomRuins/SpaceRuins/onehalf.dmm @@ -24,10 +24,8 @@ /turf/template_noop, /area/template_noop) "ae" = ( -/obj/item/stack/cable_coil/cut{ - amount = 2; - dir = 2; - icon_state = "coil_red2" +/obj/item/stack/cable_coil/cut/red{ + amount = 2 }, /obj/structure/lattice/catwalk, /turf/template_noop, @@ -427,10 +425,8 @@ /obj/structure/disposalpipe/broken{ dir = 4 }, -/obj/item/stack/cable_coil/cut{ - amount = 2; - dir = 2; - icon_state = "coil_red2" +/obj/item/stack/cable_coil/cut/red{ + amount = 2 }, /turf/open/floor/plating/airless{ icon_state = "platingdmg2" @@ -1022,10 +1018,8 @@ /area/ruin/space/has_grav/onehalf/bridge) "cK" = ( /obj/structure/lattice, -/obj/item/stack/cable_coil/cut{ - amount = 2; - dir = 2; - icon_state = "coil_red2" +/obj/item/stack/cable_coil/cut/red{ + amount = 2 }, /turf/template_noop, /area/ruin/space/has_grav/onehalf/hallway) @@ -1229,10 +1223,8 @@ /turf/template_noop, /area/template_noop) "dl" = ( -/obj/item/stack/cable_coil/cut{ - amount = 2; - dir = 2; - icon_state = "coil_red2" +/obj/item/stack/cable_coil/cut/red{ + amount = 2 }, /turf/template_noop, /area/template_noop) diff --git a/_maps/RandomZLevels/moonoutpost19.dmm b/_maps/RandomZLevels/moonoutpost19.dmm index 4bae843b31c..38fd7b4cad0 100644 --- a/_maps/RandomZLevels/moonoutpost19.dmm +++ b/_maps/RandomZLevels/moonoutpost19.dmm @@ -3120,10 +3120,8 @@ id = "Awaylab"; name = "Acid-Proof containment chamber blast door" }, -/obj/item/stack/cable_coil/cut{ - amount = 1; - icon_state = "coil_red1"; - item_state = "coil_red1" +/obj/item/stack/cable_coil/cut/red{ + amount = 1 }, /turf/open/floor/plating{ heat_capacity = 1e+006 diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm index 039fcef9430..883df8a6c9b 100644 --- a/code/modules/power/cable.dm +++ b/code/modules/power/cable.dm @@ -740,13 +740,6 @@ GLOBAL_LIST_INIT(cable_coil_recipes, list (new/datum/stack_recipe("cable restrai // Misc. ///////////////////////////// -/obj/item/stack/cable_coil/cut/Initialize(mapload) - . = ..() - amount = rand(1,2) - pixel_x = rand(-2,2) - pixel_y = rand(-2,2) - update_icon() - /obj/item/stack/cable_coil/red item_color = "red" color = "#ff0000" @@ -782,5 +775,53 @@ GLOBAL_LIST_INIT(cable_coil_recipes, list (new/datum/stack_recipe("cable restrai item_color = null color = "#ffffff" + /obj/item/stack/cable_coil/random/five amount = 5 + +/obj/item/stack/cable_coil/cut + amount = null + icon_state = "coil2" + +/obj/item/stack/cable_coil/cut/Initialize(mapload) + . = ..() + if(!amount) + amount = rand(1,2) + pixel_x = rand(-2,2) + pixel_y = rand(-2,2) + update_icon() + +/obj/item/stack/cable_coil/cut/red + item_color = "red" + color = "#ff0000" + +/obj/item/stack/cable_coil/cut/yellow + item_color = "yellow" + color = "#ffff00" + +/obj/item/stack/cable_coil/cut/blue + item_color = "blue" + color = "#1919c8" + +/obj/item/stack/cable_coil/cut/green + item_color = "green" + color = "#00aa00" + +/obj/item/stack/cable_coil/cut/pink + item_color = "pink" + color = "#ff3ccd" + +/obj/item/stack/cable_coil/cut/orange + item_color = "orange" + color = "#ff8000" + +/obj/item/stack/cable_coil/cut/cyan + item_color = "cyan" + color = "#00ffff" + +/obj/item/stack/cable_coil/cut/white + item_color = "white" + +/obj/item/stack/cable_coil/cut/random + item_color = null + color = "#ffffff"