Merge pull request #34578 from coiax/lightsout-lightsout

Removes lightsout landmark
This commit is contained in:
Jordan Brown
2018-01-19 10:18:39 -05:00
committed by GitHub
6 changed files with 8 additions and 98 deletions
@@ -17605,7 +17605,6 @@
/turf/open/floor/plasteel,
/area/crew_quarters/locker)
"aSj" = (
/obj/effect/landmark/lightsout,
/turf/open/floor/plasteel,
/area/crew_quarters/locker)
"aSk" = (
@@ -43716,7 +43715,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
},
@@ -20820,7 +20816,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" = (
@@ -21385,7 +21380,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)
@@ -24198,7 +24192,6 @@
/obj/structure/cable/white{
icon_state = "2-8"
},
/obj/effect/landmark/lightsout,
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 4
},
@@ -25485,7 +25478,6 @@
/obj/structure/cable/white{
icon_state = "1-2"
},
/obj/effect/landmark/lightsout,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
@@ -28013,7 +28005,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,
@@ -32183,7 +32174,6 @@
/obj/structure/cable/white{
icon_state = "1-2"
},
/obj/effect/landmark/lightsout,
/turf/open/floor/plasteel/neutral,
/area/security/brig)
"bpl" = (
@@ -33029,7 +33019,6 @@
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"bqP" = (
/obj/effect/landmark/lightsout,
/obj/structure/cable/white{
icon_state = "4-8"
},
@@ -39666,7 +39655,6 @@
/obj/structure/cable/white{
icon_state = "1-2"
},
/obj/effect/landmark/lightsout,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
@@ -42343,7 +42331,6 @@
/obj/structure/cable/white{
icon_state = "4-8"
},
/obj/effect/landmark/lightsout,
/turf/open/floor/plasteel/neutral,
/area/engine/break_room)
"bIk" = (
@@ -42524,7 +42511,6 @@
/turf/open/floor/plasteel,
/area/storage/primary)
"bIy" = (
/obj/effect/landmark/lightsout,
/turf/open/floor/plasteel/neutral,
/area/storage/primary)
"bIz" = (
@@ -45835,7 +45821,6 @@
},
/area/security/detectives_office)
"bPn" = (
/obj/effect/landmark/lightsout,
/turf/open/floor/plasteel/neutral,
/area/hallway/primary/starboard)
"bPo" = (
@@ -49956,7 +49941,6 @@
/obj/structure/cable/white{
icon_state = "1-2"
},
/obj/effect/landmark/lightsout,
/obj/structure/cable/white{
icon_state = "1-4"
},
@@ -52721,7 +52705,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)
@@ -54093,7 +54076,6 @@
/obj/structure/cable/white{
icon_state = "2-4"
},
/obj/effect/landmark/lightsout,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
@@ -56399,7 +56381,6 @@
},
/area/security/courtroom)
"cjW" = (
/obj/effect/landmark/lightsout,
/turf/open/floor/plasteel/vault{
dir = 5
},
@@ -56826,7 +56807,6 @@
/turf/open/floor/plasteel/grimy,
/area/library)
"ckS" = (
/obj/effect/landmark/lightsout,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
@@ -61901,7 +61881,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)
@@ -62680,7 +62659,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" = (
@@ -63555,7 +63533,6 @@
/turf/open/floor/plasteel/neutral,
/area/crew_quarters/locker)
"cyT" = (
/obj/effect/landmark/lightsout,
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
dir = 1
},
@@ -66029,7 +66006,6 @@
/turf/open/floor/plasteel,
/area/engine/engineering)
"cEb" = (
/obj/effect/landmark/lightsout,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
@@ -67330,7 +67306,6 @@
/obj/structure/cable/white{
icon_state = "1-2"
},
/obj/effect/landmark/lightsout,
/turf/open/floor/plasteel/neutral,
/area/hallway/primary/central)
"cGH" = (
@@ -68232,7 +68207,6 @@
/turf/closed/wall,
/area/maintenance/port)
"cIz" = (
/obj/effect/landmark/lightsout,
/obj/structure/cable/white{
icon_state = "1-2"
},
@@ -69734,7 +69708,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" = (
@@ -70463,7 +70436,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
@@ -72995,7 +72967,6 @@
/turf/open/floor/plasteel/whitepurple/corner,
/area/science/research)
"cSt" = (
/obj/effect/landmark/lightsout,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
@@ -73926,7 +73897,6 @@
},
/area/hallway/primary/aft)
"cUp" = (
/obj/effect/landmark/lightsout,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
@@ -74012,7 +73982,6 @@
/turf/open/floor/plasteel/cmo,
/area/medical/medbay/central)
"cUy" = (
/obj/effect/landmark/lightsout,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
@@ -75324,7 +75293,6 @@
/obj/structure/cable/white{
icon_state = "4-8"
},
/obj/effect/landmark/lightsout,
/obj/effect/turf_decal/stripes/line{
dir = 2
},
@@ -80676,7 +80644,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)
@@ -82441,7 +82408,6 @@
/area/science/circuit)
"dmw" = (
/obj/structure/disposalpipe/segment,
/obj/effect/landmark/lightsout,
/turf/open/floor/plasteel/white/side{
dir = 10
},
@@ -83501,7 +83467,6 @@
/area/science/research)
"doF" = (
/obj/machinery/holopad,
/obj/effect/landmark/lightsout,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
@@ -87629,7 +87594,6 @@
/obj/structure/cable/white{
icon_state = "2-8"
},
/obj/effect/landmark/lightsout,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 4
},
@@ -91380,7 +91344,6 @@
/turf/open/floor/plasteel,
/area/science/robotics/lab)
"dEP" = (
/obj/effect/landmark/lightsout,
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 4
},
@@ -95308,7 +95271,6 @@
/obj/structure/cable/white{
icon_state = "1-2"
},
/obj/effect/landmark/lightsout,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
@@ -99343,7 +99305,6 @@
/obj/structure/cable/white{
icon_state = "1-2"
},
/obj/effect/landmark/lightsout,
/turf/open/floor/plasteel/green,
/area/medical/virology)
"dVC" = (
@@ -101691,7 +101652,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" = (
@@ -105133,7 +105093,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" = (
@@ -2723,7 +2723,6 @@
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
dir = 2
},
/obj/effect/landmark/lightsout,
/turf/open/floor/plasteel/red/corner{
dir = 1
},
@@ -9538,7 +9537,6 @@
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
dir = 4
},
/obj/effect/landmark/lightsout,
/turf/open/floor/plasteel,
/area/crew_quarters/dorms)
"auj" = (
@@ -10605,7 +10603,6 @@
/obj/structure/cable/yellow{
icon_state = "2-8"
},
/obj/effect/landmark/lightsout,
/turf/open/floor/plasteel,
/area/security/brig)
"awn" = (
@@ -19200,7 +19197,6 @@
/obj/structure/cable/yellow{
icon_state = "4-8"
},
/obj/effect/landmark/lightsout,
/turf/open/floor/plasteel/floorgrime,
/area/crew_quarters/locker)
"aOA" = (
@@ -22652,7 +22648,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)
@@ -23616,7 +23611,6 @@
/obj/structure/cable/yellow{
icon_state = "1-2"
},
/obj/effect/landmark/lightsout,
/obj/effect/turf_decal/plaque{
icon_state = "L7"
},
@@ -24558,7 +24552,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
@@ -25859,7 +25852,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" = (
@@ -34014,7 +34006,6 @@
/obj/structure/cable/yellow{
icon_state = "2-4"
},
/obj/effect/landmark/lightsout,
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"bsp" = (
@@ -39054,7 +39045,6 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/effect/landmark/lightsout,
/turf/open/floor/plasteel/neutral/corner{
dir = 1
},
@@ -39225,7 +39215,6 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/obj/effect/landmark/lightsout,
/turf/open/floor/plasteel/neutral/corner{
dir = 4
},
@@ -39349,7 +39338,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" = (
@@ -39624,7 +39612,6 @@
/turf/open/floor/wood,
/area/security/vacantoffice)
"bEr" = (
/obj/effect/landmark/lightsout,
/turf/open/floor/wood,
/area/security/vacantoffice)
"bEs" = (
@@ -42851,7 +42838,6 @@
/area/library)
"bLj" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/effect/landmark/lightsout,
/turf/open/floor/carpet,
/area/library)
"bLk" = (
@@ -44199,7 +44185,6 @@
/turf/open/floor/plasteel,
/area/engine/atmos)
"bNT" = (
/obj/effect/landmark/lightsout,
/turf/open/floor/plasteel,
/area/engine/atmos)
"bNU" = (
@@ -48225,7 +48210,6 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/obj/effect/landmark/lightsout,
/obj/effect/turf_decal/plaque{
icon_state = "L8"
},
@@ -50835,7 +50819,6 @@
/turf/open/floor/plasteel/white,
/area/medical/storage)
"cbL" = (
/obj/effect/landmark/lightsout,
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 2
},
@@ -57390,7 +57373,6 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/obj/effect/landmark/lightsout,
/turf/open/floor/plasteel/white,
/area/science/research)
"cpt" = (
@@ -61432,7 +61414,6 @@
/obj/structure/cable/yellow{
icon_state = "1-8"
},
/obj/effect/landmark/lightsout,
/turf/open/floor/plasteel/white,
/area/medical/medbay/aft)
"cxk" = (
@@ -63555,7 +63536,6 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
/obj/effect/landmark/lightsout,
/turf/open/floor/plasteel,
/area/science/misc_lab)
"cBF" = (
@@ -65830,7 +65810,6 @@
/obj/structure/cable/yellow{
icon_state = "1-2"
},
/obj/effect/landmark/lightsout,
/turf/open/floor/plasteel/white,
/area/science/research)
"cGi" = (
@@ -66024,7 +66003,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"
@@ -69748,7 +69726,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" = (
@@ -72439,7 +72416,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" = (
@@ -5242,7 +5241,6 @@
},
/area/hallway/primary/central)
"akd" = (
/obj/effect/landmark/lightsout,
/obj/structure/cable/white{
icon_state = "1-2"
},
@@ -5515,7 +5513,6 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/obj/effect/landmark/lightsout,
/obj/structure/cable/white{
icon_state = "1-4"
},
@@ -6145,7 +6142,6 @@
/obj/structure/cable/white{
icon_state = "2-4"
},
/obj/effect/landmark/lightsout,
/turf/open/floor/plasteel/neutral,
/area/quartermaster/storage)
"alF" = (
@@ -6246,7 +6242,6 @@
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/effect/landmark/lightsout,
/turf/open/floor/plasteel/neutral/side{
dir = 4
},
@@ -7972,7 +7967,6 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
/obj/effect/landmark/lightsout,
/obj/structure/cable/white{
icon_state = "1-2"
},
@@ -14044,7 +14038,6 @@
},
/obj/structure/table/wood,
/obj/item/kitchen/fork,
/obj/effect/landmark/lightsout,
/obj/structure/cable/white{
icon_state = "4-8"
},
@@ -14480,7 +14473,6 @@
},
/area/hallway/primary/central)
"aBL" = (
/obj/effect/landmark/lightsout,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
@@ -15927,7 +15919,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)
@@ -16697,7 +16688,6 @@
/area/hallway/primary/central)
"aFY" = (
/obj/machinery/holopad,
/obj/effect/landmark/lightsout,
/obj/structure/cable/white{
icon_state = "1-2"
},
@@ -19953,7 +19943,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" = (
@@ -21147,7 +21136,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"
@@ -21920,7 +21908,6 @@
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"aQp" = (
/obj/effect/landmark/lightsout,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
@@ -25122,7 +25109,6 @@
/obj/structure/cable/white{
icon_state = "1-4"
},
/obj/effect/landmark/lightsout,
/turf/open/floor/plasteel/whitepurple/corner{
dir = 1
},
@@ -26193,7 +26179,6 @@
/obj/structure/cable/white{
icon_state = "2-4"
},
/obj/effect/landmark/lightsout,
/turf/open/floor/plasteel/blue,
/area/medical/medbay/zone3)
"aZK" = (
@@ -29412,7 +29397,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()