Skip to content

Commit

Permalink
Removes lightsout landmark
Browse files Browse the repository at this point in the history
The Electrical Storm event now just picks a random spot on the station
(using find_safe_turf()), and then overloads APCS near it.

Less work for mappers, more randomness in the selection of lightbulb
destruction.
  • Loading branch information
coiax committed Jan 18, 2018
1 parent 418069c commit 5b4ac8b
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 98 deletions.
2 changes: 0 additions & 2 deletions _maps/map_files/BoxStation/BoxStation.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -17711,7 +17711,6 @@
/turf/open/floor/plasteel,
/area/crew_quarters/locker)
"aSj" = (
/obj/effect/landmark/lightsout,
/turf/open/floor/plasteel,
/area/crew_quarters/locker)
"aSk" = (
Expand Down Expand Up @@ -43903,7 +43902,6 @@
/turf/open/floor/plasteel,
/area/engine/engineering)
"cdp" = (
/obj/effect/landmark/lightsout,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 8
Expand Down
41 changes: 0 additions & 41 deletions _maps/map_files/Deltastation/DeltaStation2.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -3089,7 +3089,6 @@
/obj/structure/cable/white{
icon_state = "2-8"
},
/obj/effect/landmark/lightsout,
/obj/machinery/holopad,
/obj/structure/cable/white{
icon_state = "1-2"
Expand Down Expand Up @@ -4867,7 +4866,6 @@
/turf/open/floor/plasteel/neutral,
/area/hallway/secondary/entry)
"akh" = (
/obj/effect/landmark/lightsout,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
Expand Down Expand Up @@ -16615,7 +16613,6 @@
},
/area/hallway/primary/fore)
"aJe" = (
/obj/effect/landmark/lightsout,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 8
},
Expand Down Expand Up @@ -17300,7 +17297,6 @@
},
/area/quartermaster/sorting)
"aKG" = (
/obj/effect/landmark/lightsout,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
Expand Down Expand Up @@ -20821,7 +20817,6 @@
/turf/open/floor/carpet,
/area/crew_quarters/bar/atrium)
"aSb" = (
/obj/effect/landmark/lightsout,
/turf/open/floor/plasteel/redyellow,
/area/crew_quarters/bar/atrium)
"aSc" = (
Expand Down Expand Up @@ -21386,7 +21381,6 @@
/obj/machinery/atmospherics/pipe/simple/yellow/visible{
dir = 4
},
/obj/effect/landmark/lightsout,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel/neutral,
/area/engine/atmos)
Expand Down Expand Up @@ -24199,7 +24193,6 @@
/obj/structure/cable/white{
icon_state = "2-8"
},
/obj/effect/landmark/lightsout,
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 4
},
Expand Down Expand Up @@ -25486,7 +25479,6 @@
/obj/structure/cable/white{
icon_state = "1-2"
},
/obj/effect/landmark/lightsout,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
Expand Down Expand Up @@ -28014,7 +28006,6 @@
/area/quartermaster/miningoffice)
"bgJ" = (
/obj/machinery/holopad,
/obj/effect/landmark/lightsout,
/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
Expand Down Expand Up @@ -32184,7 +32175,6 @@
/obj/structure/cable/white{
icon_state = "1-2"
},
/obj/effect/landmark/lightsout,
/turf/open/floor/plasteel/neutral,
/area/security/brig)
"bpl" = (
Expand Down Expand Up @@ -33030,7 +33020,6 @@
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"bqP" = (
/obj/effect/landmark/lightsout,
/obj/structure/cable/white{
icon_state = "4-8"
},
Expand Down Expand Up @@ -39667,7 +39656,6 @@
/obj/structure/cable/white{
icon_state = "1-2"
},
/obj/effect/landmark/lightsout,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
Expand Down Expand Up @@ -42344,7 +42332,6 @@
/obj/structure/cable/white{
icon_state = "4-8"
},
/obj/effect/landmark/lightsout,
/turf/open/floor/plasteel/neutral,
/area/engine/break_room)
"bIk" = (
Expand Down Expand Up @@ -42525,7 +42512,6 @@
/turf/open/floor/plasteel,
/area/storage/primary)
"bIy" = (
/obj/effect/landmark/lightsout,
/turf/open/floor/plasteel/neutral,
/area/storage/primary)
"bIz" = (
Expand Down Expand Up @@ -45839,7 +45825,6 @@
},
/area/security/detectives_office)
"bPn" = (
/obj/effect/landmark/lightsout,
/turf/open/floor/plasteel/neutral,
/area/hallway/primary/starboard)
"bPo" = (
Expand Down Expand Up @@ -49963,7 +49948,6 @@
/obj/structure/cable/white{
icon_state = "1-2"
},
/obj/effect/landmark/lightsout,
/obj/structure/cable/white{
icon_state = "1-4"
},
Expand Down Expand Up @@ -52728,7 +52712,6 @@
/turf/open/floor/plasteel/neutral,
/area/hallway/primary/central)
"ccy" = (
/obj/effect/landmark/lightsout,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel/blue/corner,
/area/hallway/primary/central)
Expand Down Expand Up @@ -54100,7 +54083,6 @@
/obj/structure/cable/white{
icon_state = "2-4"
},
/obj/effect/landmark/lightsout,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
Expand Down Expand Up @@ -56406,7 +56388,6 @@
},
/area/security/courtroom)
"cjW" = (
/obj/effect/landmark/lightsout,
/turf/open/floor/plasteel/vault{
dir = 5
},
Expand Down Expand Up @@ -56833,7 +56814,6 @@
/turf/open/floor/plasteel/grimy,
/area/library)
"ckS" = (
/obj/effect/landmark/lightsout,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
Expand Down Expand Up @@ -61909,7 +61889,6 @@
icon_state = "1-2"
},
/obj/machinery/holopad,
/obj/effect/landmark/lightsout,
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
/area/hallway/secondary/command)
Expand Down Expand Up @@ -62688,7 +62667,6 @@
/turf/open/floor/plasteel/neutral,
/area/hallway/primary/central)
"cxe" = (
/obj/effect/landmark/lightsout,
/turf/open/floor/plasteel/neutral,
/area/hallway/primary/central)
"cxf" = (
Expand Down Expand Up @@ -63563,7 +63541,6 @@
/turf/open/floor/plasteel/neutral,
/area/crew_quarters/locker)
"cyT" = (
/obj/effect/landmark/lightsout,
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
dir = 1
},
Expand Down Expand Up @@ -66037,7 +66014,6 @@
/turf/open/floor/plasteel,
/area/engine/engineering)
"cEb" = (
/obj/effect/landmark/lightsout,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
Expand Down Expand Up @@ -67338,7 +67314,6 @@
/obj/structure/cable/white{
icon_state = "1-2"
},
/obj/effect/landmark/lightsout,
/turf/open/floor/plasteel/neutral,
/area/hallway/primary/central)
"cGH" = (
Expand Down Expand Up @@ -68240,7 +68215,6 @@
/turf/closed/wall,
/area/maintenance/port)
"cIz" = (
/obj/effect/landmark/lightsout,
/obj/structure/cable/white{
icon_state = "1-2"
},
Expand Down Expand Up @@ -69742,7 +69716,6 @@
/turf/open/floor/plasteel/neutral,
/area/crew_quarters/dorms)
"cLd" = (
/obj/effect/landmark/lightsout,
/turf/open/floor/plasteel/neutral,
/area/crew_quarters/dorms)
"cLe" = (
Expand Down Expand Up @@ -70471,7 +70444,6 @@
/obj/structure/cable/white{
icon_state = "1-2"
},
/obj/effect/landmark/lightsout,
/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden,
/obj/structure/disposalpipe/junction/flip{
dir = 1
Expand Down Expand Up @@ -73003,7 +72975,6 @@
/turf/open/floor/plasteel/whitepurple/corner,
/area/science/research)
"cSt" = (
/obj/effect/landmark/lightsout,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
Expand Down Expand Up @@ -73934,7 +73905,6 @@
},
/area/hallway/primary/aft)
"cUp" = (
/obj/effect/landmark/lightsout,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
Expand Down Expand Up @@ -74020,7 +73990,6 @@
/turf/open/floor/plasteel/cmo,
/area/medical/medbay/central)
"cUy" = (
/obj/effect/landmark/lightsout,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
Expand Down Expand Up @@ -75332,7 +75301,6 @@
/obj/structure/cable/white{
icon_state = "4-8"
},
/obj/effect/landmark/lightsout,
/obj/effect/turf_decal/stripes/line{
dir = 2
},
Expand Down Expand Up @@ -80684,7 +80652,6 @@
icon_state = "4-8"
},
/obj/item/device/radio/beacon,
/obj/effect/landmark/lightsout,
/obj/structure/disposalpipe/segment,
/turf/open/floor/plasteel/whiteblue,
/area/medical/medbay/central)
Expand Down Expand Up @@ -82449,7 +82416,6 @@
/area/science/circuit)
"dmw" = (
/obj/structure/disposalpipe/segment,
/obj/effect/landmark/lightsout,
/turf/open/floor/plasteel/white/side{
dir = 10
},
Expand Down Expand Up @@ -83509,7 +83475,6 @@
/area/science/research)
"doF" = (
/obj/machinery/holopad,
/obj/effect/landmark/lightsout,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
Expand Down Expand Up @@ -87637,7 +87602,6 @@
/obj/structure/cable/white{
icon_state = "2-8"
},
/obj/effect/landmark/lightsout,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 4
},
Expand Down Expand Up @@ -91388,7 +91352,6 @@
/turf/open/floor/plasteel,
/area/science/robotics/lab)
"dEP" = (
/obj/effect/landmark/lightsout,
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 4
},
Expand Down Expand Up @@ -95316,7 +95279,6 @@
/obj/structure/cable/white{
icon_state = "1-2"
},
/obj/effect/landmark/lightsout,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
Expand Down Expand Up @@ -99351,7 +99313,6 @@
/obj/structure/cable/white{
icon_state = "1-2"
},
/obj/effect/landmark/lightsout,
/turf/open/floor/plasteel/green,
/area/medical/virology)
"dVC" = (
Expand Down Expand Up @@ -101699,7 +101660,6 @@
/turf/open/floor/plasteel,
/area/hallway/secondary/exit/departure_lounge)
"eaF" = (
/obj/effect/landmark/lightsout,
/turf/open/floor/plasteel/neutral,
/area/hallway/secondary/exit/departure_lounge)
"eaG" = (
Expand Down Expand Up @@ -105141,7 +105101,6 @@
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/effect/landmark/lightsout,
/turf/open/floor/plasteel/grimy,
/area/chapel/main)
"QNf" = (
Expand Down
Loading

0 comments on commit 5b4ac8b

Please sign in to comment.