Removes lightsout landmark

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.
This commit is contained in:
Jack Edge
2018-01-18 13:09:57 +00:00
parent 418069ca36
commit 5b4ac8bb0d
6 changed files with 8 additions and 98 deletions
@@ -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" = (
@@ -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
@@ -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"
@@ -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
},
@@ -16615,7 +16613,6 @@
},
/area/hallway/primary/fore)
"aJe" = (
/obj/effect/landmark/lightsout,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 8
},
@@ -17300,7 +17297,6 @@
},
/area/quartermaster/sorting)
"aKG" = (
/obj/effect/landmark/lightsout,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
@@ -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" = (
@@ -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)
@@ -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
},
@@ -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
},
@@ -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,
@@ -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" = (
@@ -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"
},
@@ -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
},
@@ -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" = (
@@ -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" = (
@@ -45839,7 +45825,6 @@
},
/area/security/detectives_office)
"bPn" = (
/obj/effect/landmark/lightsout,
/turf/open/floor/plasteel/neutral,
/area/hallway/primary/starboard)
"bPo" = (
@@ -49963,7 +49948,6 @@
/obj/structure/cable/white{
icon_state = "1-2"
},
/obj/effect/landmark/lightsout,
/obj/structure/cable/white{
icon_state = "1-4"
},
@@ -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)
@@ -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
},
@@ -56406,7 +56388,6 @@
},
/area/security/courtroom)
"cjW" = (
/obj/effect/landmark/lightsout,
/turf/open/floor/plasteel/vault{
dir = 5
},
@@ -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
},
@@ -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)
@@ -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" = (
@@ -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
},
@@ -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
},
@@ -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" = (
@@ -68240,7 +68215,6 @@
/turf/closed/wall,
/area/maintenance/port)
"cIz" = (
/obj/effect/landmark/lightsout,
/obj/structure/cable/white{
icon_state = "1-2"
},
@@ -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" = (
@@ -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
@@ -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
},
@@ -73934,7 +73905,6 @@
},
/area/hallway/primary/aft)
"cUp" = (
/obj/effect/landmark/lightsout,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
@@ -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
},
@@ -75332,7 +75301,6 @@
/obj/structure/cable/white{
icon_state = "4-8"
},
/obj/effect/landmark/lightsout,
/obj/effect/turf_decal/stripes/line{
dir = 2
},
@@ -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)
@@ -82449,7 +82416,6 @@
/area/science/circuit)
"dmw" = (
/obj/structure/disposalpipe/segment,
/obj/effect/landmark/lightsout,
/turf/open/floor/plasteel/white/side{
dir = 10
},
@@ -83509,7 +83475,6 @@
/area/science/research)
"doF" = (
/obj/machinery/holopad,
/obj/effect/landmark/lightsout,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
@@ -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
},
@@ -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
},
@@ -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
},
@@ -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" = (
@@ -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" = (
@@ -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" = (
@@ -2727,7 +2727,6 @@
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
dir = 2
},
/obj/effect/landmark/lightsout,
/turf/open/floor/plasteel/red/corner{
dir = 1
},
@@ -9573,7 +9572,6 @@
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
dir = 4
},
/obj/effect/landmark/lightsout,
/turf/open/floor/plasteel,
/area/crew_quarters/dorms)
"auj" = (
@@ -10668,7 +10666,6 @@
/obj/structure/cable/yellow{
icon_state = "2-8"
},
/obj/effect/landmark/lightsout,
/turf/open/floor/plasteel,
/area/security/brig)
"awn" = (
@@ -19283,7 +19280,6 @@
/obj/structure/cable/yellow{
icon_state = "4-8"
},
/obj/effect/landmark/lightsout,
/turf/open/floor/plasteel/floorgrime,
/area/crew_quarters/locker)
"aOA" = (
@@ -22738,7 +22734,6 @@
/turf/open/floor/plasteel,
/area/quartermaster/storage)
"aVI" = (
/obj/effect/landmark/lightsout,
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
/area/quartermaster/storage)
@@ -23706,7 +23701,6 @@
/obj/structure/cable/yellow{
icon_state = "1-2"
},
/obj/effect/landmark/lightsout,
/obj/effect/turf_decal/plaque{
icon_state = "L7"
},
@@ -24655,7 +24649,6 @@
/turf/open/floor/plasteel,
/area/engine/engineering)
"aZJ" = (
/obj/effect/landmark/lightsout,
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 9
@@ -25956,7 +25949,6 @@
"bbZ" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/effect/landmark/lightsout,
/turf/open/floor/plasteel,
/area/hallway/primary/port)
"bca" = (
@@ -34116,7 +34108,6 @@
/obj/structure/cable/yellow{
icon_state = "2-4"
},
/obj/effect/landmark/lightsout,
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"bsp" = (
@@ -39180,7 +39171,6 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/effect/landmark/lightsout,
/turf/open/floor/plasteel/neutral/corner{
dir = 1
},
@@ -39351,7 +39341,6 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/obj/effect/landmark/lightsout,
/turf/open/floor/plasteel/neutral/corner{
dir = 4
},
@@ -39475,7 +39464,6 @@
/turf/open/floor/plasteel/bar,
/area/crew_quarters/bar)
"bDE" = (
/obj/effect/landmark/lightsout,
/turf/open/floor/plasteel/bar,
/area/crew_quarters/bar)
"bDF" = (
@@ -39750,7 +39738,6 @@
/turf/open/floor/wood,
/area/security/vacantoffice)
"bEr" = (
/obj/effect/landmark/lightsout,
/turf/open/floor/wood,
/area/security/vacantoffice)
"bEs" = (
@@ -42977,7 +42964,6 @@
/area/library)
"bLj" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/effect/landmark/lightsout,
/turf/open/floor/carpet,
/area/library)
"bLk" = (
@@ -44325,7 +44311,6 @@
/turf/open/floor/plasteel,
/area/engine/atmos)
"bNT" = (
/obj/effect/landmark/lightsout,
/turf/open/floor/plasteel,
/area/engine/atmos)
"bNU" = (
@@ -48359,7 +48344,6 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/obj/effect/landmark/lightsout,
/obj/effect/turf_decal/plaque{
icon_state = "L8"
},
@@ -50973,7 +50957,6 @@
/turf/open/floor/plasteel/white,
/area/medical/storage)
"cbL" = (
/obj/effect/landmark/lightsout,
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 2
},
@@ -57544,7 +57527,6 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/obj/effect/landmark/lightsout,
/turf/open/floor/plasteel/white,
/area/science/research)
"cpt" = (
@@ -61593,7 +61575,6 @@
/obj/structure/cable/yellow{
icon_state = "1-8"
},
/obj/effect/landmark/lightsout,
/turf/open/floor/plasteel/white,
/area/medical/medbay/aft)
"cxk" = (
@@ -63716,7 +63697,6 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
/obj/effect/landmark/lightsout,
/turf/open/floor/plasteel,
/area/science/misc_lab)
"cBF" = (
@@ -65999,7 +65979,6 @@
/obj/structure/cable/yellow{
icon_state = "1-2"
},
/obj/effect/landmark/lightsout,
/turf/open/floor/plasteel/white,
/area/science/research)
"cGi" = (
@@ -66193,7 +66172,6 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 10
},
/obj/effect/landmark/lightsout,
/obj/machinery/holopad,
/obj/structure/cable/yellow{
icon_state = "2-4"
@@ -69929,7 +69907,6 @@
/turf/open/floor/plasteel,
/area/hallway/secondary/exit/departure_lounge)
"cNM" = (
/obj/effect/landmark/lightsout,
/turf/open/floor/plasteel,
/area/hallway/secondary/exit/departure_lounge)
"cNN" = (
@@ -72628,7 +72605,6 @@
/obj/structure/cable/yellow{
icon_state = "1-2"
},
/obj/effect/landmark/lightsout,
/obj/machinery/holopad,
/turf/open/floor/plasteel/white,
/area/science/xenobiology)
@@ -821,7 +821,6 @@
icon_state = "1-4"
},
/obj/machinery/holopad,
/obj/effect/landmark/lightsout,
/turf/open/floor/plasteel/vault,
/area/bridge)
"abF" = (
@@ -5258,7 +5257,6 @@
},
/area/hallway/primary/central)
"akd" = (
/obj/effect/landmark/lightsout,
/obj/structure/cable/white{
icon_state = "1-2"
},
@@ -5531,7 +5529,6 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/obj/effect/landmark/lightsout,
/obj/structure/cable/white{
icon_state = "1-4"
},
@@ -6161,7 +6158,6 @@
/obj/structure/cable/white{
icon_state = "2-4"
},
/obj/effect/landmark/lightsout,
/turf/open/floor/plasteel/neutral,
/area/quartermaster/storage)
"alF" = (
@@ -6262,7 +6258,6 @@
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/effect/landmark/lightsout,
/turf/open/floor/plasteel/neutral/side{
dir = 4
},
@@ -7989,7 +7984,6 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
/obj/effect/landmark/lightsout,
/obj/structure/cable/white{
icon_state = "1-2"
},
@@ -14085,7 +14079,6 @@
},
/obj/structure/table/wood,
/obj/item/kitchen/fork,
/obj/effect/landmark/lightsout,
/obj/structure/cable/white{
icon_state = "4-8"
},
@@ -14522,7 +14515,6 @@
},
/area/hallway/primary/central)
"aBL" = (
/obj/effect/landmark/lightsout,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
@@ -15971,7 +15963,6 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 8
},
/obj/effect/landmark/lightsout,
/obj/effect/turf_decal/delivery,
/turf/open/floor/plasteel,
/area/engine/engineering)
@@ -16742,7 +16733,6 @@
/area/hallway/primary/central)
"aFY" = (
/obj/machinery/holopad,
/obj/effect/landmark/lightsout,
/obj/structure/cable/white{
icon_state = "1-2"
},
@@ -20005,7 +19995,6 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 1
},
/obj/effect/landmark/lightsout,
/turf/open/floor/plasteel/neutral,
/area/hallway/secondary/exit)
"aMC" = (
@@ -21201,7 +21190,6 @@
/area/hallway/primary/central)
"aOU" = (
/obj/machinery/door/firedoor,
/obj/effect/landmark/lightsout,
/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
/obj/structure/cable/white{
icon_state = "4-8"
@@ -21974,7 +21962,6 @@
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"aQp" = (
/obj/effect/landmark/lightsout,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
@@ -25191,7 +25178,6 @@
/obj/structure/cable/white{
icon_state = "1-4"
},
/obj/effect/landmark/lightsout,
/turf/open/floor/plasteel/whitepurple/corner{
dir = 1
},
@@ -26266,7 +26252,6 @@
/obj/structure/cable/white{
icon_state = "2-4"
},
/obj/effect/landmark/lightsout,
/turf/open/floor/plasteel/blue,
/area/medical/medbay/zone3)
"aZK" = (
@@ -29501,7 +29486,6 @@
},
/area/hallway/primary/central)
"bgh" = (
/obj/effect/landmark/lightsout,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
-4
View File
@@ -248,10 +248,6 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/start/new_player)
/obj/effect/landmark/carpspawn
name = "carpspawn"
// lightsout.
/obj/effect/landmark/lightsout
name = "lightsout"
// observer-start.
/obj/effect/landmark/observer_start
name = "Observer-Start"
+8 -11
View File
@@ -19,18 +19,15 @@
var/list/epicentreList = list()
for(var/i=1, i <= lightsoutAmount, i++)
var/list/possibleEpicentres = list()
for(var/obj/effect/landmark/lightsout/newEpicentre in GLOB.landmarks_list)
if(!(newEpicentre in epicentreList))
possibleEpicentres += newEpicentre
if(possibleEpicentres.len)
epicentreList += pick(possibleEpicentres)
else
break
var/turf/T = find_safe_turf()
if(istype(T))
epicentreList += T
if(!epicentreList.len)
return
for(var/obj/effect/landmark/epicentre in epicentreList)
for(var/obj/machinery/power/apc/apc in urange(lightsoutRange, epicentre))
apc.overload_lighting()
for(var/centre in epicentreList)
for(var/a in GLOB.apcs_list)
var/obj/machinery/power/apc/A = a
if(get_dist(centre, A) <= lightsoutRange)
A.overload_lighting()