From 9b1c909fea1933fbe5c958ae779c28490485c5cc Mon Sep 17 00:00:00 2001 From: forest2001 Date: Mon, 11 Dec 2023 03:50:03 +0000 Subject: [PATCH 1/9] all works - other than landing --- code/modules/power/lighting.dm | 38 +- code/modules/shuttle/shuttle.dm | 38 + code/modules/shuttle/shuttles/dropship.dm | 60 +- maps/map_files/BigRed/BigRed.dmm | 90 +- .../BigRed/sprinkles/20.lz1entrance_v2.dmm | 2 +- maps/map_files/CORSAT/Corsat.dmm | 136 +- maps/map_files/DesertDam/Desert_Dam.dmm | 122 +- .../FOP_v2_Cellblocks/Prison_Station_FOP.dmm | 102 +- .../FOP_v3_Sciannex/Fiorina_SciAnnex.dmm | 78 +- .../sprinkles/10.podholder.dmm | 4 +- .../map_files/Ice_Colony_v2/Ice_Colony_v2.dmm | 162 +- .../Ice_Colony_v3/Shivas_Snowball.dmm | 116 +- .../lz2-variations/east-gate/blocked.dmm | 8 +- .../lz2-variations/south-gate/blocked.dmm | 8 +- .../lz2-variations/southeast-gate/cleared.dmm | 8 +- maps/map_files/Kutjevo/Kutjevo.dmm | 68 +- .../LV522_Chances_Claim.dmm | 100 +- maps/map_files/LV624/LV624.dmm | 66 +- maps/map_files/New_Varadero/New_Varadero.dmm | 70 +- .../Sorokyne_Strata/Sorokyne_Strata.dmm | 78 +- maps/map_files/USS_Almayer/USS_Almayer.dmm | 1381 +++++++++++------ 21 files changed, 1523 insertions(+), 1212 deletions(-) diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm index 8f138d2c905f..637249b37dfe 100644 --- a/code/modules/power/lighting.dm +++ b/code/modules/power/lighting.dm @@ -746,7 +746,6 @@ icon = 'icons/obj/structures/props/landinglights.dmi' icon_state = "landingstripe" desc = "A landing light, if it's flashing stay clear!" - var/id = "" // ID for landing zone anchored = TRUE density = FALSE layer = BELOW_TABLE_LAYER @@ -756,7 +755,7 @@ power_channel = POWER_CHANNEL_LIGHT //Lights are calc'd via area so they dont need to be in the machine list unslashable = TRUE unacidable = TRUE - var/obj/docking_port/stationary/marine_dropship/linked_port = null + var/obj/docking_port/stationary/linked_port = null //Don't allow blowing those up, so Marine nades don't fuck them /obj/structure/machinery/landinglight/ex_act(severity) @@ -776,50 +775,25 @@ icon_state = initial(icon_state) set_light(0) -/obj/structure/machinery/landinglight/ds1 - id = "USS Almayer Dropship 1" // ID for landing zone - -/obj/structure/machinery/landinglight/ds2 - id = "USS Almayer Dropship 2" // ID for landing zone - /obj/structure/machinery/landinglight/proc/turn_on() icon_state = initial(icon_state) + "0" set_light(2) -/obj/structure/machinery/landinglight/ds1/delayone/turn_on() - icon_state = initial(icon_state) + "1" - set_light(2) - -/obj/structure/machinery/landinglight/ds1/delaytwo/turn_on() - icon_state = initial(icon_state) + "2" - set_light(2) - -/obj/structure/machinery/landinglight/ds1/delaythree/turn_on() - icon_state = initial(icon_state) + "3" - set_light(2) - -/obj/structure/machinery/landinglight/ds2/delayone/turn_on() +/obj/structure/machinery/landinglight/delayone/turn_on() icon_state = initial(icon_state) + "1" set_light(2) -/obj/structure/machinery/landinglight/ds2/delaytwo/turn_on() +/obj/structure/machinery/landinglight/delaytwo/turn_on() icon_state = initial(icon_state) + "2" set_light(2) -/obj/structure/machinery/landinglight/ds2/delaythree/turn_on() +/obj/structure/machinery/landinglight/delaythree/turn_on() icon_state = initial(icon_state) + "3" set_light(2) -/obj/structure/machinery/landinglight/ds1/spoke - icon_state = "lz_spoke_light" - -/obj/structure/machinery/landinglight/ds1/spoke/turn_on() - icon_state = initial(icon_state) + "1" - set_light(3) - -/obj/structure/machinery/landinglight/ds2/spoke +/obj/structure/machinery/landinglight/spoke icon_state = "lz_spoke_light" -/obj/structure/machinery/landinglight/ds2/spoke/turn_on() +/obj/structure/machinery/landinglight/spoke/turn_on() icon_state = initial(icon_state) + "1" set_light(3) diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm index 85fc38bf5f1b..5459723d2b6a 100644 --- a/code/modules/shuttle/shuttle.dm +++ b/code/modules/shuttle/shuttle.dm @@ -204,6 +204,8 @@ var/datum/map_template/shuttle/roundstart_template var/json_key + var/list/landing_lights = list() + var/landing_lights_on = FALSE /obj/docking_port/stationary/register(replace = FALSE) . = ..() @@ -244,6 +246,7 @@ #ifdef DOCKING_PORT_HIGHLIGHT highlight("#f00") #endif + link_landing_lights() /obj/docking_port/stationary/unregister() . = ..() @@ -252,6 +255,11 @@ /obj/docking_port/stationary/Destroy(force) if(force) unregister() + for(var/obj/structure/machinery/landinglight/light in landing_lights) + light.linked_port = null + if(landing_lights) + landing_lights.Cut() + landing_lights = null // We didn't make them, so lets leave them . = ..() /obj/docking_port/stationary/Moved(atom/oldloc, dir, forced) @@ -280,24 +288,53 @@ /// Called when a new shuttle arrives /obj/docking_port/stationary/proc/on_arrival(obj/docking_port/mobile/arriving_shuttle) + turn_off_landing_lights() return /// Called when a new shuttle is about to arrive /obj/docking_port/stationary/proc/on_prearrival(obj/docking_port/mobile/arriving_shuttle) + turn_on_landing_lights() return /// Called when the docked shuttle ignites /obj/docking_port/stationary/proc/on_dock_ignition(obj/docking_port/mobile/departing_shuttle) + turn_on_landing_lights() return /// Called when a shuttle is about to complete undocking from this stationary dock (already physically gone) /obj/docking_port/stationary/proc/on_departure(obj/docking_port/mobile/departing_shuttle) + turn_off_landing_lights() return //returns first-found touching shuttleport /obj/docking_port/stationary/get_docked() . = locate(/obj/docking_port/mobile) in loc +/obj/docking_port/stationary/proc/link_landing_lights() + var/list/coords = return_coords() + var/scan_range = 5 + var/x0 = coords[1] - scan_range + var/y0 = coords[2] - scan_range + var/x1 = coords[3] + scan_range + var/y1 = coords[4] + scan_range + + for(var/xscan = x0; xscan < x1; xscan++) + for(var/yscan = y0; yscan < y1; yscan++) + var/turf/searchspot = locate(xscan, yscan, src.z) + for(var/obj/structure/machinery/landinglight/light in searchspot) + landing_lights += light + light.linked_port = src + +/obj/docking_port/stationary/proc/turn_on_landing_lights() + for(var/obj/structure/machinery/landinglight/light in landing_lights) + light.turn_on() + landing_lights_on = TRUE + +/obj/docking_port/stationary/proc/turn_off_landing_lights() + for(var/obj/structure/machinery/landinglight/light in landing_lights) + light.turn_off() + landing_lights_on = FALSE + /obj/docking_port/stationary/transit name = "In Transit" var/datum/turf_reservation/reserved_area @@ -704,6 +741,7 @@ if(prearrivalTime && mode != SHUTTLE_PREARRIVAL) set_mode(SHUTTLE_PREARRIVAL) setTimer(prearrivalTime) + log_debug("WARNING: shuttle on approach failed check!") return on_prearrival() var/error = initiate_docking(destination, preferred_direction) diff --git a/code/modules/shuttle/shuttles/dropship.dm b/code/modules/shuttle/shuttles/dropship.dm index ee91c9b9e5d4..84977b1d7b6e 100644 --- a/code/modules/shuttle/shuttles/dropship.dm +++ b/code/modules/shuttle/shuttles/dropship.dm @@ -118,13 +118,12 @@ if(mode == SHUTTLE_CRASHED) return - var/obj/docking_port/stationary/marine_dropship/dropzone = destination - if(mode == SHUTTLE_PREARRIVAL && !dropzone.landing_lights_on) - if(istype(destination, /obj/docking_port/stationary/marine_dropship)) - dropzone.turn_on_landing_lights() - playsound(dropzone.return_center_turf(), landing_sound, 60, 0) + /*if(mode == SHUTTLE_PREARRIVAL && !destination.landing_lights_on) + if(istype(destination, /obj/docking_port/stationary)) + destination.turn_on_landing_lights() + playsound(destination.return_center_turf(), landing_sound, 60, 0) playsound(return_center_turf(), landing_sound, 60, 0) - + */ automated_check() hijack?.check() @@ -164,55 +163,11 @@ dwidth = 5 dheight = 10 - var/list/landing_lights = list() var/auto_open = FALSE - var/landing_lights_on = FALSE var/xeno_announce = FALSE -/obj/docking_port/stationary/marine_dropship/Initialize(mapload) - . = ..() - link_landing_lights() - -/obj/docking_port/stationary/marine_dropship/Destroy() - . = ..() - for(var/obj/structure/machinery/landinglight/light in landing_lights) - light.linked_port = null - if(landing_lights) - landing_lights.Cut() - landing_lights = null // We didn't make them, so lets leave them - -/obj/docking_port/stationary/marine_dropship/proc/link_landing_lights() - var/list/coords = return_coords() - var/scan_range = 5 - var/x0 = coords[1] - scan_range - var/y0 = coords[2] - scan_range - var/x1 = coords[3] + scan_range - var/y1 = coords[4] + scan_range - - for(var/xscan = x0; xscan < x1; xscan++) - for(var/yscan = y0; yscan < y1; yscan++) - var/turf/searchspot = locate(xscan, yscan, src.z) - for(var/obj/structure/machinery/landinglight/light in searchspot) - landing_lights += light - light.linked_port = src - -/obj/docking_port/stationary/marine_dropship/proc/turn_on_landing_lights() - for(var/obj/structure/machinery/landinglight/light in landing_lights) - light.turn_on() - landing_lights_on = TRUE - -/obj/docking_port/stationary/marine_dropship/proc/turn_off_landing_lights() - for(var/obj/structure/machinery/landinglight/light in landing_lights) - light.turn_off() - landing_lights_on = FALSE - -/obj/docking_port/stationary/marine_dropship/on_prearrival(obj/docking_port/mobile/arriving_shuttle) - . = ..() - turn_on_landing_lights() - /obj/docking_port/stationary/marine_dropship/on_arrival(obj/docking_port/mobile/arriving_shuttle) . = ..() - turn_off_landing_lights() if(auto_open && istype(arriving_shuttle, /obj/docking_port/mobile/marine_dropship)) var/obj/docking_port/mobile/marine_dropship/dropship = arriving_shuttle dropship.in_flyby = FALSE @@ -227,13 +182,8 @@ xeno_announcement(SPAN_XENOANNOUNCE("The dropship has landed."), "everything") xeno_announce = FALSE -/obj/docking_port/stationary/marine_dropship/on_dock_ignition(obj/docking_port/mobile/departing_shuttle) - . = ..() - turn_on_landing_lights() - /obj/docking_port/stationary/marine_dropship/on_departure(obj/docking_port/mobile/departing_shuttle) . = ..() - turn_off_landing_lights() var/obj/docking_port/mobile/marine_dropship/dropship = departing_shuttle for(var/obj/structure/dropship_equipment/eq as anything in dropship.equipments) eq.on_launch() diff --git a/maps/map_files/BigRed/BigRed.dmm b/maps/map_files/BigRed/BigRed.dmm index 6a90f35e4de3..02a1ff59eda5 100644 --- a/maps/map_files/BigRed/BigRed.dmm +++ b/maps/map_files/BigRed/BigRed.dmm @@ -40,25 +40,25 @@ /turf/open/floor/plating, /area/bigredv2/outside/space_port) "aai" = ( -/obj/structure/machinery/landinglight/ds1/delaytwo, +/obj/structure/machinery/landinglight/delaytwo, /turf/open/floor{ icon_state = "asteroidwarning" }, /area/bigredv2/outside/space_port) "aaj" = ( -/obj/structure/machinery/landinglight/ds1/delayone, +/obj/structure/machinery/landinglight/delayone, /turf/open/floor{ icon_state = "asteroidwarning" }, /area/bigredv2/outside/space_port) "aak" = ( -/obj/structure/machinery/landinglight/ds1, +/obj/structure/machinery/landinglight, /turf/open/floor{ icon_state = "asteroidwarning" }, /area/bigredv2/outside/space_port) "aal" = ( -/obj/structure/machinery/landinglight/ds1/delaythree, +/obj/structure/machinery/landinglight/delaythree, /turf/open/floor{ icon_state = "asteroidwarning" }, @@ -71,7 +71,7 @@ /area/bigredv2/outside/space_port) "aan" = ( /obj/effect/landmark/crap_item, -/obj/structure/machinery/landinglight/ds1/delaythree{ +/obj/structure/machinery/landinglight/delaythree{ dir = 4 }, /turf/open/floor{ @@ -83,7 +83,7 @@ /turf/closed/wall/solaris/rock, /area/bigredv2/caves) "aap" = ( -/obj/structure/machinery/landinglight/ds1/delaythree{ +/obj/structure/machinery/landinglight/delaythree{ dir = 8 }, /turf/open/floor{ @@ -109,7 +109,7 @@ }, /area/bigredv2/outside/telecomm) "aat" = ( -/obj/structure/machinery/landinglight/ds1{ +/obj/structure/machinery/landinglight{ dir = 4 }, /turf/open/floor{ @@ -124,7 +124,7 @@ /turf/open/floor/plating, /area/bigredv2/outside/space_port) "aav" = ( -/obj/structure/machinery/landinglight/ds1/delaytwo{ +/obj/structure/machinery/landinglight/delaytwo{ dir = 8 }, /turf/open/floor{ @@ -182,7 +182,7 @@ }, /area/bigredv2/outside/space_port) "aaE" = ( -/obj/structure/machinery/landinglight/ds1/delayone{ +/obj/structure/machinery/landinglight/delayone{ dir = 4 }, /turf/open/floor{ @@ -195,7 +195,7 @@ /turf/open/floor/plating, /area/bigredv2/outside/space_port) "aaG" = ( -/obj/structure/machinery/landinglight/ds1/delayone{ +/obj/structure/machinery/landinglight/delayone{ dir = 8 }, /turf/open/floor{ @@ -274,7 +274,7 @@ }, /area/bigredv2/outside/space_port) "aaS" = ( -/obj/structure/machinery/landinglight/ds1/delaytwo{ +/obj/structure/machinery/landinglight/delaytwo{ dir = 4 }, /turf/open/floor{ @@ -283,7 +283,7 @@ }, /area/bigredv2/outside/space_port) "aaT" = ( -/obj/structure/machinery/landinglight/ds1{ +/obj/structure/machinery/landinglight{ dir = 8 }, /turf/open/floor{ @@ -335,7 +335,7 @@ }, /area/bigredv2/outside/telecomm) "aba" = ( -/obj/structure/machinery/landinglight/ds1/delaythree{ +/obj/structure/machinery/landinglight/delaythree{ dir = 4 }, /turf/open/floor{ @@ -393,7 +393,7 @@ /area/bigredv2/outside/space_port) "abj" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/landinglight/ds1/delaytwo{ +/obj/structure/machinery/landinglight/delaytwo{ dir = 8 }, /turf/open/floor{ @@ -454,7 +454,7 @@ /area/bigredv2/caves_north) "abt" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/landinglight/ds1/delayone{ +/obj/structure/machinery/landinglight/delayone{ dir = 8 }, /turf/open/floor{ @@ -890,7 +890,7 @@ }, /area/bigredv2/outside/space_port) "acK" = ( -/obj/structure/machinery/landinglight/ds1/delaythree{ +/obj/structure/machinery/landinglight/delaythree{ dir = 4 }, /obj/structure/pipes/standard/simple/hidden/green{ @@ -939,7 +939,7 @@ }, /area/bigredv2/outside/telecomm) "acS" = ( -/obj/structure/machinery/landinglight/ds1{ +/obj/structure/machinery/landinglight{ dir = 4 }, /obj/structure/pipes/standard/simple/hidden/green, @@ -1038,7 +1038,7 @@ }, /area/bigredv2/outside/telecomm) "adg" = ( -/obj/structure/machinery/landinglight/ds1/delayone{ +/obj/structure/machinery/landinglight/delayone{ dir = 4 }, /obj/structure/pipes/standard/simple/hidden/green, @@ -1149,7 +1149,7 @@ }, /area/bigredv2/outside/telecomm) "adw" = ( -/obj/structure/machinery/landinglight/ds1/delaytwo{ +/obj/structure/machinery/landinglight/delaytwo{ dir = 4 }, /obj/structure/pipes/standard/simple/hidden/green, @@ -1238,7 +1238,7 @@ }, /area/bigredv2/outside/telecomm) "adJ" = ( -/obj/structure/machinery/landinglight/ds1/delaythree{ +/obj/structure/machinery/landinglight/delaythree{ dir = 4 }, /obj/structure/pipes/standard/simple/hidden/green, @@ -1396,7 +1396,7 @@ }, /area/bigredv2/outside/space_port) "aeh" = ( -/obj/structure/machinery/landinglight/ds1{ +/obj/structure/machinery/landinglight{ dir = 1 }, /turf/open/floor{ @@ -1405,7 +1405,7 @@ }, /area/bigredv2/outside/space_port) "aei" = ( -/obj/structure/machinery/landinglight/ds1/delayone{ +/obj/structure/machinery/landinglight/delayone{ dir = 1 }, /turf/open/floor{ @@ -1414,7 +1414,7 @@ }, /area/bigredv2/outside/space_port) "aej" = ( -/obj/structure/machinery/landinglight/ds1/delaytwo{ +/obj/structure/machinery/landinglight/delaytwo{ dir = 1 }, /turf/open/floor{ @@ -1423,7 +1423,7 @@ }, /area/bigredv2/outside/space_port) "aek" = ( -/obj/structure/machinery/landinglight/ds1/delaythree{ +/obj/structure/machinery/landinglight/delaythree{ dir = 1 }, /turf/open/floor{ @@ -21188,46 +21188,46 @@ }, /area/bigredv2/caves_east) "bhu" = ( -/obj/structure/machinery/landinglight/ds2/delaytwo, +/obj/structure/machinery/landinglight/delaytwo, /turf/open/floor{ icon_state = "asteroidwarning" }, /area/bigredv2/outside/space_port_lz2) "bhv" = ( -/obj/structure/machinery/landinglight/ds2/delayone, +/obj/structure/machinery/landinglight/delayone, /turf/open/floor{ icon_state = "asteroidwarning" }, /area/bigredv2/outside/space_port_lz2) "bhw" = ( -/obj/structure/machinery/landinglight/ds2, +/obj/structure/machinery/landinglight, /turf/open/floor{ icon_state = "asteroidwarning" }, /area/bigredv2/outside/space_port_lz2) "bhx" = ( -/obj/structure/machinery/landinglight/ds2/delaythree, +/obj/structure/machinery/landinglight/delaythree, /turf/open/floor{ icon_state = "asteroidwarning" }, /area/bigredv2/outside/space_port_lz2) "bhy" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/landinglight/ds2/delayone, +/obj/structure/machinery/landinglight/delayone, /turf/open/floor{ icon_state = "asteroidwarning" }, /area/bigredv2/outside/space_port_lz2) "bhz" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/landinglight/ds2/delaythree, +/obj/structure/machinery/landinglight/delaythree, /turf/open/floor{ icon_state = "asteroidwarning" }, /area/bigredv2/outside/space_port_lz2) "bhA" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/landinglight/ds2/delaytwo, +/obj/structure/machinery/landinglight/delaytwo, /turf/open/floor{ icon_state = "asteroidwarning" }, @@ -21366,7 +21366,7 @@ /turf/open/mars, /area/bigredv2/outside/se) "bid" = ( -/obj/structure/machinery/landinglight/ds2/delaythree{ +/obj/structure/machinery/landinglight/delaythree{ dir = 4 }, /turf/open/floor{ @@ -21478,7 +21478,7 @@ }, /area/bigredv2/outside/office_complex) "biH" = ( -/obj/structure/machinery/landinglight/ds2{ +/obj/structure/machinery/landinglight{ dir = 4 }, /turf/open/floor{ @@ -21584,7 +21584,7 @@ }, /area/bigredv2/outside/se) "bjd" = ( -/obj/structure/machinery/landinglight/ds2/delayone{ +/obj/structure/machinery/landinglight/delayone{ dir = 4 }, /turf/open/floor{ @@ -21634,7 +21634,7 @@ }, /area/bigredv2/outside/se) "bjn" = ( -/obj/structure/machinery/landinglight/ds2/delaytwo{ +/obj/structure/machinery/landinglight/delaytwo{ dir = 4 }, /turf/open/floor{ @@ -21648,7 +21648,7 @@ /area/bigredv2/outside/space_port_lz2) "bjp" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/landinglight/ds2{ +/obj/structure/machinery/landinglight{ dir = 8 }, /turf/open/floor{ @@ -21785,7 +21785,7 @@ /area/bigredv2/outside/space_port_lz2) "bjO" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/landinglight/ds2/delaythree{ +/obj/structure/machinery/landinglight/delaythree{ dir = 8 }, /turf/open/floor{ @@ -23446,7 +23446,7 @@ }, /area/bigredv2/outside/filtration_plant) "bpu" = ( -/obj/structure/machinery/landinglight/ds2/delaythree{ +/obj/structure/machinery/landinglight/delaythree{ dir = 8 }, /turf/open/floor{ @@ -23686,7 +23686,7 @@ }, /area/bigredv2/caves/mining) "bqd" = ( -/obj/structure/machinery/landinglight/ds2/delaytwo{ +/obj/structure/machinery/landinglight/delaytwo{ dir = 8 }, /turf/open/floor{ @@ -23761,7 +23761,7 @@ /turf/open/floor, /area/bigredv2/outside/general_offices) "bqE" = ( -/obj/structure/machinery/landinglight/ds2/delayone{ +/obj/structure/machinery/landinglight/delayone{ dir = 8 }, /turf/open/floor{ @@ -23868,7 +23868,7 @@ /turf/open/floor/plating, /area/bigredv2/outside/filtration_plant) "brb" = ( -/obj/structure/machinery/landinglight/ds2{ +/obj/structure/machinery/landinglight{ dir = 8 }, /turf/open/floor{ @@ -24163,7 +24163,7 @@ }, /area/bigredv2/outside/space_port_lz2) "bsb" = ( -/obj/structure/machinery/landinglight/ds2{ +/obj/structure/machinery/landinglight{ dir = 1 }, /turf/open/floor{ @@ -24172,7 +24172,7 @@ }, /area/bigredv2/outside/space_port_lz2) "bsc" = ( -/obj/structure/machinery/landinglight/ds2/delayone{ +/obj/structure/machinery/landinglight/delayone{ dir = 1 }, /turf/open/floor{ @@ -24181,7 +24181,7 @@ }, /area/bigredv2/outside/space_port_lz2) "bsd" = ( -/obj/structure/machinery/landinglight/ds2/delaytwo{ +/obj/structure/machinery/landinglight/delaytwo{ dir = 1 }, /turf/open/floor{ @@ -24190,7 +24190,7 @@ }, /area/bigredv2/outside/space_port_lz2) "bse" = ( -/obj/structure/machinery/landinglight/ds2/delaythree{ +/obj/structure/machinery/landinglight/delaythree{ dir = 1 }, /turf/open/floor{ diff --git a/maps/map_files/BigRed/sprinkles/20.lz1entrance_v2.dmm b/maps/map_files/BigRed/sprinkles/20.lz1entrance_v2.dmm index 3774e4222fae..45d63783005d 100644 --- a/maps/map_files/BigRed/sprinkles/20.lz1entrance_v2.dmm +++ b/maps/map_files/BigRed/sprinkles/20.lz1entrance_v2.dmm @@ -1,6 +1,6 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "aa" = ( -/obj/structure/machinery/landinglight/ds1/delaythree{ +/obj/structure/machinery/landinglight/delaythree{ dir = 8; icon_state = "landingstripe" }, diff --git a/maps/map_files/CORSAT/Corsat.dmm b/maps/map_files/CORSAT/Corsat.dmm index 7029d71a6076..9cb1f9cceab8 100644 --- a/maps/map_files/CORSAT/Corsat.dmm +++ b/maps/map_files/CORSAT/Corsat.dmm @@ -196,11 +196,11 @@ }, /area/corsat/gamma/hangar/office) "aaI" = ( -/obj/structure/machinery/landinglight/ds1/delaytwo, +/obj/structure/machinery/landinglight/delaytwo, /turf/open/floor/plating, /area/corsat/gamma/hangar) "aaJ" = ( -/obj/structure/machinery/landinglight/ds1/delayone, +/obj/structure/machinery/landinglight/delayone, /turf/open/floor/plating, /area/corsat/gamma/hangar) "aaK" = ( @@ -215,7 +215,7 @@ }, /area/corsat/gamma/sigmaremote) "aaM" = ( -/obj/structure/machinery/landinglight/ds1, +/obj/structure/machinery/landinglight, /turf/open/floor/plating{ dir = 4; icon_state = "warnplate" @@ -240,14 +240,14 @@ }, /area/corsat/gamma/hangar) "aaQ" = ( -/obj/structure/machinery/landinglight/ds1/delaythree, +/obj/structure/machinery/landinglight/delaythree, /turf/open/floor/plating{ dir = 8; icon_state = "warnplate" }, /area/corsat/gamma/hangar) "aaR" = ( -/obj/structure/machinery/landinglight/ds1, +/obj/structure/machinery/landinglight, /turf/open/floor/plating, /area/corsat/gamma/hangar) "aaS" = ( @@ -263,7 +263,7 @@ }, /area/corsat/gamma/hangar) "aaV" = ( -/obj/structure/machinery/landinglight/ds1/delaythree, +/obj/structure/machinery/landinglight/delaythree, /turf/open/floor/plating{ dir = 4; icon_state = "warnplate" @@ -283,14 +283,14 @@ /turf/open/floor/plating/icefloor, /area/corsat/gamma/hangar) "aaY" = ( -/obj/structure/machinery/landinglight/ds1/delaytwo, +/obj/structure/machinery/landinglight/delaytwo, /turf/open/floor/plating{ dir = 8; icon_state = "warnplate" }, /area/corsat/gamma/hangar) "aaZ" = ( -/obj/structure/machinery/landinglight/ds1/delaythree{ +/obj/structure/machinery/landinglight/delaythree{ dir = 4 }, /turf/open/floor/plating, @@ -306,13 +306,13 @@ /turf/open/floor/wood, /area/corsat/gamma/residential/east) "abc" = ( -/obj/structure/machinery/landinglight/ds1/delaythree{ +/obj/structure/machinery/landinglight/delaythree{ dir = 8 }, /turf/open/floor/plating, /area/corsat/gamma/hangar) "abd" = ( -/obj/structure/machinery/landinglight/ds1{ +/obj/structure/machinery/landinglight{ dir = 4 }, /turf/open/floor/plating, @@ -328,7 +328,7 @@ /turf/closed/wall/biodome, /area/corsat/gamma/hangar/office) "abh" = ( -/obj/structure/machinery/landinglight/ds1/delaytwo{ +/obj/structure/machinery/landinglight/delaytwo{ dir = 8 }, /turf/open/floor/plating, @@ -337,7 +337,7 @@ /turf/closed/wall/biodome, /area/corsat/gamma/hangar/flightcontrol) "abj" = ( -/obj/structure/machinery/landinglight/ds1/delaytwo{ +/obj/structure/machinery/landinglight/delaytwo{ dir = 4 }, /turf/open/floor/plating{ @@ -345,7 +345,7 @@ }, /area/corsat/gamma/hangar) "abk" = ( -/obj/structure/machinery/landinglight/ds1{ +/obj/structure/machinery/landinglight{ dir = 8 }, /turf/open/floor/plating{ @@ -353,7 +353,7 @@ }, /area/corsat/gamma/hangar) "abl" = ( -/obj/structure/machinery/landinglight/ds1/delaythree{ +/obj/structure/machinery/landinglight/delaythree{ dir = 4 }, /turf/open/floor/plating{ @@ -362,7 +362,7 @@ }, /area/corsat/gamma/hangar) "abm" = ( -/obj/structure/machinery/landinglight/ds1/delaythree{ +/obj/structure/machinery/landinglight/delaythree{ dir = 8 }, /turf/open/floor/plating{ @@ -416,13 +416,13 @@ /turf/open/floor/wood, /area/corsat/gamma/residential/east) "abt" = ( -/obj/structure/machinery/landinglight/ds1/delaytwo{ +/obj/structure/machinery/landinglight/delaytwo{ dir = 4 }, /turf/open/floor/plating, /area/corsat/gamma/hangar) "abu" = ( -/obj/structure/machinery/landinglight/ds1{ +/obj/structure/machinery/landinglight{ dir = 8 }, /turf/open/floor/plating, @@ -445,7 +445,7 @@ /turf/open/floor/corsat, /area/corsat/omega/control) "aby" = ( -/obj/structure/machinery/landinglight/ds1/delayone{ +/obj/structure/machinery/landinglight/delayone{ dir = 4 }, /turf/open/floor/plating{ @@ -453,7 +453,7 @@ }, /area/corsat/gamma/hangar) "abz" = ( -/obj/structure/machinery/landinglight/ds1/delayone{ +/obj/structure/machinery/landinglight/delayone{ dir = 8 }, /turf/open/floor/plating{ @@ -464,7 +464,7 @@ /turf/closed/wall/r_wall/biodome, /area/corsat/gamma/hangar/security) "abB" = ( -/obj/structure/machinery/landinglight/ds1/delaytwo{ +/obj/structure/machinery/landinglight/delaytwo{ dir = 4 }, /turf/open/floor/plating{ @@ -473,7 +473,7 @@ }, /area/corsat/gamma/hangar) "abC" = ( -/obj/structure/machinery/landinglight/ds1{ +/obj/structure/machinery/landinglight{ dir = 8 }, /turf/open/floor/plating{ @@ -597,7 +597,7 @@ }, /area/corsat/gamma/hangar) "abZ" = ( -/obj/structure/machinery/landinglight/ds1{ +/obj/structure/machinery/landinglight{ dir = 4 }, /turf/open/floor/plating/icefloor{ @@ -605,7 +605,7 @@ }, /area/corsat/gamma/hangar) "aca" = ( -/obj/structure/machinery/landinglight/ds1/delaytwo{ +/obj/structure/machinery/landinglight/delaytwo{ dir = 8 }, /turf/open/floor/plating/icefloor{ @@ -628,7 +628,7 @@ /turf/open/gm/grass/grass1/weedable, /area/corsat/gamma/foyer) "ace" = ( -/obj/structure/machinery/landinglight/ds1/delayone{ +/obj/structure/machinery/landinglight/delayone{ dir = 4 }, /turf/open/floor/plating{ @@ -637,7 +637,7 @@ }, /area/corsat/gamma/hangar) "acf" = ( -/obj/structure/machinery/landinglight/ds1/delayone{ +/obj/structure/machinery/landinglight/delayone{ dir = 8 }, /turf/open/floor/plating{ @@ -716,19 +716,19 @@ }, /area/corsat/gamma/residential/researcher) "acn" = ( -/obj/structure/machinery/landinglight/ds1{ +/obj/structure/machinery/landinglight{ dir = 1 }, /turf/open/floor/plating, /area/corsat/gamma/hangar) "aco" = ( -/obj/structure/machinery/landinglight/ds1/delayone{ +/obj/structure/machinery/landinglight/delayone{ dir = 1 }, /turf/open/floor/plating, /area/corsat/gamma/hangar) "acp" = ( -/obj/structure/machinery/landinglight/ds1/delaytwo{ +/obj/structure/machinery/landinglight/delaytwo{ dir = 1 }, /turf/open/floor/plating{ @@ -737,7 +737,7 @@ }, /area/corsat/gamma/hangar) "acq" = ( -/obj/structure/machinery/landinglight/ds1/delaythree{ +/obj/structure/machinery/landinglight/delaythree{ dir = 1 }, /turf/open/floor/plating{ @@ -746,13 +746,13 @@ }, /area/corsat/gamma/hangar) "acr" = ( -/obj/structure/machinery/landinglight/ds1/delaytwo{ +/obj/structure/machinery/landinglight/delaytwo{ dir = 1 }, /turf/open/floor/plating, /area/corsat/gamma/hangar) "acs" = ( -/obj/structure/machinery/landinglight/ds1/delaythree{ +/obj/structure/machinery/landinglight/delaythree{ dir = 1 }, /turf/open/floor/plating{ @@ -761,7 +761,7 @@ }, /area/corsat/gamma/hangar) "act" = ( -/obj/structure/machinery/landinglight/ds1{ +/obj/structure/machinery/landinglight{ dir = 1 }, /turf/open/floor/plating{ @@ -1694,15 +1694,15 @@ }, /area/corsat/gamma/residential/lounge) "afk" = ( -/obj/structure/machinery/landinglight/ds2/delaytwo, +/obj/structure/machinery/landinglight/delaytwo, /turf/open/floor/plating, /area/corsat/sigma/hangar) "afl" = ( -/obj/structure/machinery/landinglight/ds2/delayone, +/obj/structure/machinery/landinglight/delayone, /turf/open/floor/plating, /area/corsat/sigma/hangar) "afm" = ( -/obj/structure/machinery/landinglight/ds2, +/obj/structure/machinery/landinglight, /turf/open/floor/plating{ dir = 4; icon_state = "warnplate" @@ -1723,14 +1723,14 @@ }, /area/corsat/sigma/hangar) "afp" = ( -/obj/structure/machinery/landinglight/ds2/delaythree, +/obj/structure/machinery/landinglight/delaythree, /turf/open/floor/plating{ dir = 8; icon_state = "warnplate" }, /area/corsat/sigma/hangar) "afq" = ( -/obj/structure/machinery/landinglight/ds2, +/obj/structure/machinery/landinglight, /turf/open/floor/plating, /area/corsat/sigma/hangar) "afr" = ( @@ -1743,14 +1743,14 @@ }, /area/corsat/gamma/residential/lounge) "afs" = ( -/obj/structure/machinery/landinglight/ds2/delaythree, +/obj/structure/machinery/landinglight/delaythree, /turf/open/floor/plating{ dir = 4; icon_state = "warnplate" }, /area/corsat/sigma/hangar) "aft" = ( -/obj/structure/machinery/landinglight/ds2/delaytwo, +/obj/structure/machinery/landinglight/delaytwo, /turf/open/floor/plating{ dir = 8; icon_state = "warnplate" @@ -1766,7 +1766,7 @@ }, /area/corsat/gamma/sigmaremote/teleporter) "afv" = ( -/obj/structure/machinery/landinglight/ds2/delaythree{ +/obj/structure/machinery/landinglight/delaythree{ dir = 4 }, /turf/open/floor/plating, @@ -1801,25 +1801,25 @@ }, /area/corsat/gamma/residential/lounge) "afB" = ( -/obj/structure/machinery/landinglight/ds2/delayone{ +/obj/structure/machinery/landinglight/delayone{ dir = 8 }, /turf/open/floor/plating, /area/corsat/sigma/hangar) "afC" = ( -/obj/structure/machinery/landinglight/ds2{ +/obj/structure/machinery/landinglight{ dir = 4 }, /turf/open/floor/plating, /area/corsat/sigma/hangar) "afD" = ( -/obj/structure/machinery/landinglight/ds2{ +/obj/structure/machinery/landinglight{ dir = 8 }, /turf/open/floor/plating, /area/corsat/sigma/hangar) "afE" = ( -/obj/structure/machinery/landinglight/ds2/delayone{ +/obj/structure/machinery/landinglight/delayone{ dir = 4 }, /turf/open/floor/plating{ @@ -1827,7 +1827,7 @@ }, /area/corsat/sigma/hangar) "afF" = ( -/obj/structure/machinery/landinglight/ds2/delaythree{ +/obj/structure/machinery/landinglight/delaythree{ dir = 8 }, /turf/open/floor/plating{ @@ -1835,7 +1835,7 @@ }, /area/corsat/sigma/hangar) "afG" = ( -/obj/structure/machinery/landinglight/ds2/delaytwo{ +/obj/structure/machinery/landinglight/delaytwo{ dir = 4 }, /turf/open/floor/plating{ @@ -1844,7 +1844,7 @@ }, /area/corsat/sigma/hangar) "afH" = ( -/obj/structure/machinery/landinglight/ds2/delaytwo{ +/obj/structure/machinery/landinglight/delaytwo{ dir = 8 }, /turf/open/floor/plating{ @@ -1871,13 +1871,13 @@ }, /area/corsat/sigma/hangar/office) "afL" = ( -/obj/structure/machinery/landinglight/ds2/delayone{ +/obj/structure/machinery/landinglight/delayone{ dir = 4 }, /turf/open/floor/plating, /area/corsat/sigma/hangar) "afM" = ( -/obj/structure/machinery/landinglight/ds2/delaythree{ +/obj/structure/machinery/landinglight/delaythree{ dir = 8 }, /turf/open/floor/plating, @@ -1905,13 +1905,13 @@ }, /area/corsat/gamma/airlock/north) "afS" = ( -/obj/structure/machinery/landinglight/ds2/delaytwo{ +/obj/structure/machinery/landinglight/delaytwo{ dir = 4 }, /turf/open/floor/plating, /area/corsat/sigma/hangar) "afT" = ( -/obj/structure/machinery/landinglight/ds2/delaytwo{ +/obj/structure/machinery/landinglight/delaytwo{ dir = 8 }, /turf/open/floor/plating, @@ -1926,7 +1926,7 @@ }, /area/corsat/gamma/sigmaremote/teleporter) "afV" = ( -/obj/structure/machinery/landinglight/ds2{ +/obj/structure/machinery/landinglight{ dir = 4 }, /turf/open/floor/plating{ @@ -1934,7 +1934,7 @@ }, /area/corsat/sigma/hangar) "afW" = ( -/obj/structure/machinery/landinglight/ds2{ +/obj/structure/machinery/landinglight{ dir = 8 }, /turf/open/floor/plating{ @@ -1942,7 +1942,7 @@ }, /area/corsat/sigma/hangar) "afX" = ( -/obj/structure/machinery/landinglight/ds2/delayone{ +/obj/structure/machinery/landinglight/delayone{ dir = 4 }, /turf/open/floor/plating{ @@ -1951,7 +1951,7 @@ }, /area/corsat/sigma/hangar) "afY" = ( -/obj/structure/machinery/landinglight/ds2/delaythree{ +/obj/structure/machinery/landinglight/delaythree{ dir = 8 }, /turf/open/floor/plating{ @@ -3088,7 +3088,7 @@ }, /area/corsat/gamma/cargo) "ajh" = ( -/obj/structure/machinery/landinglight/ds2/delaythree{ +/obj/structure/machinery/landinglight/delaythree{ dir = 4 }, /turf/open/floor/plating/icefloor{ @@ -3096,7 +3096,7 @@ }, /area/corsat/sigma/hangar) "aji" = ( -/obj/structure/machinery/landinglight/ds2/delayone{ +/obj/structure/machinery/landinglight/delayone{ dir = 8 }, /turf/open/floor/plating/icefloor{ @@ -3251,7 +3251,7 @@ }, /area/corsat/sigma/hangar/checkpoint) "ajJ" = ( -/obj/structure/machinery/landinglight/ds2{ +/obj/structure/machinery/landinglight{ dir = 4 }, /turf/open/floor/plating{ @@ -3260,7 +3260,7 @@ }, /area/corsat/sigma/hangar) "ajK" = ( -/obj/structure/machinery/landinglight/ds2{ +/obj/structure/machinery/landinglight{ dir = 8 }, /turf/open/floor/plating{ @@ -3344,19 +3344,19 @@ }, /area/corsat/gamma/sigmaremote) "ajT" = ( -/obj/structure/machinery/landinglight/ds2/delaythree{ +/obj/structure/machinery/landinglight/delaythree{ dir = 1 }, /turf/open/floor/plating, /area/corsat/sigma/hangar) "ajU" = ( -/obj/structure/machinery/landinglight/ds2{ +/obj/structure/machinery/landinglight{ dir = 1 }, /turf/open/floor/plating, /area/corsat/sigma/hangar) "ajV" = ( -/obj/structure/machinery/landinglight/ds2/delayone{ +/obj/structure/machinery/landinglight/delayone{ dir = 1 }, /turf/open/floor/plating{ @@ -3399,7 +3399,7 @@ }, /area/corsat/sigma/south/complex/teleporter) "akb" = ( -/obj/structure/machinery/landinglight/ds2/delaytwo{ +/obj/structure/machinery/landinglight/delaytwo{ dir = 1 }, /turf/open/floor/plating{ @@ -3408,7 +3408,7 @@ }, /area/corsat/sigma/hangar) "akc" = ( -/obj/structure/machinery/landinglight/ds2/delayone{ +/obj/structure/machinery/landinglight/delayone{ dir = 1 }, /turf/open/floor/plating, @@ -4491,7 +4491,7 @@ }, /area/corsat/sigma/dorms) "ani" = ( -/obj/structure/machinery/landinglight/ds2/delaytwo{ +/obj/structure/machinery/landinglight/delaytwo{ dir = 1 }, /turf/open/floor/plating{ @@ -4500,7 +4500,7 @@ }, /area/corsat/sigma/hangar) "anj" = ( -/obj/structure/machinery/landinglight/ds2/delaythree{ +/obj/structure/machinery/landinglight/delaythree{ dir = 1 }, /turf/open/floor/plating{ @@ -43388,7 +43388,7 @@ }, /area/corsat/sigma/south/robotics) "hBM" = ( -/obj/structure/machinery/landinglight/ds1/delayone{ +/obj/structure/machinery/landinglight/delayone{ dir = 4 }, /turf/open/floor/plating, @@ -44203,7 +44203,7 @@ }, /area/corsat/gamma/kitchen) "iem" = ( -/obj/structure/machinery/landinglight/ds1/delayone{ +/obj/structure/machinery/landinglight/delayone{ dir = 8 }, /turf/open/floor/plating, diff --git a/maps/map_files/DesertDam/Desert_Dam.dmm b/maps/map_files/DesertDam/Desert_Dam.dmm index 4bf4d0e7a88c..fc84a7f84be2 100644 --- a/maps/map_files/DesertDam/Desert_Dam.dmm +++ b/maps/map_files/DesertDam/Desert_Dam.dmm @@ -108,7 +108,7 @@ /turf/open/floor/plating, /area/desert_dam/building/substation/northwest) "aav" = ( -/obj/structure/machinery/landinglight/ds2/delayone{ +/obj/structure/machinery/landinglight/delayone{ dir = 4 }, /turf/open/asphalt/cement_sunbleached{ @@ -565,7 +565,7 @@ }, /area/desert_dam/exterior/valley/valley_labs) "abQ" = ( -/obj/structure/machinery/landinglight/ds1/delayone, +/obj/structure/machinery/landinglight/delayone, /turf/open/asphalt/cement_sunbleached{ icon_state = "cement_sunbleached4" }, @@ -579,7 +579,7 @@ }, /area/desert_dam/exterior/valley/valley_labs) "abS" = ( -/obj/structure/machinery/landinglight/ds2, +/obj/structure/machinery/landinglight, /turf/open/asphalt/cement_sunbleached{ icon_state = "cement_sunbleached12" }, @@ -817,13 +817,13 @@ }, /area/desert_dam/exterior/valley/valley_labs) "acI" = ( -/obj/structure/machinery/landinglight/ds1, +/obj/structure/machinery/landinglight, /turf/open/asphalt/cement_sunbleached{ icon_state = "cement_sunbleached3" }, /area/desert_dam/exterior/landing_pad_one) "acJ" = ( -/obj/structure/machinery/landinglight/ds1/delaytwo, +/obj/structure/machinery/landinglight/delaytwo, /turf/open/asphalt/cement_sunbleached{ icon_state = "cement_sunbleached1" }, @@ -933,7 +933,7 @@ /area/desert_dam/interior/dam_interior/hanger) "adb" = ( /obj/structure/machinery/floodlight/landing, -/obj/structure/machinery/landinglight/ds1/delaytwo{ +/obj/structure/machinery/landinglight/delaytwo{ dir = 8 }, /turf/open/floor{ @@ -955,7 +955,7 @@ }, /area/desert_dam/exterior/valley/valley_labs) "adf" = ( -/obj/structure/machinery/landinglight/ds2/delayone, +/obj/structure/machinery/landinglight/delayone, /turf/open/asphalt/cement_sunbleached{ icon_state = "cement_sunbleached12" }, @@ -12229,7 +12229,7 @@ }, /area/desert_dam/building/lab_northwest/west_lab_xenoflora) "aLa" = ( -/obj/structure/machinery/landinglight/ds1/delaythree, +/obj/structure/machinery/landinglight/delaythree, /turf/open/asphalt/cement_sunbleached{ icon_state = "cement_sunbleached4" }, @@ -13145,7 +13145,7 @@ }, /area/desert_dam/building/administration/control_room) "aNv" = ( -/obj/structure/machinery/landinglight/ds1/delayone{ +/obj/structure/machinery/landinglight/delayone{ dir = 4 }, /turf/open/asphalt/cement_sunbleached{ @@ -15742,7 +15742,7 @@ /turf/open/floor/plating, /area/desert_dam/exterior/landing_pad_one) "aWi" = ( -/obj/structure/machinery/landinglight/ds1/delaythree{ +/obj/structure/machinery/landinglight/delaythree{ dir = 8 }, /turf/open/asphalt/cement_sunbleached{ @@ -19234,7 +19234,7 @@ }, /area/desert_dam/interior/dam_interior/hanger) "bhv" = ( -/obj/structure/machinery/landinglight/ds1/delaytwo{ +/obj/structure/machinery/landinglight/delaytwo{ dir = 4 }, /turf/open/asphalt/cement_sunbleached{ @@ -20464,7 +20464,7 @@ /turf/open/floor/plating, /area/desert_dam/interior/dam_interior/north_tunnel_entrance) "blD" = ( -/obj/structure/machinery/landinglight/ds1/delaytwo{ +/obj/structure/machinery/landinglight/delaytwo{ dir = 8 }, /turf/open/asphalt/cement_sunbleached{ @@ -21567,7 +21567,7 @@ }, /area/desert_dam/exterior/valley/north_valley_dam) "boV" = ( -/obj/structure/machinery/landinglight/ds1/delaythree{ +/obj/structure/machinery/landinglight/delaythree{ dir = 4 }, /turf/open/asphalt/cement_sunbleached{ @@ -21708,7 +21708,7 @@ }, /area/desert_dam/building/security/staffroom) "bpu" = ( -/obj/structure/machinery/landinglight/ds1/delayone{ +/obj/structure/machinery/landinglight/delayone{ dir = 8 }, /turf/open/asphalt/cement_sunbleached{ @@ -21834,7 +21834,7 @@ }, /area/desert_dam/interior/dam_interior/engine_west_wing) "bpQ" = ( -/obj/structure/machinery/landinglight/ds1{ +/obj/structure/machinery/landinglight{ dir = 4 }, /turf/open/asphalt/cement_sunbleached{ @@ -21864,7 +21864,7 @@ }, /area/desert_dam/exterior/river/filtration_a) "bpT" = ( -/obj/structure/machinery/landinglight/ds1{ +/obj/structure/machinery/landinglight{ dir = 8 }, /turf/open/asphalt/cement_sunbleached{ @@ -21973,7 +21973,7 @@ }, /area/desert_dam/exterior/valley/valley_telecoms) "bqk" = ( -/obj/structure/machinery/landinglight/ds1/delaythree{ +/obj/structure/machinery/landinglight/delaythree{ dir = 4 }, /turf/open/asphalt/cement_sunbleached{ @@ -22507,7 +22507,7 @@ }, /area/desert_dam/interior/dam_interior/engine_west_wing) "brW" = ( -/obj/structure/machinery/landinglight/ds1/delayone{ +/obj/structure/machinery/landinglight/delayone{ dir = 4 }, /turf/open/asphalt/cement_sunbleached{ @@ -24056,7 +24056,7 @@ }, /area/desert_dam/interior/dam_interior/auxilary_tool_storage) "bxj" = ( -/obj/structure/machinery/landinglight/ds1/delayone{ +/obj/structure/machinery/landinglight/delayone{ dir = 8 }, /turf/open/asphalt/cement_sunbleached{ @@ -25054,7 +25054,7 @@ /turf/open/floor/wood, /area/desert_dam/building/administration/overseer_office) "bAF" = ( -/obj/structure/machinery/landinglight/ds1/delaytwo{ +/obj/structure/machinery/landinglight/delaytwo{ dir = 1 }, /turf/open/asphalt/cement_sunbleached{ @@ -25923,7 +25923,7 @@ /turf/open/floor/prison, /area/desert_dam/building/security/staffroom) "bDO" = ( -/obj/structure/machinery/landinglight/ds1/delaythree{ +/obj/structure/machinery/landinglight/delaythree{ dir = 1 }, /turf/open/asphalt/cement_sunbleached{ @@ -26385,7 +26385,7 @@ }, /area/desert_dam/building/security/holding) "bFg" = ( -/obj/structure/machinery/landinglight/ds1{ +/obj/structure/machinery/landinglight{ dir = 1 }, /turf/open/asphalt/cement_sunbleached{ @@ -26523,7 +26523,7 @@ }, /area/desert_dam/exterior/river/riverside_central_north) "bFB" = ( -/obj/structure/machinery/landinglight/ds1{ +/obj/structure/machinery/landinglight{ dir = 1 }, /turf/open/asphalt, @@ -26963,7 +26963,7 @@ /turf/closed/wall/hangar, /area/desert_dam/interior/dam_interior/primary_tool_storage) "bGY" = ( -/obj/structure/machinery/landinglight/ds1/delayone{ +/obj/structure/machinery/landinglight/delayone{ dir = 1 }, /turf/open/asphalt, @@ -27772,7 +27772,7 @@ }, /area/desert_dam/building/security/staffroom) "bJQ" = ( -/obj/structure/machinery/landinglight/ds1/delaytwo{ +/obj/structure/machinery/landinglight/delaytwo{ dir = 1 }, /turf/open/asphalt, @@ -27973,7 +27973,7 @@ }, /area/desert_dam/interior/dam_interior/lobby) "bKC" = ( -/obj/structure/machinery/landinglight/ds1/delaythree{ +/obj/structure/machinery/landinglight/delaythree{ dir = 1 }, /turf/open/asphalt, @@ -41927,7 +41927,7 @@ /turf/open/desert/dirt, /area/desert_dam/exterior/rock) "cCZ" = ( -/obj/structure/machinery/landinglight/ds2/delaytwo{ +/obj/structure/machinery/landinglight/delaytwo{ dir = 4 }, /turf/open/asphalt/cement_sunbleached{ @@ -42164,13 +42164,13 @@ }, /area/desert_dam/building/medical/east_wing_hallway) "cDK" = ( -/obj/structure/machinery/landinglight/ds2, +/obj/structure/machinery/landinglight, /turf/open/asphalt/cement_sunbleached{ icon_state = "cement_sunbleached14" }, /area/desert_dam/exterior/landing_pad_two) "cDL" = ( -/obj/structure/machinery/landinglight/ds2/delayone{ +/obj/structure/machinery/landinglight/delayone{ dir = 4 }, /turf/open/asphalt/cement_sunbleached{ @@ -42178,7 +42178,7 @@ }, /area/desert_dam/exterior/landing_pad_two) "cDM" = ( -/obj/structure/machinery/landinglight/ds2/delaythree, +/obj/structure/machinery/landinglight/delaythree, /turf/open/asphalt/cement_sunbleached{ icon_state = "cement_sunbleached12" }, @@ -42231,7 +42231,7 @@ }, /area/desert_dam/interior/dam_interior/CE_office) "cDV" = ( -/obj/structure/machinery/landinglight/ds2/delaytwo, +/obj/structure/machinery/landinglight/delaytwo, /turf/open/asphalt/cement_sunbleached{ icon_state = "cement_sunbleached15" }, @@ -42263,7 +42263,7 @@ }, /area/desert_dam/building/bar/bar) "cEc" = ( -/obj/structure/machinery/landinglight/ds1, +/obj/structure/machinery/landinglight, /turf/open/asphalt/cement_sunbleached{ icon_state = "cement_sunbleached4" }, @@ -42558,7 +42558,7 @@ /area/desert_dam/exterior/valley/valley_civilian) "cEZ" = ( /obj/structure/machinery/floodlight/landing, -/obj/structure/machinery/landinglight/ds2/delayone{ +/obj/structure/machinery/landinglight/delayone{ dir = 4 }, /turf/open/floor{ @@ -42570,7 +42570,7 @@ /turf/open/floor/plating, /area/desert_dam/exterior/landing_pad_two) "cFb" = ( -/obj/structure/machinery/landinglight/ds2{ +/obj/structure/machinery/landinglight{ dir = 8 }, /turf/open/asphalt/cement_sunbleached{ @@ -42578,7 +42578,7 @@ }, /area/desert_dam/exterior/landing_pad_two) "cFc" = ( -/obj/structure/machinery/landinglight/ds2/delayone{ +/obj/structure/machinery/landinglight/delayone{ dir = 4 }, /turf/open/asphalt/cement_sunbleached{ @@ -42595,7 +42595,7 @@ }, /area/desert_dam/exterior/valley/valley_telecoms) "cFe" = ( -/obj/structure/machinery/landinglight/ds2/delaythree{ +/obj/structure/machinery/landinglight/delaythree{ dir = 8 }, /turf/open/asphalt/cement_sunbleached{ @@ -42840,7 +42840,7 @@ /turf/open/asphalt, /area/desert_dam/exterior/valley/valley_civilian) "cFI" = ( -/obj/structure/machinery/landinglight/ds2/delaytwo{ +/obj/structure/machinery/landinglight/delaytwo{ dir = 4 }, /turf/open/asphalt/cement_sunbleached{ @@ -42890,7 +42890,7 @@ /turf/open/asphalt, /area/desert_dam/exterior/valley/valley_civilian) "cFP" = ( -/obj/structure/machinery/landinglight/ds2/delaytwo{ +/obj/structure/machinery/landinglight/delaytwo{ dir = 8 }, /turf/open/asphalt/cement_sunbleached{ @@ -42905,7 +42905,7 @@ }, /area/desert_dam/building/warehouse/warehouse) "cFS" = ( -/obj/structure/machinery/landinglight/ds2/delaythree{ +/obj/structure/machinery/landinglight/delaythree{ dir = 4 }, /turf/open/asphalt/cement_sunbleached{ @@ -42947,7 +42947,7 @@ }, /area/desert_dam/interior/dam_interior/primary_tool_storage) "cGa" = ( -/obj/structure/machinery/landinglight/ds2/delayone{ +/obj/structure/machinery/landinglight/delayone{ dir = 8 }, /turf/open/asphalt/cement_sunbleached{ @@ -43194,7 +43194,7 @@ }, /area/desert_dam/exterior/valley/valley_cargo) "cGG" = ( -/obj/structure/machinery/landinglight/ds2{ +/obj/structure/machinery/landinglight{ dir = 4 }, /turf/open/asphalt/cement_sunbleached{ @@ -43262,7 +43262,7 @@ }, /area/desert_dam/building/security/armory) "cGQ" = ( -/obj/structure/machinery/landinglight/ds2{ +/obj/structure/machinery/landinglight{ dir = 8 }, /turf/open/asphalt/cement_sunbleached{ @@ -43277,7 +43277,7 @@ }, /area/desert_dam/exterior/valley/valley_cargo) "cGS" = ( -/obj/structure/machinery/landinglight/ds2/delaytwo, +/obj/structure/machinery/landinglight/delaytwo, /turf/open/asphalt/cement_sunbleached{ icon_state = "cement_sunbleached12" }, @@ -43412,7 +43412,7 @@ }, /area/desert_dam/exterior/valley/valley_cargo) "cHn" = ( -/obj/structure/machinery/landinglight/ds2/delaytwo{ +/obj/structure/machinery/landinglight/delaytwo{ dir = 8 }, /turf/open/asphalt/cement_sunbleached{ @@ -44575,7 +44575,7 @@ /turf/open/asphalt, /area/desert_dam/building/warehouse/warehouse) "cLe" = ( -/obj/structure/machinery/landinglight/ds2{ +/obj/structure/machinery/landinglight{ dir = 4 }, /turf/open/asphalt/cement_sunbleached{ @@ -44693,7 +44693,7 @@ /turf/open/asphalt, /area/desert_dam/building/warehouse/warehouse) "cLL" = ( -/obj/structure/machinery/landinglight/ds2/delayone{ +/obj/structure/machinery/landinglight/delayone{ dir = 8 }, /turf/open/asphalt/cement_sunbleached{ @@ -44903,7 +44903,7 @@ }, /area/desert_dam/exterior/landing_pad_two) "cMD" = ( -/obj/structure/machinery/landinglight/ds2/delaytwo{ +/obj/structure/machinery/landinglight/delaytwo{ dir = 1 }, /turf/open/asphalt/cement_sunbleached{ @@ -44933,7 +44933,7 @@ /turf/open/asphalt, /area/desert_dam/exterior/valley/valley_cargo) "cML" = ( -/obj/structure/machinery/landinglight/ds2/delaythree{ +/obj/structure/machinery/landinglight/delaythree{ dir = 1 }, /turf/open/asphalt/cement_sunbleached{ @@ -45064,7 +45064,7 @@ /turf/open/floor/plating, /area/desert_dam/building/medical/virology_isolation) "cNb" = ( -/obj/structure/machinery/landinglight/ds2{ +/obj/structure/machinery/landinglight{ dir = 1 }, /turf/open/asphalt/cement_sunbleached{ @@ -45114,7 +45114,7 @@ dir = 1; icon_state = "stop_decal5" }, -/obj/structure/machinery/landinglight/ds2/delayone{ +/obj/structure/machinery/landinglight/delayone{ dir = 1 }, /turf/open/asphalt, @@ -45124,7 +45124,7 @@ dir = 1; icon_state = "stop_decal5" }, -/obj/structure/machinery/landinglight/ds2/delaytwo{ +/obj/structure/machinery/landinglight/delaytwo{ dir = 1 }, /turf/open/asphalt, @@ -45196,7 +45196,7 @@ dir = 1; icon_state = "stop_decal5" }, -/obj/structure/machinery/landinglight/ds2/delaythree{ +/obj/structure/machinery/landinglight/delaythree{ dir = 1 }, /turf/open/asphalt, @@ -45891,7 +45891,7 @@ dir = 1; icon_state = "stop_decal5" }, -/obj/structure/machinery/landinglight/ds2{ +/obj/structure/machinery/landinglight{ dir = 1 }, /turf/open/asphalt, @@ -45998,7 +45998,7 @@ dir = 1; icon_state = "stop_decal5" }, -/obj/structure/machinery/landinglight/ds2/delayone{ +/obj/structure/machinery/landinglight/delayone{ dir = 1 }, /turf/open/asphalt, @@ -62988,7 +62988,7 @@ }, /area/desert_dam/building/dorms/hallway_northwing) "nJZ" = ( -/obj/structure/machinery/landinglight/ds1/delaythree{ +/obj/structure/machinery/landinglight/delaythree{ dir = 8 }, /turf/open/asphalt/cement_sunbleached{ @@ -63216,7 +63216,7 @@ /turf/open/asphalt, /area/desert_dam/exterior/valley/valley_telecoms) "oCD" = ( -/obj/structure/machinery/landinglight/ds1/delayone{ +/obj/structure/machinery/landinglight/delayone{ dir = 8 }, /turf/open/asphalt/cement_sunbleached{ @@ -63698,7 +63698,7 @@ }, /area/desert_dam/exterior/valley/valley_crashsite) "qoJ" = ( -/obj/structure/machinery/landinglight/ds1/delaytwo, +/obj/structure/machinery/landinglight/delaytwo, /turf/open/asphalt/cement_sunbleached{ icon_state = "cement_sunbleached4" }, @@ -65171,7 +65171,7 @@ }, /area/desert_dam/exterior/valley/south_valley_dam) "vpn" = ( -/obj/structure/machinery/landinglight/ds2/delayone{ +/obj/structure/machinery/landinglight/delayone{ dir = 8 }, /obj/structure/machinery/floodlight/landing, @@ -65355,7 +65355,7 @@ /turf/open/floor/prison, /area/desert_dam/building/dorms/hallway_northwing) "vRc" = ( -/obj/structure/machinery/landinglight/ds1/delayone{ +/obj/structure/machinery/landinglight/delayone{ dir = 4 }, /turf/open/asphalt/cement_sunbleached{ @@ -65640,7 +65640,7 @@ /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_civilian) "wRg" = ( -/obj/structure/machinery/landinglight/ds2/delayone{ +/obj/structure/machinery/landinglight/delayone{ dir = 8 }, /turf/open/asphalt/cement_sunbleached{ @@ -66005,7 +66005,7 @@ /area/desert_dam/exterior/river/riverside_central_north) "xNB" = ( /obj/structure/machinery/floodlight/landing, -/obj/structure/machinery/landinglight/ds1{ +/obj/structure/machinery/landinglight{ dir = 4 }, /turf/open/floor{ diff --git a/maps/map_files/FOP_v2_Cellblocks/Prison_Station_FOP.dmm b/maps/map_files/FOP_v2_Cellblocks/Prison_Station_FOP.dmm index ba9986948eed..db50e0779c3e 100644 --- a/maps/map_files/FOP_v2_Cellblocks/Prison_Station_FOP.dmm +++ b/maps/map_files/FOP_v2_Cellblocks/Prison_Station_FOP.dmm @@ -3620,7 +3620,7 @@ /obj/effect/decal/warning_stripes{ icon_state = "S" }, -/obj/structure/machinery/landinglight/ds2/delaytwo, +/obj/structure/machinery/landinglight/delaytwo, /turf/open/floor/plating, /area/prison/hanger/research) "ajy" = ( @@ -3630,7 +3630,7 @@ /obj/effect/decal/warning_stripes{ icon_state = "S" }, -/obj/structure/machinery/landinglight/ds2/delayone, +/obj/structure/machinery/landinglight/delayone, /turf/open/floor/plating, /area/prison/hanger/research) "ajz" = ( @@ -3640,7 +3640,7 @@ /obj/effect/decal/warning_stripes{ icon_state = "S" }, -/obj/structure/machinery/landinglight/ds2, +/obj/structure/machinery/landinglight, /turf/open/floor/plating, /area/prison/hanger/research) "ajA" = ( @@ -3650,7 +3650,7 @@ /obj/effect/decal/warning_stripes{ icon_state = "S" }, -/obj/structure/machinery/landinglight/ds2/delaythree, +/obj/structure/machinery/landinglight/delaythree, /turf/open/floor/plating, /area/prison/hanger/research) "ajC" = ( @@ -5061,7 +5061,7 @@ /obj/effect/decal/warning_stripes{ icon_state = "E" }, -/obj/structure/machinery/landinglight/ds2/delaythree{ +/obj/structure/machinery/landinglight/delaythree{ dir = 4 }, /turf/open/floor/plating, @@ -5073,7 +5073,7 @@ /obj/effect/decal/warning_stripes{ icon_state = "W" }, -/obj/structure/machinery/landinglight/ds2/delaythree{ +/obj/structure/machinery/landinglight/delaythree{ dir = 8 }, /turf/open/floor/plating, @@ -5298,7 +5298,7 @@ /obj/effect/decal/warning_stripes{ icon_state = "E" }, -/obj/structure/machinery/landinglight/ds2{ +/obj/structure/machinery/landinglight{ dir = 4 }, /turf/open/floor/plating, @@ -5313,7 +5313,7 @@ /obj/effect/decal/warning_stripes{ icon_state = "W" }, -/obj/structure/machinery/landinglight/ds2/delaytwo{ +/obj/structure/machinery/landinglight/delaytwo{ dir = 8 }, /turf/open/floor/plating, @@ -5649,7 +5649,7 @@ /obj/effect/decal/warning_stripes{ icon_state = "E" }, -/obj/structure/machinery/landinglight/ds2/delayone{ +/obj/structure/machinery/landinglight/delayone{ dir = 4 }, /turf/open/floor/plating, @@ -5658,7 +5658,7 @@ /obj/effect/decal/warning_stripes{ icon_state = "W" }, -/obj/structure/machinery/landinglight/ds2/delayone{ +/obj/structure/machinery/landinglight/delayone{ dir = 8 }, /turf/open/floor/plating, @@ -5778,7 +5778,7 @@ /obj/effect/decal/warning_stripes{ icon_state = "E" }, -/obj/structure/machinery/landinglight/ds2/delaytwo{ +/obj/structure/machinery/landinglight/delaytwo{ dir = 4 }, /turf/open/floor/plating, @@ -5787,7 +5787,7 @@ /obj/effect/decal/warning_stripes{ icon_state = "W" }, -/obj/structure/machinery/landinglight/ds2{ +/obj/structure/machinery/landinglight{ dir = 8 }, /turf/open/floor/plating, @@ -6047,7 +6047,7 @@ /obj/effect/decal/warning_stripes{ icon_state = "E" }, -/obj/structure/machinery/landinglight/ds2/delaythree{ +/obj/structure/machinery/landinglight/delaythree{ dir = 4 }, /turf/open/floor/plating, @@ -6056,7 +6056,7 @@ /obj/effect/decal/warning_stripes{ icon_state = "W" }, -/obj/structure/machinery/landinglight/ds2/delaythree{ +/obj/structure/machinery/landinglight/delaythree{ dir = 8 }, /turf/open/floor/plating, @@ -8694,7 +8694,7 @@ /obj/effect/decal/warning_stripes{ icon_state = "N" }, -/obj/structure/machinery/landinglight/ds2{ +/obj/structure/machinery/landinglight{ dir = 1 }, /turf/open/floor/prison{ @@ -8705,7 +8705,7 @@ /obj/effect/decal/warning_stripes{ icon_state = "N" }, -/obj/structure/machinery/landinglight/ds2/delayone{ +/obj/structure/machinery/landinglight/delayone{ dir = 1 }, /turf/open/floor/prison{ @@ -8716,7 +8716,7 @@ /obj/effect/decal/warning_stripes{ icon_state = "N" }, -/obj/structure/machinery/landinglight/ds2/delaytwo{ +/obj/structure/machinery/landinglight/delaytwo{ dir = 1 }, /turf/open/floor/prison{ @@ -8727,7 +8727,7 @@ /obj/effect/decal/warning_stripes{ icon_state = "N" }, -/obj/structure/machinery/landinglight/ds2/delaythree{ +/obj/structure/machinery/landinglight/delaythree{ dir = 1 }, /turf/open/floor/prison{ @@ -17680,28 +17680,28 @@ /obj/effect/decal/warning_stripes{ icon_state = "S" }, -/obj/structure/machinery/landinglight/ds1/delaytwo, +/obj/structure/machinery/landinglight/delaytwo, /turf/open/floor/plating, /area/prison/hanger/main) "aYk" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" }, -/obj/structure/machinery/landinglight/ds1/delayone, +/obj/structure/machinery/landinglight/delayone, /turf/open/floor/plating, /area/prison/hanger/main) "aYl" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" }, -/obj/structure/machinery/landinglight/ds1, +/obj/structure/machinery/landinglight, /turf/open/floor/plating, /area/prison/hanger/main) "aYm" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" }, -/obj/structure/machinery/landinglight/ds1/delaythree, +/obj/structure/machinery/landinglight/delaythree, /turf/open/floor/plating, /area/prison/hanger/main) "aYo" = ( @@ -18832,7 +18832,7 @@ /obj/effect/decal/warning_stripes{ icon_state = "E" }, -/obj/structure/machinery/landinglight/ds1/delaythree{ +/obj/structure/machinery/landinglight/delaythree{ dir = 4 }, /turf/open/floor/plating, @@ -18844,7 +18844,7 @@ /obj/effect/decal/warning_stripes{ icon_state = "W" }, -/obj/structure/machinery/landinglight/ds1/delaythree{ +/obj/structure/machinery/landinglight/delaythree{ dir = 8 }, /turf/open/floor/plating, @@ -19194,7 +19194,7 @@ /obj/effect/decal/warning_stripes{ icon_state = "E" }, -/obj/structure/machinery/landinglight/ds1{ +/obj/structure/machinery/landinglight{ dir = 4 }, /turf/open/floor/plating, @@ -19209,7 +19209,7 @@ /obj/effect/decal/warning_stripes{ icon_state = "W" }, -/obj/structure/machinery/landinglight/ds1/delaytwo{ +/obj/structure/machinery/landinglight/delaytwo{ dir = 8 }, /turf/open/floor/plating, @@ -19370,7 +19370,7 @@ /obj/effect/decal/warning_stripes{ icon_state = "E" }, -/obj/structure/machinery/landinglight/ds1/delayone{ +/obj/structure/machinery/landinglight/delayone{ dir = 4 }, /turf/open/floor/plating, @@ -19379,7 +19379,7 @@ /obj/effect/decal/warning_stripes{ icon_state = "W" }, -/obj/structure/machinery/landinglight/ds1/delayone{ +/obj/structure/machinery/landinglight/delayone{ dir = 8 }, /turf/open/floor/plating, @@ -19785,7 +19785,7 @@ /obj/effect/decal/warning_stripes{ icon_state = "E" }, -/obj/structure/machinery/landinglight/ds1/delaytwo{ +/obj/structure/machinery/landinglight/delaytwo{ dir = 4 }, /turf/open/floor/plating, @@ -19794,7 +19794,7 @@ /obj/effect/decal/warning_stripes{ icon_state = "W" }, -/obj/structure/machinery/landinglight/ds1{ +/obj/structure/machinery/landinglight{ dir = 8 }, /turf/open/floor/plating, @@ -20292,7 +20292,7 @@ /obj/effect/decal/warning_stripes{ icon_state = "E" }, -/obj/structure/machinery/landinglight/ds1/delaythree{ +/obj/structure/machinery/landinglight/delaythree{ dir = 4 }, /turf/open/floor/plating, @@ -20317,7 +20317,7 @@ /obj/effect/decal/warning_stripes{ icon_state = "W" }, -/obj/structure/machinery/landinglight/ds1/delaythree{ +/obj/structure/machinery/landinglight/delaythree{ dir = 8 }, /turf/open/floor/plating, @@ -21150,7 +21150,7 @@ /obj/effect/decal/warning_stripes{ icon_state = "E" }, -/obj/structure/machinery/landinglight/ds1/delaythree{ +/obj/structure/machinery/landinglight/delaythree{ dir = 4 }, /turf/open/floor/prison{ @@ -21446,7 +21446,7 @@ /obj/effect/decal/warning_stripes{ icon_state = "E" }, -/obj/structure/machinery/landinglight/ds1{ +/obj/structure/machinery/landinglight{ dir = 4 }, /turf/open/floor/prison{ @@ -24918,7 +24918,7 @@ /obj/effect/decal/warning_stripes{ icon_state = "N" }, -/obj/structure/machinery/landinglight/ds1{ +/obj/structure/machinery/landinglight{ dir = 1 }, /turf/open/floor/plating, @@ -24930,7 +24930,7 @@ /obj/effect/decal/warning_stripes{ icon_state = "N" }, -/obj/structure/machinery/landinglight/ds1/delayone{ +/obj/structure/machinery/landinglight/delayone{ dir = 1 }, /turf/open/floor/plating, @@ -24939,7 +24939,7 @@ /obj/effect/decal/warning_stripes{ icon_state = "N" }, -/obj/structure/machinery/landinglight/ds1/delaytwo{ +/obj/structure/machinery/landinglight/delaytwo{ dir = 1 }, /turf/open/floor/plating, @@ -24948,7 +24948,7 @@ /obj/effect/decal/warning_stripes{ icon_state = "N" }, -/obj/structure/machinery/landinglight/ds1/delaythree{ +/obj/structure/machinery/landinglight/delaythree{ dir = 1 }, /turf/open/floor/plating, @@ -43285,7 +43285,7 @@ /obj/effect/decal/warning_stripes{ icon_state = "W" }, -/obj/structure/machinery/landinglight/ds2/delaytwo{ +/obj/structure/machinery/landinglight/delaytwo{ dir = 8 }, /turf/open/floor/prison{ @@ -43637,7 +43637,7 @@ /obj/effect/decal/warning_stripes{ icon_state = "E" }, -/obj/structure/machinery/landinglight/ds2{ +/obj/structure/machinery/landinglight{ dir = 4 }, /turf/open/floor/prison{ @@ -44268,7 +44268,7 @@ /obj/effect/decal/warning_stripes{ icon_state = "W" }, -/obj/structure/machinery/landinglight/ds2/delayone{ +/obj/structure/machinery/landinglight/delayone{ dir = 8 }, /turf/open/floor/prison{ @@ -44334,7 +44334,7 @@ /obj/effect/decal/warning_stripes{ icon_state = "W" }, -/obj/structure/machinery/landinglight/ds2/delaythree{ +/obj/structure/machinery/landinglight/delaythree{ dir = 8 }, /turf/open/floor/prison{ @@ -44717,7 +44717,7 @@ /obj/effect/decal/warning_stripes{ icon_state = "E" }, -/obj/structure/machinery/landinglight/ds2/delaythree{ +/obj/structure/machinery/landinglight/delaythree{ dir = 4 }, /turf/open/floor/prison{ @@ -47119,7 +47119,7 @@ /obj/effect/decal/warning_stripes{ icon_state = "E" }, -/obj/structure/machinery/landinglight/ds2/delayone{ +/obj/structure/machinery/landinglight/delayone{ dir = 4 }, /turf/open/floor/prison{ @@ -47154,7 +47154,7 @@ /obj/effect/decal/warning_stripes{ icon_state = "E" }, -/obj/structure/machinery/landinglight/ds2{ +/obj/structure/machinery/landinglight{ dir = 4 }, /turf/open/floor/prison{ @@ -47176,7 +47176,7 @@ /obj/effect/decal/warning_stripes{ icon_state = "W" }, -/obj/structure/machinery/landinglight/ds2/delaythree{ +/obj/structure/machinery/landinglight/delaythree{ dir = 8 }, /turf/open/floor/prison{ @@ -47654,7 +47654,7 @@ /obj/effect/decal/warning_stripes{ icon_state = "E" }, -/obj/structure/machinery/landinglight/ds2/delaytwo{ +/obj/structure/machinery/landinglight/delaytwo{ dir = 4 }, /turf/open/floor/prison{ @@ -48027,7 +48027,7 @@ /obj/effect/decal/warning_stripes{ icon_state = "W" }, -/obj/structure/machinery/landinglight/ds2/delaytwo{ +/obj/structure/machinery/landinglight/delaytwo{ dir = 8 }, /turf/open/floor/prison{ @@ -48477,7 +48477,7 @@ /obj/effect/decal/warning_stripes{ icon_state = "W" }, -/obj/structure/machinery/landinglight/ds2/delayone{ +/obj/structure/machinery/landinglight/delayone{ dir = 8 }, /turf/open/floor/prison{ @@ -48541,7 +48541,7 @@ /obj/effect/decal/warning_stripes{ icon_state = "W" }, -/obj/structure/machinery/landinglight/ds2{ +/obj/structure/machinery/landinglight{ dir = 8 }, /turf/open/floor/prison{ @@ -48565,7 +48565,7 @@ /obj/effect/decal/warning_stripes{ icon_state = "E" }, -/obj/structure/machinery/landinglight/ds2/delaythree{ +/obj/structure/machinery/landinglight/delaythree{ dir = 4 }, /turf/open/floor/prison{ diff --git a/maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm b/maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm index bffe3f990722..2ede6da355c8 100644 --- a/maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm +++ b/maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm @@ -1371,7 +1371,7 @@ }, /area/fiorina/station/security) "aOT" = ( -/obj/structure/machinery/landinglight/ds2{ +/obj/structure/machinery/landinglight{ dir = 4 }, /turf/open/floor/prison{ @@ -1508,7 +1508,7 @@ /turf/closed/wall/r_wall/prison_unmeltable, /area/fiorina/station/medbay) "aTe" = ( -/obj/structure/machinery/landinglight/ds1/delaytwo, +/obj/structure/machinery/landinglight/delaytwo, /turf/open/floor/prison{ dir = 4; icon_state = "darkyellowfull2" @@ -2081,7 +2081,7 @@ /turf/open/floor/plating/prison, /area/fiorina/tumor/servers) "bne" = ( -/obj/structure/machinery/landinglight/ds2/delaytwo, +/obj/structure/machinery/landinglight/delaytwo, /turf/open/floor/prison{ icon_state = "floor_plate" }, @@ -2397,7 +2397,7 @@ }, /area/fiorina/oob) "bxe" = ( -/obj/structure/machinery/landinglight/ds2{ +/obj/structure/machinery/landinglight{ dir = 8 }, /turf/open/floor/prison{ @@ -2832,7 +2832,7 @@ /turf/open/space/basic, /area/fiorina/oob) "bIz" = ( -/obj/structure/machinery/landinglight/ds2{ +/obj/structure/machinery/landinglight{ dir = 8 }, /turf/open/floor/prison, @@ -3559,7 +3559,7 @@ }, /area/fiorina/station/lowsec) "cfG" = ( -/obj/structure/machinery/landinglight/ds1/delayone{ +/obj/structure/machinery/landinglight/delayone{ dir = 1 }, /turf/open/floor/prison{ @@ -4310,7 +4310,7 @@ }, /area/fiorina/station/park) "cFg" = ( -/obj/structure/machinery/landinglight/ds2/delaythree{ +/obj/structure/machinery/landinglight/delaythree{ dir = 8 }, /turf/open/floor/prison{ @@ -4763,7 +4763,7 @@ }, /area/fiorina/station/disco) "cRZ" = ( -/obj/structure/machinery/landinglight/ds2/delaythree{ +/obj/structure/machinery/landinglight/delaythree{ dir = 4 }, /turf/open/floor/prison{ @@ -5931,7 +5931,7 @@ }, /area/fiorina/station/park) "dDI" = ( -/obj/structure/machinery/landinglight/ds1{ +/obj/structure/machinery/landinglight{ dir = 8 }, /turf/open/floor/prison{ @@ -6779,7 +6779,7 @@ }, /area/fiorina/station/telecomm/lz1_cargo) "ehy" = ( -/obj/structure/machinery/landinglight/ds1/delaythree, +/obj/structure/machinery/landinglight/delaythree, /turf/open/floor/prison{ dir = 4; icon_state = "darkyellowfull2" @@ -7440,7 +7440,7 @@ /turf/open/floor/plating/prison, /area/fiorina/tumor/ice_lab) "eAM" = ( -/obj/structure/machinery/landinglight/ds2/delaytwo{ +/obj/structure/machinery/landinglight/delaytwo{ dir = 1 }, /turf/open/floor/plating/prison, @@ -7499,7 +7499,7 @@ }, /area/fiorina/lz/near_lzII) "eDp" = ( -/obj/structure/machinery/landinglight/ds1/delayone{ +/obj/structure/machinery/landinglight/delayone{ dir = 4 }, /turf/open/floor/prison{ @@ -7786,7 +7786,7 @@ }, /area/fiorina/station/disco) "eLB" = ( -/obj/structure/machinery/landinglight/ds1/delaytwo{ +/obj/structure/machinery/landinglight/delaytwo{ dir = 1 }, /turf/open/floor/prison{ @@ -8044,7 +8044,7 @@ }, /area/fiorina/station/botany) "eSF" = ( -/obj/structure/machinery/landinglight/ds2/delaythree{ +/obj/structure/machinery/landinglight/delaythree{ dir = 1 }, /turf/open/floor/plating/prison, @@ -8292,7 +8292,7 @@ /area/fiorina/station/telecomm/lz1_tram) "eZr" = ( /obj/effect/decal/cleanable/blood/oil, -/obj/structure/machinery/landinglight/ds2/delayone, +/obj/structure/machinery/landinglight/delayone, /turf/open/floor/prison, /area/fiorina/lz/near_lzII) "eZQ" = ( @@ -9855,7 +9855,7 @@ }, /area/fiorina/station/research_cells) "fZd" = ( -/obj/structure/machinery/landinglight/ds2/delayone{ +/obj/structure/machinery/landinglight/delayone{ dir = 1 }, /turf/open/floor/plating/prison, @@ -10353,7 +10353,7 @@ }, /area/fiorina/station/telecomm/lz1_cargo) "grA" = ( -/obj/structure/machinery/landinglight/ds2/delaythree{ +/obj/structure/machinery/landinglight/delaythree{ dir = 4 }, /turf/open/floor/prison, @@ -10703,7 +10703,7 @@ }, /area/fiorina/station/medbay) "gAQ" = ( -/obj/structure/machinery/landinglight/ds2/delaytwo{ +/obj/structure/machinery/landinglight/delaytwo{ dir = 8 }, /turf/open/floor/prison{ @@ -10711,7 +10711,7 @@ }, /area/fiorina/lz/near_lzII) "gBe" = ( -/obj/structure/machinery/landinglight/ds2/delaythree, +/obj/structure/machinery/landinglight/delaythree, /turf/open/floor/prison{ icon_state = "floor_plate" }, @@ -12412,7 +12412,7 @@ }, /area/fiorina/station/telecomm/lz1_cargo) "hzG" = ( -/obj/structure/machinery/landinglight/ds2/delaythree{ +/obj/structure/machinery/landinglight/delaythree{ dir = 8; pixel_x = 7 }, @@ -13010,7 +13010,7 @@ }, /area/fiorina/station/telecomm/lz1_cargo) "hTh" = ( -/obj/structure/machinery/landinglight/ds1/delaytwo{ +/obj/structure/machinery/landinglight/delaytwo{ dir = 8 }, /turf/open/floor/prison{ @@ -14698,7 +14698,7 @@ /turf/open/floor/plating/prison, /area/fiorina/station/botany) "iTt" = ( -/obj/structure/machinery/landinglight/ds2, +/obj/structure/machinery/landinglight, /turf/open/floor/prison{ icon_state = "floor_plate" }, @@ -16000,7 +16000,7 @@ /area/fiorina/station/telecomm/lz1_cargo) "jKz" = ( /obj/effect/decal/cleanable/blood/oil, -/obj/structure/machinery/landinglight/ds1/delaytwo{ +/obj/structure/machinery/landinglight/delaytwo{ dir = 1 }, /turf/open/floor/prison{ @@ -16842,7 +16842,7 @@ }, /area/fiorina/station/power_ring) "klB" = ( -/obj/structure/machinery/landinglight/ds2/delayone, +/obj/structure/machinery/landinglight/delayone, /turf/open/floor/prison, /area/fiorina/lz/near_lzII) "klC" = ( @@ -17660,7 +17660,7 @@ /area/fiorina/tumor/aux_engi) "kIh" = ( /obj/effect/decal/cleanable/blood/oil, -/obj/structure/machinery/landinglight/ds1/delaythree{ +/obj/structure/machinery/landinglight/delaythree{ dir = 1 }, /turf/open/floor/prison{ @@ -18236,7 +18236,7 @@ /turf/open/floor/plating/prison, /area/fiorina/station/civres_blue) "laz" = ( -/obj/structure/machinery/landinglight/ds1/delayone{ +/obj/structure/machinery/landinglight/delayone{ dir = 8 }, /turf/open/floor/prison{ @@ -18308,7 +18308,7 @@ }, /area/fiorina/station/medbay) "lcm" = ( -/obj/structure/machinery/landinglight/ds2/delayone{ +/obj/structure/machinery/landinglight/delayone{ dir = 4 }, /turf/open/floor/prison{ @@ -21699,7 +21699,7 @@ }, /area/fiorina/station/power_ring) "nfh" = ( -/obj/structure/machinery/landinglight/ds2/delayone{ +/obj/structure/machinery/landinglight/delayone{ dir = 8 }, /turf/open/floor/prison{ @@ -24407,7 +24407,7 @@ }, /area/fiorina/tumor/ice_lab) "oGR" = ( -/obj/structure/machinery/landinglight/ds1/delaythree{ +/obj/structure/machinery/landinglight/delaythree{ dir = 1 }, /turf/open/floor/prison{ @@ -27469,7 +27469,7 @@ }, /area/fiorina/station/telecomm/lz1_cargo) "qGe" = ( -/obj/structure/machinery/landinglight/ds1/delaytwo{ +/obj/structure/machinery/landinglight/delaytwo{ dir = 4 }, /turf/open/floor/prison{ @@ -28587,7 +28587,7 @@ }, /area/fiorina/station/research_cells) "rrD" = ( -/obj/structure/machinery/landinglight/ds1{ +/obj/structure/machinery/landinglight{ dir = 1 }, /turf/open/floor/prison{ @@ -31599,7 +31599,7 @@ /turf/open/floor/plating/prison, /area/fiorina/station/chapel) "tgK" = ( -/obj/structure/machinery/landinglight/ds1/delayone, +/obj/structure/machinery/landinglight/delayone, /turf/open/floor/prison{ dir = 4; icon_state = "darkyellowfull2" @@ -32245,7 +32245,7 @@ }, /area/fiorina/station/flight_deck) "tyC" = ( -/obj/structure/machinery/landinglight/ds2/delaytwo{ +/obj/structure/machinery/landinglight/delaytwo{ dir = 4 }, /turf/open/floor/prison{ @@ -33490,7 +33490,7 @@ /turf/open/floor/prison, /area/fiorina/station/medbay) "unp" = ( -/obj/structure/machinery/landinglight/ds1/delaythree{ +/obj/structure/machinery/landinglight/delaythree{ dir = 4 }, /turf/open/floor/prison{ @@ -34267,7 +34267,7 @@ }, /area/fiorina/station/transit_hub) "uNs" = ( -/obj/structure/machinery/landinglight/ds1, +/obj/structure/machinery/landinglight, /turf/open/floor/prison{ dir = 4; icon_state = "darkyellowfull2" @@ -34541,7 +34541,7 @@ }, /area/fiorina/station/park) "uVX" = ( -/obj/structure/machinery/landinglight/ds1/delaythree{ +/obj/structure/machinery/landinglight/delaythree{ dir = 4; pixel_x = -7 }, @@ -35260,7 +35260,7 @@ /turf/open/ice/noweed, /area/fiorina/station/research_cells) "vrA" = ( -/obj/structure/machinery/landinglight/ds1/delaythree{ +/obj/structure/machinery/landinglight/delaythree{ dir = 8 }, /turf/open/floor/prison{ @@ -37489,7 +37489,7 @@ /turf/open/floor/prison, /area/fiorina/station/disco) "wKx" = ( -/obj/structure/machinery/landinglight/ds1{ +/obj/structure/machinery/landinglight{ dir = 4 }, /turf/open/floor/prison{ @@ -38409,7 +38409,7 @@ }, /area/fiorina/station/transit_hub) "xrH" = ( -/obj/structure/machinery/landinglight/ds2{ +/obj/structure/machinery/landinglight{ dir = 1 }, /turf/open/floor/plating/prison, diff --git a/maps/map_files/FOP_v3_Sciannex/sprinkles/10.podholder.dmm b/maps/map_files/FOP_v3_Sciannex/sprinkles/10.podholder.dmm index 916fe313fb33..156854f595c3 100644 --- a/maps/map_files/FOP_v3_Sciannex/sprinkles/10.podholder.dmm +++ b/maps/map_files/FOP_v3_Sciannex/sprinkles/10.podholder.dmm @@ -67,7 +67,7 @@ /turf/open/floor/plating/prison, /area/template_noop) "o" = ( -/obj/structure/machinery/landinglight/ds2/delaythree{ +/obj/structure/machinery/landinglight/delaythree{ dir = 8; pixel_x = 7 }, @@ -136,7 +136,7 @@ /turf/open/floor/plating/prison, /area/template_noop) "Z" = ( -/obj/structure/machinery/landinglight/ds1/delaythree{ +/obj/structure/machinery/landinglight/delaythree{ dir = 4; pixel_x = -7 }, diff --git a/maps/map_files/Ice_Colony_v2/Ice_Colony_v2.dmm b/maps/map_files/Ice_Colony_v2/Ice_Colony_v2.dmm index 485760ebc2af..0e5001b5e208 100644 --- a/maps/map_files/Ice_Colony_v2/Ice_Colony_v2.dmm +++ b/maps/map_files/Ice_Colony_v2/Ice_Colony_v2.dmm @@ -16419,10 +16419,10 @@ }, /area/ice_colony/surface/hangar/beta) "aVF" = ( -/obj/structure/machinery/landinglight/ds1{ +/obj/structure/machinery/landinglight{ dir = 8 }, -/obj/structure/machinery/landinglight/ds1/delaythree{ +/obj/structure/machinery/landinglight/delaythree{ dir = 1 }, /turf/open/floor/plating/icefloor{ @@ -16431,7 +16431,7 @@ }, /area/ice_colony/exterior/surface/landing_pad) "aVG" = ( -/obj/structure/machinery/landinglight/ds1/delaytwo{ +/obj/structure/machinery/landinglight/delaytwo{ dir = 1 }, /turf/open/floor/plating/icefloor{ @@ -16440,7 +16440,7 @@ }, /area/ice_colony/exterior/surface/landing_pad) "aVH" = ( -/obj/structure/machinery/landinglight/ds1/delayone{ +/obj/structure/machinery/landinglight/delayone{ dir = 1 }, /turf/open/floor/plating/icefloor{ @@ -16449,7 +16449,7 @@ }, /area/ice_colony/exterior/surface/landing_pad) "aVI" = ( -/obj/structure/machinery/landinglight/ds1{ +/obj/structure/machinery/landinglight{ dir = 1 }, /turf/open/floor/plating/icefloor{ @@ -16458,7 +16458,7 @@ }, /area/ice_colony/exterior/surface/landing_pad) "aVJ" = ( -/obj/structure/machinery/landinglight/ds1/delaythree{ +/obj/structure/machinery/landinglight/delaythree{ dir = 1 }, /turf/open/floor/plating/icefloor{ @@ -16467,10 +16467,10 @@ }, /area/ice_colony/exterior/surface/landing_pad) "aVK" = ( -/obj/structure/machinery/landinglight/ds1{ +/obj/structure/machinery/landinglight{ dir = 4 }, -/obj/structure/machinery/landinglight/ds1/delayone{ +/obj/structure/machinery/landinglight/delayone{ dir = 1 }, /turf/open/floor/plating/icefloor{ @@ -16673,10 +16673,10 @@ }, /area/ice_colony/surface/hangar/beta) "aWo" = ( -/obj/structure/machinery/landinglight/ds1/delaytwo{ +/obj/structure/machinery/landinglight/delaytwo{ dir = 1 }, -/obj/structure/machinery/landinglight/ds1/delaythree{ +/obj/structure/machinery/landinglight/delaythree{ dir = 8 }, /turf/open/floor/plating/icefloor{ @@ -16688,10 +16688,10 @@ /turf/open/floor/plating, /area/ice_colony/exterior/surface/landing_pad) "aWr" = ( -/obj/structure/machinery/landinglight/ds1/delayone{ +/obj/structure/machinery/landinglight/delayone{ dir = 4 }, -/obj/structure/machinery/landinglight/ds1/delaytwo{ +/obj/structure/machinery/landinglight/delaytwo{ dir = 1 }, /turf/open/floor/plating/icefloor{ @@ -16838,7 +16838,7 @@ }, /area/ice_colony/surface/hangar/beta) "aWP" = ( -/obj/structure/machinery/landinglight/ds1{ +/obj/structure/machinery/landinglight{ dir = 8 }, /turf/open/floor/plating/icefloor{ @@ -16851,7 +16851,7 @@ /turf/open/floor/plating, /area/ice_colony/exterior/surface/landing_pad) "aWR" = ( -/obj/structure/machinery/landinglight/ds1{ +/obj/structure/machinery/landinglight{ dir = 4 }, /turf/open/floor/plating/icefloor{ @@ -17059,7 +17059,7 @@ /turf/open/ice, /area/ice_colony/exterior/surface/landing_pad_external) "aXz" = ( -/obj/structure/machinery/landinglight/ds1/delayone{ +/obj/structure/machinery/landinglight/delayone{ dir = 8 }, /turf/open/floor/plating/icefloor{ @@ -17068,7 +17068,7 @@ }, /area/ice_colony/exterior/surface/landing_pad) "aXA" = ( -/obj/structure/machinery/landinglight/ds1/delaythree{ +/obj/structure/machinery/landinglight/delaythree{ dir = 4 }, /turf/open/floor/plating/icefloor{ @@ -17389,7 +17389,7 @@ /turf/open/ice, /area/ice_colony/exterior/surface/landing_pad_external) "aYt" = ( -/obj/structure/machinery/landinglight/ds1{ +/obj/structure/machinery/landinglight{ dir = 8 }, /turf/open/floor/plating{ @@ -17455,7 +17455,7 @@ }, /area/ice_colony/exterior/surface/landing_pad) "aYJ" = ( -/obj/structure/machinery/landinglight/ds1/delayone{ +/obj/structure/machinery/landinglight/delayone{ dir = 8 }, /turf/open/floor/plating{ @@ -17493,10 +17493,10 @@ /turf/open/ice, /area/ice_colony/exterior/surface/landing_pad_external) "aYQ" = ( -/obj/structure/machinery/landinglight/ds1/delaytwo{ +/obj/structure/machinery/landinglight/delaytwo{ dir = 1 }, -/obj/structure/machinery/landinglight/ds1/delaythree{ +/obj/structure/machinery/landinglight/delaythree{ dir = 8 }, /turf/open/floor/plating{ @@ -17506,10 +17506,10 @@ /area/ice_colony/exterior/surface/landing_pad) "aYR" = ( /obj/structure/machinery/floodlight/landing, -/obj/structure/machinery/landinglight/ds1/delayone{ +/obj/structure/machinery/landinglight/delayone{ dir = 4 }, -/obj/structure/machinery/landinglight/ds1/delaytwo{ +/obj/structure/machinery/landinglight/delaytwo{ dir = 1 }, /turf/open/floor/plating/icefloor{ @@ -17586,7 +17586,7 @@ }, /area/ice_colony/exterior/surface/landing_pad) "aZi" = ( -/obj/structure/machinery/landinglight/ds1{ +/obj/structure/machinery/landinglight{ dir = 8 }, /turf/open/floor/plating/icefloor, @@ -17606,7 +17606,7 @@ /turf/open/floor/plating/icefloor, /area/ice_colony/exterior/surface/landing_pad) "aZo" = ( -/obj/structure/machinery/landinglight/ds1/delayone{ +/obj/structure/machinery/landinglight/delayone{ dir = 8 }, /turf/open/floor/plating/icefloor, @@ -17628,13 +17628,13 @@ /turf/open/floor/plating/icefloor, /area/ice_colony/exterior/surface/landing_pad) "aZv" = ( -/obj/structure/machinery/landinglight/ds1/delaytwo{ +/obj/structure/machinery/landinglight/delaytwo{ dir = 8 }, /turf/open/floor/plating/icefloor, /area/ice_colony/exterior/surface/landing_pad) "aZw" = ( -/obj/structure/machinery/landinglight/ds1/delaytwo{ +/obj/structure/machinery/landinglight/delaytwo{ dir = 4 }, /turf/open/floor/plating/icefloor{ @@ -17663,13 +17663,13 @@ }, /area/ice_colony/exterior/surface/container_yard) "aZA" = ( -/obj/structure/machinery/landinglight/ds1/delaythree{ +/obj/structure/machinery/landinglight/delaythree{ dir = 8 }, /turf/open/floor/plating/icefloor, /area/ice_colony/exterior/surface/landing_pad) "aZB" = ( -/obj/structure/machinery/landinglight/ds1/delayone{ +/obj/structure/machinery/landinglight/delayone{ dir = 4 }, /turf/open/floor/plating/icefloor{ @@ -17793,8 +17793,8 @@ }, /area/ice_colony/exterior/surface/landing_pad_external) "bae" = ( -/obj/structure/machinery/landinglight/ds1, -/obj/structure/machinery/landinglight/ds1/delaythree{ +/obj/structure/machinery/landinglight, +/obj/structure/machinery/landinglight/delaythree{ dir = 8 }, /turf/open/floor/plating{ @@ -17804,8 +17804,8 @@ /area/ice_colony/exterior/surface/landing_pad) "baf" = ( /obj/structure/machinery/floodlight/landing, -/obj/structure/machinery/landinglight/ds1, -/obj/structure/machinery/landinglight/ds1/delayone{ +/obj/structure/machinery/landinglight, +/obj/structure/machinery/landinglight/delayone{ dir = 4 }, /turf/open/floor/plating/icefloor{ @@ -17885,7 +17885,7 @@ /turf/open/ice, /area/ice_colony/exterior/surface/valley/south) "baw" = ( -/obj/structure/machinery/landinglight/ds1/delaytwo{ +/obj/structure/machinery/landinglight/delaytwo{ dir = 8 }, /turf/open/floor/plating{ @@ -17909,48 +17909,48 @@ }, /area/ice_colony/underground/hangar) "baz" = ( -/obj/structure/machinery/landinglight/ds2/delaytwo, +/obj/structure/machinery/landinglight/delaytwo, /turf/open/floor/plating/icefloor, /area/ice_colony/underground/hangar) "baA" = ( -/obj/structure/machinery/landinglight/ds2/delayone, +/obj/structure/machinery/landinglight/delayone, /turf/open/floor/plating/icefloor, /area/ice_colony/underground/hangar) "baB" = ( -/obj/structure/machinery/landinglight/ds2, +/obj/structure/machinery/landinglight, /turf/open/floor/plating/icefloor{ dir = 4; icon_state = "warnplate" }, /area/ice_colony/underground/hangar) "baC" = ( -/obj/structure/machinery/landinglight/ds2/delaythree, +/obj/structure/machinery/landinglight/delaythree, /turf/open/floor/plating/icefloor{ dir = 8; icon_state = "warnplate" }, /area/ice_colony/underground/hangar) "baD" = ( -/obj/structure/machinery/landinglight/ds2, +/obj/structure/machinery/landinglight, /turf/open/floor/plating/icefloor, /area/ice_colony/underground/hangar) "baE" = ( -/obj/structure/machinery/landinglight/ds2/delaythree, +/obj/structure/machinery/landinglight/delaythree, /turf/open/floor/plating/icefloor{ dir = 4; icon_state = "warnplate" }, /area/ice_colony/underground/hangar) "baF" = ( -/obj/structure/machinery/landinglight/ds2/delaytwo, +/obj/structure/machinery/landinglight/delaytwo, /turf/open/floor/plating/icefloor{ dir = 8; icon_state = "warnplate" }, /area/ice_colony/underground/hangar) "baH" = ( -/obj/structure/machinery/landinglight/ds1, -/obj/structure/machinery/landinglight/ds1/delaythree{ +/obj/structure/machinery/landinglight, +/obj/structure/machinery/landinglight/delaythree{ dir = 8 }, /turf/open/floor/plating/icefloor{ @@ -17959,8 +17959,8 @@ }, /area/ice_colony/exterior/surface/landing_pad) "baI" = ( -/obj/structure/machinery/landinglight/ds1, -/obj/structure/machinery/landinglight/ds1/delayone{ +/obj/structure/machinery/landinglight, +/obj/structure/machinery/landinglight/delayone{ dir = 4 }, /turf/open/floor/plating/icefloor{ @@ -17975,13 +17975,13 @@ }, /area/ice_colony/underground/hangar) "baK" = ( -/obj/structure/machinery/landinglight/ds2/delaythree{ +/obj/structure/machinery/landinglight/delaythree{ dir = 4 }, /turf/open/floor/plating/icefloor, /area/ice_colony/underground/hangar) "baM" = ( -/obj/structure/machinery/landinglight/ds2/delayone{ +/obj/structure/machinery/landinglight/delayone{ dir = 8 }, /turf/open/floor/plating/icefloor, @@ -17993,13 +17993,13 @@ }, /area/ice_colony/underground/hangar) "baO" = ( -/obj/structure/machinery/landinglight/ds2{ +/obj/structure/machinery/landinglight{ dir = 4 }, /turf/open/floor/plating/icefloor, /area/ice_colony/underground/hangar) "baQ" = ( -/obj/structure/machinery/landinglight/ds2{ +/obj/structure/machinery/landinglight{ dir = 8 }, /turf/open/floor/plating/icefloor, @@ -18019,7 +18019,7 @@ }, /area/ice_colony/exterior/surface/cliff) "baX" = ( -/obj/structure/machinery/landinglight/ds1/delaytwo{ +/obj/structure/machinery/landinglight/delaytwo{ dir = 8 }, /turf/open/floor/plating/icefloor{ @@ -18037,7 +18037,7 @@ /turf/closed/wall/r_wall/unmeltable, /area/ice_colony/underground/requesition) "bbb" = ( -/obj/structure/machinery/landinglight/ds2/delayone{ +/obj/structure/machinery/landinglight/delayone{ dir = 4 }, /turf/open/floor/plating/icefloor{ @@ -18049,7 +18049,7 @@ /turf/open/floor/plating/icefloor, /area/ice_colony/underground/hangar) "bbd" = ( -/obj/structure/machinery/landinglight/ds2/delaythree{ +/obj/structure/machinery/landinglight/delaythree{ dir = 8 }, /turf/open/floor/plating/icefloor{ @@ -18080,13 +18080,13 @@ /turf/open/ice, /area/ice_colony/exterior/surface/cliff) "bbl" = ( -/obj/structure/machinery/landinglight/ds1/delayone, +/obj/structure/machinery/landinglight/delayone, /turf/open/floor/plating/icefloor{ icon_state = "warnplate" }, /area/ice_colony/exterior/surface/landing_pad) "bbm" = ( -/obj/structure/machinery/landinglight/ds1/delaythree, +/obj/structure/machinery/landinglight/delaythree, /turf/open/floor/plating/icefloor{ icon_state = "warnplate" }, @@ -18095,7 +18095,7 @@ /turf/open/gm/empty, /area/shuttle/elevator4/underground) "bbo" = ( -/obj/structure/machinery/landinglight/ds2/delaytwo{ +/obj/structure/machinery/landinglight/delaytwo{ dir = 4 }, /turf/open/floor/plating/icefloor{ @@ -18104,7 +18104,7 @@ }, /area/ice_colony/underground/hangar) "bbq" = ( -/obj/structure/machinery/landinglight/ds2/delaytwo{ +/obj/structure/machinery/landinglight/delaytwo{ dir = 8 }, /turf/open/floor/plating/icefloor{ @@ -18131,30 +18131,30 @@ }, /area/ice_colony/surface/tcomms) "bby" = ( -/obj/structure/machinery/landinglight/ds1/delaytwo{ +/obj/structure/machinery/landinglight/delaytwo{ dir = 8 }, -/obj/structure/machinery/landinglight/ds1/delaythree, +/obj/structure/machinery/landinglight/delaythree, /turf/open/floor/plating/icefloor{ dir = 10; icon_state = "warnplate" }, /area/ice_colony/exterior/surface/landing_pad) "bbz" = ( -/obj/structure/machinery/landinglight/ds1, +/obj/structure/machinery/landinglight, /turf/open/floor/plating/icefloor{ icon_state = "warnplate" }, /area/ice_colony/exterior/surface/landing_pad) "bbA" = ( -/obj/structure/machinery/landinglight/ds1/delaytwo, +/obj/structure/machinery/landinglight/delaytwo, /turf/open/floor/plating/icefloor{ icon_state = "warnplate" }, /area/ice_colony/exterior/surface/landing_pad) "bbB" = ( -/obj/structure/machinery/landinglight/ds1/delayone, -/obj/structure/machinery/landinglight/ds1/delaytwo{ +/obj/structure/machinery/landinglight/delayone, +/obj/structure/machinery/landinglight/delaytwo{ dir = 4 }, /turf/open/floor/plating/icefloor{ @@ -18239,13 +18239,13 @@ /turf/open/ice, /area/ice_colony/exterior/surface/cliff) "bcc" = ( -/obj/structure/machinery/landinglight/ds2/delayone{ +/obj/structure/machinery/landinglight/delayone{ dir = 4 }, /turf/open/floor/plating/icefloor, /area/ice_colony/underground/hangar) "bcd" = ( -/obj/structure/machinery/landinglight/ds2/delaythree{ +/obj/structure/machinery/landinglight/delaythree{ dir = 8 }, /turf/open/floor/plating/icefloor, @@ -18303,7 +18303,7 @@ /turf/open/ice, /area/ice_colony/exterior/surface/valley/south/excavation) "bcx" = ( -/obj/structure/machinery/landinglight/ds2/delaytwo{ +/obj/structure/machinery/landinglight/delaytwo{ dir = 4 }, /turf/open/floor/plating/icefloor, @@ -18319,7 +18319,7 @@ /turf/open/floor/plating/icefloor, /area/ice_colony/underground/hangar) "bcA" = ( -/obj/structure/machinery/landinglight/ds2/delaytwo{ +/obj/structure/machinery/landinglight/delaytwo{ dir = 8 }, /turf/open/floor/plating/icefloor, @@ -18533,7 +18533,7 @@ /area/ice_colony/underground/requesition) "bdh" = ( /obj/effect/landmark/hunter_secondary, -/obj/structure/machinery/landinglight/ds2/delaythree{ +/obj/structure/machinery/landinglight/delaythree{ dir = 4 }, /turf/open/floor/plating/icefloor, @@ -18739,7 +18739,7 @@ }, /area/ice_colony/underground/requesition) "bdS" = ( -/obj/structure/machinery/landinglight/ds2{ +/obj/structure/machinery/landinglight{ dir = 4 }, /turf/open/floor/plating/icefloor{ @@ -18747,7 +18747,7 @@ }, /area/ice_colony/underground/hangar) "bdT" = ( -/obj/structure/machinery/landinglight/ds2{ +/obj/structure/machinery/landinglight{ dir = 8 }, /turf/open/floor/plating/icefloor{ @@ -18987,7 +18987,7 @@ /turf/closed/wall/r_wall, /area/ice_colony/underground/hangar) "beC" = ( -/obj/structure/machinery/landinglight/ds2/delayone{ +/obj/structure/machinery/landinglight/delayone{ dir = 4 }, /turf/open/floor/plating/icefloor{ @@ -19010,7 +19010,7 @@ }, /area/ice_colony/underground/hangar) "beF" = ( -/obj/structure/machinery/landinglight/ds2/delaythree{ +/obj/structure/machinery/landinglight/delaythree{ dir = 8 }, /turf/open/floor/plating/icefloor{ @@ -19627,7 +19627,7 @@ /obj/effect/decal/cleanable/blood/oil{ icon_state = "armorblood" }, -/obj/structure/machinery/landinglight/ds2/delaythree{ +/obj/structure/machinery/landinglight/delaythree{ dir = 4 }, /turf/open/floor/plating/icefloor{ @@ -19635,7 +19635,7 @@ }, /area/ice_colony/underground/hangar) "bgK" = ( -/obj/structure/machinery/landinglight/ds2/delayone{ +/obj/structure/machinery/landinglight/delayone{ dir = 8 }, /turf/open/floor/plating/icefloor{ @@ -19683,7 +19683,7 @@ /turf/open/floor/plating, /area/ice_colony/underground/hangar) "bgS" = ( -/obj/structure/machinery/landinglight/ds2{ +/obj/structure/machinery/landinglight{ dir = 4 }, /turf/open/floor/plating/icefloor{ @@ -19692,7 +19692,7 @@ }, /area/ice_colony/underground/hangar) "bgT" = ( -/obj/structure/machinery/landinglight/ds2{ +/obj/structure/machinery/landinglight{ dir = 8 }, /turf/open/floor/plating/icefloor{ @@ -19926,19 +19926,19 @@ }, /area/ice_colony/underground/hangar) "bhF" = ( -/obj/structure/machinery/landinglight/ds2/delaythree{ +/obj/structure/machinery/landinglight/delaythree{ dir = 1 }, /turf/open/floor/plating/icefloor, /area/ice_colony/underground/hangar) "bhG" = ( -/obj/structure/machinery/landinglight/ds2{ +/obj/structure/machinery/landinglight{ dir = 1 }, /turf/open/floor/plating/icefloor, /area/ice_colony/underground/hangar) "bhH" = ( -/obj/structure/machinery/landinglight/ds2/delayone{ +/obj/structure/machinery/landinglight/delayone{ dir = 1 }, /turf/open/floor/plating/icefloor{ @@ -19947,7 +19947,7 @@ }, /area/ice_colony/underground/hangar) "bhI" = ( -/obj/structure/machinery/landinglight/ds2/delaytwo{ +/obj/structure/machinery/landinglight/delaytwo{ dir = 1 }, /turf/open/floor/plating/icefloor{ @@ -19956,13 +19956,13 @@ }, /area/ice_colony/underground/hangar) "bhJ" = ( -/obj/structure/machinery/landinglight/ds2/delayone{ +/obj/structure/machinery/landinglight/delayone{ dir = 1 }, /turf/open/floor/plating/icefloor, /area/ice_colony/underground/hangar) "bhK" = ( -/obj/structure/machinery/landinglight/ds2/delaytwo{ +/obj/structure/machinery/landinglight/delaytwo{ dir = 1 }, /turf/open/floor/plating/icefloor{ @@ -19971,7 +19971,7 @@ }, /area/ice_colony/underground/hangar) "bhL" = ( -/obj/structure/machinery/landinglight/ds2/delaythree{ +/obj/structure/machinery/landinglight/delaythree{ dir = 1 }, /turf/open/floor/plating/icefloor{ diff --git a/maps/map_files/Ice_Colony_v3/Shivas_Snowball.dmm b/maps/map_files/Ice_Colony_v3/Shivas_Snowball.dmm index 60847e12bae1..545f8906d07e 100644 --- a/maps/map_files/Ice_Colony_v3/Shivas_Snowball.dmm +++ b/maps/map_files/Ice_Colony_v3/Shivas_Snowball.dmm @@ -1579,8 +1579,8 @@ }, /area/shiva/interior/colony/medseceng) "agF" = ( -/obj/structure/machinery/landinglight/ds2, -/obj/structure/machinery/landinglight/ds2/delaythree{ +/obj/structure/machinery/landinglight, +/obj/structure/machinery/landinglight/delaythree{ dir = 4 }, /turf/open/floor/shiva{ @@ -5196,7 +5196,7 @@ /turf/open/auto_turf/snow/layer2, /area/shiva/exterior/cp_lz2) "aHQ" = ( -/obj/structure/machinery/landinglight/ds2/delayone{ +/obj/structure/machinery/landinglight/delayone{ dir = 4 }, /turf/open/floor/shiva{ @@ -6605,8 +6605,8 @@ }, /area/shiva/interior/colony/research_hab) "aWv" = ( -/obj/structure/machinery/landinglight/ds2, -/obj/structure/machinery/landinglight/ds2/delayone{ +/obj/structure/machinery/landinglight, +/obj/structure/machinery/landinglight/delayone{ dir = 8 }, /turf/open/floor/shiva{ @@ -7269,7 +7269,7 @@ /turf/open/auto_turf/ice/layer1, /area/shiva/exterior/cp_colony_grounds) "bjP" = ( -/obj/structure/machinery/landinglight/ds2/delayone{ +/obj/structure/machinery/landinglight/delayone{ dir = 8 }, /turf/open/floor/shiva{ @@ -8463,7 +8463,7 @@ }, /area/shiva/exterior/lz2_fortress) "cBF" = ( -/obj/structure/machinery/landinglight/ds2/delayone, +/obj/structure/machinery/landinglight/delayone, /turf/open/floor/shiva{ dir = 1 }, @@ -8902,10 +8902,10 @@ /turf/open/floor/shiva, /area/shiva/interior/colony/research_hab) "cYR" = ( -/obj/structure/machinery/landinglight/ds2/delayone{ +/obj/structure/machinery/landinglight/delayone{ dir = 8 }, -/obj/structure/machinery/landinglight/ds2/delaytwo{ +/obj/structure/machinery/landinglight/delaytwo{ dir = 1 }, /turf/open/floor/shiva{ @@ -9370,7 +9370,7 @@ /turf/open/auto_turf/ice/layer2, /area/shiva/interior/caves/left_spiders) "dDo" = ( -/obj/structure/machinery/landinglight/ds1/spoke, +/obj/structure/machinery/landinglight/spoke, /turf/open/floor/shiva{ dir = 6; icon_state = "multi_tiles" @@ -10383,7 +10383,7 @@ /turf/closed/wall/shiva/prefabricated/white, /area/shiva/exterior/cp_lz2) "eVa" = ( -/obj/structure/machinery/landinglight/ds2{ +/obj/structure/machinery/landinglight{ dir = 8 }, /turf/open/floor/shiva{ @@ -10848,8 +10848,8 @@ /turf/open/floor/plating, /area/shiva/interior/colony/botany) "fxw" = ( -/obj/structure/machinery/landinglight/ds2/spoke, -/obj/structure/machinery/landinglight/ds2/delaytwo{ +/obj/structure/machinery/landinglight/spoke, +/obj/structure/machinery/landinglight/delaytwo{ dir = 4 }, /turf/open/floor/shiva{ @@ -11149,10 +11149,10 @@ /turf/open/auto_turf/snow/layer2, /area/shiva/exterior/junkyard) "fLz" = ( -/obj/structure/machinery/landinglight/ds2{ +/obj/structure/machinery/landinglight{ dir = 4 }, -/obj/structure/machinery/landinglight/ds2/delaythree{ +/obj/structure/machinery/landinglight/delaythree{ dir = 4 }, /turf/open/floor/shiva{ @@ -11558,7 +11558,7 @@ /turf/open/auto_turf/snow/layer0, /area/shiva/exterior/cp_colony_grounds) "gkK" = ( -/obj/structure/machinery/landinglight/ds2/delaythree, +/obj/structure/machinery/landinglight/delaythree, /turf/open/floor/shiva{ icon_state = "floor3" }, @@ -11851,7 +11851,7 @@ /turf/open/floor/plating, /area/shiva/interior/colony/botany) "gCx" = ( -/obj/structure/machinery/landinglight/ds1/spoke, +/obj/structure/machinery/landinglight/spoke, /turf/open/auto_turf/snow/layer1, /area/shiva/exterior/lz1_valley) "gCy" = ( @@ -12514,10 +12514,10 @@ /turf/open/gm/river/no_overlay, /area/shiva/interior/colony/central) "hpN" = ( -/obj/structure/machinery/landinglight/ds2/delayone{ +/obj/structure/machinery/landinglight/delayone{ dir = 4 }, -/obj/structure/machinery/landinglight/ds2/delaytwo, +/obj/structure/machinery/landinglight/delaytwo, /turf/open/floor/shiva{ dir = 1 }, @@ -13063,7 +13063,7 @@ /turf/open/auto_turf/snow/layer3, /area/shiva/exterior/junkyard) "hSq" = ( -/obj/structure/machinery/landinglight/ds2/delaythree{ +/obj/structure/machinery/landinglight/delaythree{ dir = 4 }, /turf/open/floor/shiva{ @@ -13225,10 +13225,10 @@ }, /area/shiva/interior/colony/botany) "hZu" = ( -/obj/structure/machinery/landinglight/ds2{ +/obj/structure/machinery/landinglight{ dir = 1 }, -/obj/structure/machinery/landinglight/ds2/delaythree{ +/obj/structure/machinery/landinglight/delaythree{ dir = 8 }, /turf/open/floor/shiva{ @@ -14098,7 +14098,7 @@ /turf/open/floor/plating, /area/shiva/interior/caves/research_caves) "iUk" = ( -/obj/structure/machinery/landinglight/ds2{ +/obj/structure/machinery/landinglight{ dir = 1 }, /turf/open/floor/shiva{ @@ -14684,7 +14684,7 @@ }, /area/shiva/interior/colony/s_admin) "jBN" = ( -/obj/structure/machinery/landinglight/ds2{ +/obj/structure/machinery/landinglight{ dir = 8 }, /turf/open/floor/shiva{ @@ -14838,7 +14838,7 @@ /turf/open/auto_turf/snow/layer0, /area/shiva/exterior/junkyard) "jLc" = ( -/obj/structure/machinery/landinglight/ds2/delaytwo{ +/obj/structure/machinery/landinglight/delaytwo{ dir = 1 }, /turf/open/floor/shiva{ @@ -15161,8 +15161,8 @@ }, /area/shiva/interior/colony/medseceng) "kcB" = ( -/obj/structure/machinery/landinglight/ds2/spoke, -/obj/structure/machinery/landinglight/ds2/delayone{ +/obj/structure/machinery/landinglight/spoke, +/obj/structure/machinery/landinglight/delayone{ dir = 4 }, /turf/open/floor/shiva{ @@ -15302,7 +15302,7 @@ /turf/open/floor/wood, /area/shiva/interior/colony/botany) "kiv" = ( -/obj/structure/machinery/landinglight/ds2, +/obj/structure/machinery/landinglight, /turf/open/floor/shiva{ dir = 1 }, @@ -15815,7 +15815,7 @@ }, /area/shiva/interior/colony/medseceng) "kIH" = ( -/obj/structure/machinery/landinglight/ds2{ +/obj/structure/machinery/landinglight{ dir = 4 }, /turf/open/floor/shiva{ @@ -15858,7 +15858,7 @@ /turf/open/auto_turf/snow/layer1, /area/shiva/exterior/lz1_valley) "kLa" = ( -/obj/structure/machinery/landinglight/ds2/delayone{ +/obj/structure/machinery/landinglight/delayone{ dir = 8 }, /turf/open/floor/shiva{ @@ -16209,7 +16209,7 @@ /turf/open/floor/wood, /area/shiva/interior/bar) "las" = ( -/obj/structure/machinery/landinglight/ds2/spoke{ +/obj/structure/machinery/landinglight/spoke{ pixel_x = 1; pixel_y = 22 }, @@ -16308,10 +16308,10 @@ /turf/open/auto_turf/snow/layer4, /area/shiva/exterior/junkyard) "lgx" = ( -/obj/structure/machinery/landinglight/ds2{ +/obj/structure/machinery/landinglight{ dir = 1 }, -/obj/structure/machinery/landinglight/ds2/delayone{ +/obj/structure/machinery/landinglight/delayone{ dir = 4 }, /turf/open/floor/shiva{ @@ -16563,7 +16563,7 @@ /turf/open/auto_turf/snow/layer1, /area/shiva/exterior/junkyard/fortbiceps) "luR" = ( -/obj/structure/machinery/landinglight/ds2/delaytwo{ +/obj/structure/machinery/landinglight/delaytwo{ dir = 4 }, /turf/open/floor/shiva{ @@ -16571,7 +16571,7 @@ }, /area/shiva/exterior/lz2_fortress) "lvj" = ( -/obj/structure/machinery/landinglight/ds2, +/obj/structure/machinery/landinglight, /turf/open/floor/shiva{ icon_state = "floor3" }, @@ -16664,7 +16664,7 @@ /turf/open/auto_turf/ice/layer1, /area/shiva/interior/caves/cp_camp) "lBC" = ( -/obj/structure/machinery/landinglight/ds2/delaythree{ +/obj/structure/machinery/landinglight/delaythree{ dir = 8 }, /turf/open/floor/shiva{ @@ -17601,7 +17601,7 @@ /turf/open/floor/plating/plating_catwalk/shiva, /area/shiva/exterior/lz2_fortress) "mBM" = ( -/obj/structure/machinery/landinglight/ds2/spoke{ +/obj/structure/machinery/landinglight/spoke{ pixel_x = -2; pixel_y = 23 }, @@ -17674,7 +17674,7 @@ /turf/open/floor/wood, /area/shiva/interior/colony/botany) "mEp" = ( -/obj/structure/machinery/landinglight/ds2/delaythree{ +/obj/structure/machinery/landinglight/delaythree{ dir = 1 }, /turf/open/floor/shiva{ @@ -17794,7 +17794,7 @@ /turf/open/auto_turf/snow/layer1, /area/shiva/exterior/junkyard) "mJA" = ( -/obj/structure/machinery/landinglight/ds2/spoke{ +/obj/structure/machinery/landinglight/spoke{ pixel_x = -2; pixel_y = 22 }, @@ -17928,7 +17928,7 @@ /turf/open/auto_turf/ice/layer1, /area/shiva/exterior/valley) "mQl" = ( -/obj/structure/machinery/landinglight/ds2/delaytwo{ +/obj/structure/machinery/landinglight/delaytwo{ dir = 8 }, /turf/open/floor/shiva{ @@ -18326,8 +18326,8 @@ /turf/open/gm/river/no_overlay, /area/shiva/interior/caves/cp_camp) "nlG" = ( -/obj/structure/machinery/landinglight/ds2/spoke, -/obj/structure/machinery/landinglight/ds2/delaytwo{ +/obj/structure/machinery/landinglight/spoke, +/obj/structure/machinery/landinglight/delaytwo{ dir = 8 }, /turf/open/floor/shiva{ @@ -20306,8 +20306,8 @@ }, /area/shiva/interior/bar) "pBl" = ( -/obj/structure/machinery/landinglight/ds2/spoke, -/obj/structure/machinery/landinglight/ds2/delaythree{ +/obj/structure/machinery/landinglight/spoke, +/obj/structure/machinery/landinglight/delaythree{ dir = 8 }, /turf/open/floor/shiva{ @@ -20463,7 +20463,7 @@ }, /area/shiva/interior/colony/medseceng) "pGg" = ( -/obj/structure/machinery/landinglight/ds2/delaytwo, +/obj/structure/machinery/landinglight/delaytwo, /turf/open/floor/shiva{ dir = 1 }, @@ -21063,7 +21063,7 @@ /turf/open/auto_turf/ice/layer1, /area/shiva/interior/oob/dev_room) "qkI" = ( -/obj/structure/machinery/landinglight/ds1/spoke, +/obj/structure/machinery/landinglight/spoke, /turf/open/auto_turf/snow/layer0, /area/shiva/exterior/lz1_valley) "qkL" = ( @@ -22576,7 +22576,7 @@ }, /area/shiva/interior/aerodrome) "rXp" = ( -/obj/structure/machinery/landinglight/ds2/delayone, +/obj/structure/machinery/landinglight/delayone, /turf/open/floor/shiva{ icon_state = "floor3" }, @@ -23009,7 +23009,7 @@ }, /area/shiva/interior/colony/medseceng) "sxD" = ( -/obj/structure/machinery/landinglight/ds2/spoke, +/obj/structure/machinery/landinglight/spoke, /turf/open/floor/shiva{ dir = 1 }, @@ -23493,7 +23493,7 @@ /turf/open/floor/interior/plastic/alt, /area/shiva/interior/warehouse) "sZx" = ( -/obj/structure/machinery/landinglight/ds2/delayone{ +/obj/structure/machinery/landinglight/delayone{ dir = 1 }, /turf/open/floor/shiva{ @@ -24126,7 +24126,7 @@ }, /area/shiva/interior/aerodrome) "tGS" = ( -/obj/structure/machinery/landinglight/ds2/spoke, +/obj/structure/machinery/landinglight/spoke, /turf/open/floor/shiva{ dir = 6; icon_state = "multi_tiles" @@ -24836,10 +24836,10 @@ }, /area/shiva/interior/colony/n_admin) "ujV" = ( -/obj/structure/machinery/landinglight/ds2/delaytwo{ +/obj/structure/machinery/landinglight/delaytwo{ dir = 1 }, -/obj/structure/machinery/landinglight/ds2/delaythree{ +/obj/structure/machinery/landinglight/delaythree{ dir = 4 }, /turf/open/floor/shiva{ @@ -25947,7 +25947,7 @@ /turf/open/auto_turf/snow/layer2, /area/shiva/exterior/lz1_valley) "voH" = ( -/obj/structure/machinery/landinglight/ds2/spoke{ +/obj/structure/machinery/landinglight/spoke{ pixel_x = 1; pixel_y = 23 }, @@ -26567,7 +26567,7 @@ /turf/open/floor/plating, /area/shiva/interior/colony/medseceng) "wfO" = ( -/obj/structure/machinery/landinglight/ds2{ +/obj/structure/machinery/landinglight{ dir = 4 }, /turf/open/floor/shiva{ @@ -26739,8 +26739,8 @@ }, /area/shiva/interior/colony/botany) "wpl" = ( -/obj/structure/machinery/landinglight/ds2/delaytwo, -/obj/structure/machinery/landinglight/ds2/delaythree{ +/obj/structure/machinery/landinglight/delaytwo, +/obj/structure/machinery/landinglight/delaythree{ dir = 8 }, /turf/open/floor/shiva{ @@ -27733,7 +27733,7 @@ }, /area/shiva/interior/colony/research_hab) "xEd" = ( -/obj/structure/machinery/landinglight/ds2/delaythree{ +/obj/structure/machinery/landinglight/delaythree{ dir = 4 }, /turf/open/floor/shiva{ @@ -28204,7 +28204,7 @@ }, /area/shiva/interior/colony/medseceng) "ylP" = ( -/obj/structure/machinery/landinglight/ds2/delaythree, +/obj/structure/machinery/landinglight/delaythree, /turf/open/floor/shiva{ dir = 1 }, diff --git a/maps/map_files/Ice_Colony_v3/lz2-variations/east-gate/blocked.dmm b/maps/map_files/Ice_Colony_v3/lz2-variations/east-gate/blocked.dmm index e7cccabcd6cf..76a3e7d937ae 100644 --- a/maps/map_files/Ice_Colony_v3/lz2-variations/east-gate/blocked.dmm +++ b/maps/map_files/Ice_Colony_v3/lz2-variations/east-gate/blocked.dmm @@ -3,7 +3,7 @@ /turf/closed/wall/shiva/prefabricated/reinforced/hull, /area/shiva/exterior/lz2_fortress) "b" = ( -/obj/structure/machinery/landinglight/ds2/spoke{ +/obj/structure/machinery/landinglight/spoke{ pixel_x = 1; pixel_y = 22 }, @@ -126,7 +126,7 @@ }, /area/shiva/exterior/lz2_fortress) "O" = ( -/obj/structure/machinery/landinglight/ds2/spoke{ +/obj/structure/machinery/landinglight/spoke{ pixel_x = 1; pixel_y = 23 }, @@ -136,7 +136,7 @@ /turf/open/auto_turf/snow/layer0, /area/shiva/exterior/cp_lz2) "V" = ( -/obj/structure/machinery/landinglight/ds2/spoke{ +/obj/structure/machinery/landinglight/spoke{ pixel_x = -2; pixel_y = 22 }, @@ -149,7 +149,7 @@ /turf/open/auto_turf/snow/layer2, /area/shiva/exterior/cp_lz2) "Z" = ( -/obj/structure/machinery/landinglight/ds2/spoke{ +/obj/structure/machinery/landinglight/spoke{ pixel_x = -2; pixel_y = 23 }, diff --git a/maps/map_files/Ice_Colony_v3/lz2-variations/south-gate/blocked.dmm b/maps/map_files/Ice_Colony_v3/lz2-variations/south-gate/blocked.dmm index 60525207b45b..1dd86a65e381 100644 --- a/maps/map_files/Ice_Colony_v3/lz2-variations/south-gate/blocked.dmm +++ b/maps/map_files/Ice_Colony_v3/lz2-variations/south-gate/blocked.dmm @@ -18,7 +18,7 @@ /turf/open/auto_turf/snow/layer1, /area/shiva/exterior/cp_lz2) "f" = ( -/obj/structure/machinery/landinglight/ds2/spoke{ +/obj/structure/machinery/landinglight/spoke{ pixel_x = -2; pixel_y = 23 }, @@ -45,7 +45,7 @@ }, /area/shiva/exterior/lz2_fortress) "o" = ( -/obj/structure/machinery/landinglight/ds2/spoke{ +/obj/structure/machinery/landinglight/spoke{ pixel_x = -2; pixel_y = 22 }, @@ -119,7 +119,7 @@ }, /area/shiva/exterior/lz2_fortress) "J" = ( -/obj/structure/machinery/landinglight/ds2/spoke{ +/obj/structure/machinery/landinglight/spoke{ pixel_x = 1; pixel_y = 23 }, @@ -145,7 +145,7 @@ /turf/open/floor/plating/plating_catwalk/shiva, /area/shiva/exterior/lz2_fortress) "R" = ( -/obj/structure/machinery/landinglight/ds2/spoke{ +/obj/structure/machinery/landinglight/spoke{ pixel_x = 1; pixel_y = 22 }, diff --git a/maps/map_files/Ice_Colony_v3/lz2-variations/southeast-gate/cleared.dmm b/maps/map_files/Ice_Colony_v3/lz2-variations/southeast-gate/cleared.dmm index bb1a8e543218..36d42a3f4cfd 100644 --- a/maps/map_files/Ice_Colony_v3/lz2-variations/southeast-gate/cleared.dmm +++ b/maps/map_files/Ice_Colony_v3/lz2-variations/southeast-gate/cleared.dmm @@ -11,7 +11,7 @@ /turf/open/auto_turf/snow/layer1, /area/shiva/exterior/cp_lz2) "f" = ( -/obj/structure/machinery/landinglight/ds2/spoke{ +/obj/structure/machinery/landinglight/spoke{ pixel_x = -2; pixel_y = 22 }, @@ -29,7 +29,7 @@ /turf/open/floor/plating/plating_catwalk/shiva, /area/shiva/exterior/lz2_fortress) "l" = ( -/obj/structure/machinery/landinglight/ds2/spoke{ +/obj/structure/machinery/landinglight/spoke{ pixel_x = 1; pixel_y = 22 }, @@ -72,14 +72,14 @@ }, /area/shiva/exterior/lz2_fortress) "w" = ( -/obj/structure/machinery/landinglight/ds2/spoke{ +/obj/structure/machinery/landinglight/spoke{ pixel_x = 1; pixel_y = 23 }, /turf/closed/wall/shiva/prefabricated/reinforced/hull, /area/shiva/exterior/lz2_fortress) "z" = ( -/obj/structure/machinery/landinglight/ds2/spoke{ +/obj/structure/machinery/landinglight/spoke{ pixel_x = -2; pixel_y = 23 }, diff --git a/maps/map_files/Kutjevo/Kutjevo.dmm b/maps/map_files/Kutjevo/Kutjevo.dmm index 2e1ebb3ea204..434c9cc80f10 100644 --- a/maps/map_files/Kutjevo/Kutjevo.dmm +++ b/maps/map_files/Kutjevo/Kutjevo.dmm @@ -294,7 +294,7 @@ /turf/open/floor/kutjevo/colors/cyan, /area/kutjevo/interior/complex/med/cells) "asT" = ( -/obj/structure/machinery/landinglight/ds1/delaythree, +/obj/structure/machinery/landinglight/delaythree, /turf/open/floor/kutjevo/multi_tiles, /area/kutjevo/exterior/lz_dunes) "atn" = ( @@ -581,7 +581,7 @@ /turf/open/auto_turf/sand/layer0, /area/kutjevo/interior/colony_South) "aKl" = ( -/obj/structure/machinery/landinglight/ds1{ +/obj/structure/machinery/landinglight{ dir = 1 }, /turf/open/floor/kutjevo/multi_tiles, @@ -1492,7 +1492,7 @@ /turf/open/floor/plating/kutjevo, /area/kutjevo/interior/colony_north) "ccs" = ( -/obj/structure/machinery/landinglight/ds2/delaytwo{ +/obj/structure/machinery/landinglight/delaytwo{ dir = 4 }, /turf/open/floor/kutjevo/multi_tiles, @@ -2411,7 +2411,7 @@ /turf/open/floor/almayer/research/containment/floor1, /area/kutjevo/exterior/Northwest_Colony) "dhL" = ( -/obj/structure/machinery/landinglight/ds2{ +/obj/structure/machinery/landinglight{ dir = 4 }, /turf/open/floor/kutjevo/multi_tiles, @@ -2498,7 +2498,7 @@ }, /area/kutjevo/exterior/runoff_river) "dpt" = ( -/obj/structure/machinery/landinglight/ds2/delayone{ +/obj/structure/machinery/landinglight/delayone{ dir = 1 }, /turf/open/floor/kutjevo/multi_tiles, @@ -2773,7 +2773,7 @@ /area/kutjevo/exterior/Northwest_Colony) "dEI" = ( /obj/effect/decal/cleanable/blood/oil, -/obj/structure/machinery/landinglight/ds1/delayone, +/obj/structure/machinery/landinglight/delayone, /turf/open/floor/kutjevo/multi_tiles, /area/kutjevo/exterior/lz_dunes) "dFc" = ( @@ -2846,7 +2846,7 @@ }, /area/kutjevo/exterior/runoff_river) "dIo" = ( -/obj/structure/machinery/landinglight/ds1/delaytwo{ +/obj/structure/machinery/landinglight/delaytwo{ dir = 8 }, /turf/open/floor/kutjevo/multi_tiles, @@ -3548,7 +3548,7 @@ /turf/open/floor/plating/kutjevo, /area/kutjevo/interior/complex/botany/east_tech) "exI" = ( -/obj/structure/machinery/landinglight/ds1, +/obj/structure/machinery/landinglight, /turf/open/floor/kutjevo/multi_tiles, /area/kutjevo/exterior/lz_dunes) "eyk" = ( @@ -4103,7 +4103,7 @@ }, /area/kutjevo/interior/complex/med/auto_doc) "ffP" = ( -/obj/structure/machinery/landinglight/ds1/delaythree{ +/obj/structure/machinery/landinglight/delaythree{ dir = 4 }, /turf/open/floor/kutjevo/multi_tiles, @@ -5590,7 +5590,7 @@ /turf/open/floor/plating/kutjevo, /area/kutjevo/interior/construction) "hnq" = ( -/obj/structure/machinery/landinglight/ds2/delaythree{ +/obj/structure/machinery/landinglight/delaythree{ dir = 4 }, /turf/open/floor/kutjevo/multi_tiles, @@ -7354,7 +7354,7 @@ }, /area/kutjevo/interior/complex/botany/east) "jUK" = ( -/obj/structure/machinery/landinglight/ds2{ +/obj/structure/machinery/landinglight{ dir = 8 }, /turf/open/floor/kutjevo/multi_tiles, @@ -8711,7 +8711,7 @@ /turf/open/floor/almayer/research/containment/floor1, /area/kutjevo/interior/complex/med/locks) "lNl" = ( -/obj/structure/machinery/landinglight/ds2/delaytwo{ +/obj/structure/machinery/landinglight/delaytwo{ dir = 1 }, /turf/open/floor/kutjevo/multi_tiles, @@ -9493,7 +9493,7 @@ /turf/open/floor/almayer/research/containment/floor1, /area/kutjevo/interior/complex/med/auto_doc) "mIT" = ( -/obj/structure/machinery/landinglight/ds2/delayone, +/obj/structure/machinery/landinglight/delayone, /turf/open/floor/kutjevo/multi_tiles, /area/kutjevo/exterior/Northwest_Colony) "mJq" = ( @@ -11519,7 +11519,7 @@ /turf/open/floor/kutjevo/tan, /area/kutjevo/interior/complex/Northwest_Flight_Control) "ptH" = ( -/obj/structure/machinery/landinglight/ds1/delayone{ +/obj/structure/machinery/landinglight/delayone{ dir = 4 }, /turf/open/floor/kutjevo/multi_tiles, @@ -11889,7 +11889,7 @@ }, /area/kutjevo/interior/power/comms) "pPz" = ( -/obj/structure/machinery/landinglight/ds2/delayone{ +/obj/structure/machinery/landinglight/delayone{ dir = 8 }, /turf/open/floor/kutjevo/multi_tiles, @@ -12323,7 +12323,7 @@ /turf/open/floor/plating/kutjevo, /area/kutjevo/interior/complex/Northwest_Security_Checkpoint) "qzr" = ( -/obj/structure/machinery/landinglight/ds1{ +/obj/structure/machinery/landinglight{ dir = 8 }, /turf/open/floor/kutjevo/multi_tiles, @@ -12604,7 +12604,7 @@ /turf/open/floor/kutjevo/colors/green, /area/kutjevo/interior/complex/botany) "qTI" = ( -/obj/structure/machinery/landinglight/ds2/delaythree{ +/obj/structure/machinery/landinglight/delaythree{ dir = 1 }, /turf/open/floor/kutjevo/multi_tiles, @@ -12626,7 +12626,7 @@ }, /area/kutjevo/interior/complex/Northwest_Flight_Control) "qVc" = ( -/obj/structure/machinery/landinglight/ds1/delayone{ +/obj/structure/machinery/landinglight/delayone{ dir = 1 }, /turf/open/floor/kutjevo/multi_tiles, @@ -13195,7 +13195,7 @@ /turf/open/floor/kutjevo/colors/orange, /area/kutjevo/interior/power/comms) "rMV" = ( -/obj/structure/machinery/landinglight/ds1/delaythree{ +/obj/structure/machinery/landinglight/delaythree{ dir = 8 }, /turf/open/floor/kutjevo/multi_tiles, @@ -13225,7 +13225,7 @@ /turf/open/auto_turf/sand/layer0, /area/kutjevo/exterior/scrubland) "rPq" = ( -/obj/structure/machinery/landinglight/ds1/delayone, +/obj/structure/machinery/landinglight/delayone, /turf/open/floor/kutjevo/multi_tiles, /area/kutjevo/exterior/lz_dunes) "rQa" = ( @@ -13416,7 +13416,7 @@ }, /area/kutjevo/interior/colony_central) "saK" = ( -/obj/structure/machinery/landinglight/ds2/delaytwo, +/obj/structure/machinery/landinglight/delaytwo, /turf/open/floor/kutjevo/multi_tiles, /area/kutjevo/exterior/Northwest_Colony) "sbb" = ( @@ -13555,7 +13555,7 @@ }, /area/kutjevo/interior/colony_South/power2) "slB" = ( -/obj/structure/machinery/landinglight/ds1/delaythree{ +/obj/structure/machinery/landinglight/delaythree{ dir = 1 }, /turf/open/floor/kutjevo/multi_tiles, @@ -13935,7 +13935,7 @@ }, /area/kutjevo/interior/complex/Northwest_Dorms) "sKo" = ( -/obj/structure/machinery/landinglight/ds1/delaytwo{ +/obj/structure/machinery/landinglight/delaytwo{ dir = 4 }, /turf/open/floor/kutjevo/multi_tiles, @@ -13953,7 +13953,7 @@ /area/kutjevo/interior/complex/med/cells) "sLf" = ( /obj/effect/decal/cleanable/blood/oil, -/obj/structure/machinery/landinglight/ds2/delayone, +/obj/structure/machinery/landinglight/delayone, /turf/open/floor/kutjevo/multi_tiles, /area/kutjevo/exterior/Northwest_Colony) "sLx" = ( @@ -14090,7 +14090,7 @@ /turf/open/gm/river/desert/deep/covered, /area/kutjevo/interior/colony_central) "sUt" = ( -/obj/structure/machinery/landinglight/ds2/delaythree, +/obj/structure/machinery/landinglight/delaythree, /turf/open/floor/kutjevo/multi_tiles, /area/kutjevo/exterior/Northwest_Colony) "sUC" = ( @@ -14337,7 +14337,7 @@ /turf/open/auto_turf/sand/layer0, /area/kutjevo/interior/oob/dev_room) "tld" = ( -/obj/structure/machinery/landinglight/ds1{ +/obj/structure/machinery/landinglight{ dir = 4 }, /turf/open/floor/kutjevo/multi_tiles, @@ -14648,7 +14648,7 @@ /turf/open/floor/kutjevo/plate, /area/kutjevo/exterior/Northwest_Colony) "tHI" = ( -/obj/structure/machinery/landinglight/ds2/delaytwo{ +/obj/structure/machinery/landinglight/delaytwo{ dir = 8 }, /turf/open/floor/kutjevo/multi_tiles, @@ -14964,7 +14964,7 @@ /turf/closed/wall/kutjevo/colony/reinforced/hull, /area/kutjevo/interior/oob) "uhO" = ( -/obj/structure/machinery/landinglight/ds1/delaytwo, +/obj/structure/machinery/landinglight/delaytwo, /turf/open/floor/kutjevo/multi_tiles, /area/kutjevo/exterior/lz_dunes) "uhV" = ( @@ -15175,7 +15175,7 @@ }, /area/kutjevo/interior/colony_north) "usd" = ( -/obj/structure/machinery/landinglight/ds1/delaytwo{ +/obj/structure/machinery/landinglight/delaytwo{ dir = 1 }, /turf/open/floor/kutjevo/multi_tiles, @@ -16680,7 +16680,7 @@ }, /area/kutjevo/exterior/complex_border/med_park) "wrk" = ( -/obj/structure/machinery/landinglight/ds2/delayone{ +/obj/structure/machinery/landinglight/delayone{ dir = 4 }, /turf/open/floor/kutjevo/multi_tiles, @@ -16778,7 +16778,7 @@ /turf/open/floor/plating/kutjevo, /area/kutjevo/exterior/runoff_bridge) "wvX" = ( -/obj/structure/machinery/landinglight/ds2, +/obj/structure/machinery/landinglight, /turf/open/floor/kutjevo/multi_tiles, /area/kutjevo/exterior/Northwest_Colony) "wwc" = ( @@ -17093,7 +17093,7 @@ /turf/closed/wall/kutjevo/rock, /area/kutjevo/interior/colony_South) "wXf" = ( -/obj/structure/machinery/landinglight/ds2{ +/obj/structure/machinery/landinglight{ dir = 1 }, /turf/open/floor/kutjevo/multi_tiles, @@ -17500,7 +17500,7 @@ }, /area/kutjevo/exterior/complex_border/med_park) "xDR" = ( -/obj/structure/machinery/landinglight/ds2/delaythree{ +/obj/structure/machinery/landinglight/delaythree{ dir = 8 }, /turf/open/floor/kutjevo/multi_tiles, @@ -17774,7 +17774,7 @@ /turf/open/floor/plating/kutjevo, /area/kutjevo/interior/power) "yaE" = ( -/obj/structure/machinery/landinglight/ds1/delayone{ +/obj/structure/machinery/landinglight/delayone{ dir = 8 }, /turf/open/floor/kutjevo/multi_tiles, diff --git a/maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm b/maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm index 5a4fa0fbdf91..d5151caf3437 100644 --- a/maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm +++ b/maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm @@ -1166,7 +1166,7 @@ /turf/open/floor/prison, /area/lv522/indoors/lone_buildings/outdoor_bot) "aGS" = ( -/obj/structure/machinery/landinglight/ds1/delaytwo{ +/obj/structure/machinery/landinglight/delaytwo{ dir = 8 }, /turf/open/floor/plating, @@ -6272,7 +6272,7 @@ /area/lv522/oob) "das" = ( /obj/effect/landmark/lv624/fog_blocker/short, -/obj/structure/machinery/landinglight/ds1/delayone, +/obj/structure/machinery/landinglight/delayone, /turf/open/floor/plating, /area/lv522/landing_zone_1) "daz" = ( @@ -6741,7 +6741,7 @@ }, /area/lv522/atmos/east_reactor) "dhP" = ( -/obj/structure/machinery/landinglight/ds1/delayone{ +/obj/structure/machinery/landinglight/delayone{ dir = 8 }, /turf/open/floor/plating, @@ -8191,7 +8191,7 @@ }, /area/lv522/oob) "dMY" = ( -/obj/structure/machinery/landinglight/ds1/delaytwo{ +/obj/structure/machinery/landinglight/delaytwo{ dir = 1 }, /turf/open/floor/plating, @@ -10071,7 +10071,7 @@ /area/lv522/outdoors/colony_streets/central_streets) "eyy" = ( /obj/effect/landmark/lv624/fog_blocker/short, -/obj/structure/machinery/landinglight/ds1, +/obj/structure/machinery/landinglight, /turf/open/floor/plating, /area/lv522/landing_zone_1) "eyM" = ( @@ -12574,7 +12574,7 @@ /area/lv522/outdoors/colony_streets/east_central_street) "fBL" = ( /obj/effect/landmark/lv624/fog_blocker/short, -/obj/structure/machinery/landinglight/ds1/delaytwo, +/obj/structure/machinery/landinglight/delaytwo, /turf/open/floor/prison{ dir = 4; icon_state = "greenfull" @@ -13224,7 +13224,7 @@ }, /area/lv522/indoors/c_block/garage) "fOc" = ( -/obj/structure/machinery/landinglight/ds1/delayone{ +/obj/structure/machinery/landinglight/delayone{ dir = 4 }, /turf/open/floor/plating, @@ -13284,7 +13284,7 @@ /turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/north_west_street) "fPO" = ( -/obj/structure/machinery/landinglight/ds2{ +/obj/structure/machinery/landinglight{ dir = 4 }, /turf/open/floor/plating, @@ -13396,7 +13396,7 @@ /area/lv522/atmos/sewer) "fSo" = ( /obj/effect/landmark/lv624/fog_blocker/short, -/obj/structure/machinery/landinglight/ds1, +/obj/structure/machinery/landinglight, /turf/open/floor/prison{ dir = 4; icon_state = "greenfull" @@ -14469,7 +14469,7 @@ }, /area/lv522/atmos/east_reactor) "gnf" = ( -/obj/structure/machinery/landinglight/ds1/delaythree{ +/obj/structure/machinery/landinglight/delaythree{ dir = 1 }, /turf/open/floor/plating, @@ -14980,7 +14980,7 @@ }, /area/lv522/atmos/command_centre) "gxp" = ( -/obj/structure/machinery/landinglight/ds2/delaythree{ +/obj/structure/machinery/landinglight/delaythree{ dir = 4 }, /turf/open/floor/plating, @@ -16141,7 +16141,7 @@ /turf/closed/wall/shiva/prefabricated/reinforced, /area/lv522/atmos/cargo_intake) "gVf" = ( -/obj/structure/machinery/landinglight/ds2, +/obj/structure/machinery/landinglight, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/lv522/landing_zone_2) @@ -16464,7 +16464,7 @@ /area/lv522/indoors/b_block/bridge) "haf" = ( /obj/effect/landmark/lv624/fog_blocker/short, -/obj/structure/machinery/landinglight/ds1/delaytwo, +/obj/structure/machinery/landinglight/delaytwo, /turf/open/floor/plating, /area/lv522/landing_zone_1) "hag" = ( @@ -20101,7 +20101,7 @@ /turf/open/floor/prison, /area/lv522/indoors/c_block/mining) "iqX" = ( -/obj/structure/machinery/landinglight/ds2{ +/obj/structure/machinery/landinglight{ dir = 1 }, /obj/effect/decal/cleanable/dirt, @@ -23411,7 +23411,7 @@ /turf/open/floor/prison, /area/lv522/indoors/a_block/admin) "jzZ" = ( -/obj/structure/machinery/landinglight/ds2/delaytwo{ +/obj/structure/machinery/landinglight/delaytwo{ dir = 1 }, /obj/effect/decal/cleanable/dirt, @@ -23868,7 +23868,7 @@ }, /area/lv522/indoors/a_block/medical) "jIk" = ( -/obj/structure/machinery/landinglight/ds1/delaythree{ +/obj/structure/machinery/landinglight/delaythree{ dir = 8 }, /turf/open/floor/plating, @@ -24566,7 +24566,7 @@ }, /area/lv522/atmos/east_reactor) "jVq" = ( -/obj/structure/machinery/landinglight/ds2/delaytwo{ +/obj/structure/machinery/landinglight/delaytwo{ dir = 4 }, /turf/open/floor/plating, @@ -24716,7 +24716,7 @@ }, /area/lv522/indoors/a_block/dorms) "jYr" = ( -/obj/structure/machinery/landinglight/ds2/delaythree{ +/obj/structure/machinery/landinglight/delaythree{ dir = 1 }, /turf/open/floor/plating, @@ -25008,7 +25008,7 @@ /turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/east_central_street) "kcR" = ( -/obj/structure/machinery/landinglight/ds2{ +/obj/structure/machinery/landinglight{ dir = 1 }, /turf/open/floor/plating, @@ -26684,7 +26684,7 @@ }, /area/lv522/indoors/a_block/medical) "kFB" = ( -/obj/structure/machinery/landinglight/ds2/delaytwo, +/obj/structure/machinery/landinglight/delaytwo, /turf/open/floor/plating, /area/lv522/landing_zone_2) "kFK" = ( @@ -33011,7 +33011,7 @@ /area/lv522/indoors/a_block/hallway) "naS" = ( /obj/effect/landmark/lv624/fog_blocker/short, -/obj/structure/machinery/landinglight/ds1/delaythree, +/obj/structure/machinery/landinglight/delaythree, /turf/open/floor/plating, /area/lv522/landing_zone_1) "naZ" = ( @@ -33362,7 +33362,7 @@ /area/lv522/atmos/filt) "nhi" = ( /obj/effect/landmark/lv624/fog_blocker/short, -/obj/structure/machinery/landinglight/ds1/delaytwo{ +/obj/structure/machinery/landinglight/delaytwo{ dir = 4 }, /turf/open/floor/plating, @@ -36655,7 +36655,7 @@ }, /area/lv522/indoors/a_block/admin) "orU" = ( -/obj/structure/machinery/landinglight/ds1/delayone{ +/obj/structure/machinery/landinglight/delayone{ dir = 1 }, /turf/open/floor/plating, @@ -36955,7 +36955,7 @@ }, /area/lv522/outdoors/colony_streets/north_east_street) "oyf" = ( -/obj/structure/machinery/landinglight/ds1/delaythree{ +/obj/structure/machinery/landinglight/delaythree{ dir = 4 }, /turf/open/floor/plating, @@ -38283,7 +38283,7 @@ /turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_east_street) "pab" = ( -/obj/structure/machinery/landinglight/ds2/delayone, +/obj/structure/machinery/landinglight/delayone, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/lv522/landing_zone_2) @@ -39301,7 +39301,7 @@ /area/lv522/outdoors/colony_streets/central_streets) "pvd" = ( /obj/effect/landmark/lv624/fog_blocker/short, -/obj/structure/machinery/landinglight/ds1/delayone{ +/obj/structure/machinery/landinglight/delayone{ dir = 4 }, /turf/open/floor/prison{ @@ -39382,7 +39382,7 @@ /area/lv522/landing_zone_1/tunnel) "pwH" = ( /obj/effect/landmark/lv624/fog_blocker/short, -/obj/structure/machinery/landinglight/ds1/delayone{ +/obj/structure/machinery/landinglight/delayone{ dir = 8 }, /turf/open/floor/prison{ @@ -41462,7 +41462,7 @@ /turf/open/floor/prison, /area/shuttle/drop1/lv522) "qle" = ( -/obj/structure/machinery/landinglight/ds2/delaytwo, +/obj/structure/machinery/landinglight/delaytwo, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/lv522/landing_zone_2) @@ -44336,7 +44336,7 @@ /turf/open/floor/carpet, /area/lv522/indoors/a_block/dorm_north) "res" = ( -/obj/structure/machinery/landinglight/ds2/delaythree{ +/obj/structure/machinery/landinglight/delaythree{ dir = 8 }, /turf/open/floor/plating, @@ -44492,7 +44492,7 @@ }, /area/lv522/outdoors/colony_streets/windbreaker/observation) "rhk" = ( -/obj/structure/machinery/landinglight/ds1/delayone{ +/obj/structure/machinery/landinglight/delayone{ dir = 4 }, /turf/open/floor/prison{ @@ -45703,7 +45703,7 @@ }, /area/lv522/outdoors/colony_streets/south_west_street) "rFT" = ( -/obj/structure/machinery/landinglight/ds2, +/obj/structure/machinery/landinglight, /turf/open/floor/plating, /area/lv522/landing_zone_2) "rGg" = ( @@ -47539,7 +47539,7 @@ /turf/closed/wall/strata_outpost, /area/lv522/landing_zone_2/ceiling) "sol" = ( -/obj/structure/machinery/landinglight/ds2/delayone, +/obj/structure/machinery/landinglight/delayone, /turf/open/floor/plating, /area/lv522/landing_zone_2) "sop" = ( @@ -47748,7 +47748,7 @@ }, /area/lv522/outdoors/colony_streets/north_west_street) "srS" = ( -/obj/structure/machinery/landinglight/ds2/delaythree{ +/obj/structure/machinery/landinglight/delaythree{ dir = 1 }, /obj/effect/decal/cleanable/dirt, @@ -48229,7 +48229,7 @@ /area/lv522/indoors/c_block/mining) "sCk" = ( /obj/effect/landmark/lv624/fog_blocker/short, -/obj/structure/machinery/landinglight/ds1{ +/obj/structure/machinery/landinglight{ dir = 8 }, /turf/open/floor/plating, @@ -49334,7 +49334,7 @@ /turf/open/floor/prison, /area/lv522/indoors/c_block/mining) "sTR" = ( -/obj/structure/machinery/landinglight/ds2/delaytwo{ +/obj/structure/machinery/landinglight/delaytwo{ dir = 8 }, /turf/open/floor/plating, @@ -50251,7 +50251,7 @@ }, /area/lv522/outdoors/colony_streets/south_east_street) "tns" = ( -/obj/structure/machinery/landinglight/ds1{ +/obj/structure/machinery/landinglight{ dir = 4 }, /turf/open/floor/plating, @@ -52445,7 +52445,7 @@ }, /area/lv522/indoors/a_block/fitness) "udA" = ( -/obj/structure/machinery/landinglight/ds2/delayone{ +/obj/structure/machinery/landinglight/delayone{ dir = 8 }, /turf/open/floor/plating, @@ -52623,7 +52623,7 @@ }, /area/lv522/indoors/a_block/corpo) "ufR" = ( -/obj/structure/machinery/landinglight/ds2/delayone{ +/obj/structure/machinery/landinglight/delayone{ dir = 4 }, /turf/open/floor/plating, @@ -53876,7 +53876,7 @@ }, /area/lv522/outdoors/colony_streets/north_east_street) "uEH" = ( -/obj/structure/machinery/landinglight/ds1/delayone{ +/obj/structure/machinery/landinglight/delayone{ dir = 8 }, /turf/open/floor/prison{ @@ -54316,7 +54316,7 @@ /area/lv522/indoors/a_block/bridges/corpo_fitness) "uLz" = ( /obj/effect/landmark/hunter_secondary, -/obj/structure/machinery/landinglight/ds1{ +/obj/structure/machinery/landinglight{ dir = 4 }, /turf/open/floor/plating, @@ -54759,7 +54759,7 @@ /turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_west_street) "uTd" = ( -/obj/structure/machinery/landinglight/ds1/delaytwo{ +/obj/structure/machinery/landinglight/delaytwo{ dir = 4 }, /turf/open/floor/plating, @@ -56806,7 +56806,7 @@ }, /area/lv522/indoors/b_block/hydro) "vER" = ( -/obj/structure/machinery/landinglight/ds1/delaytwo{ +/obj/structure/machinery/landinglight/delaytwo{ dir = 1 }, /turf/open/floor/prison{ @@ -57067,7 +57067,7 @@ }, /area/lv522/indoors/a_block/fitness) "vJj" = ( -/obj/structure/machinery/landinglight/ds1{ +/obj/structure/machinery/landinglight{ dir = 8 }, /turf/open/floor/plating, @@ -57088,7 +57088,7 @@ }, /area/lv522/outdoors/colony_streets/north_east_street) "vJr" = ( -/obj/structure/machinery/landinglight/ds2/delaythree, +/obj/structure/machinery/landinglight/delaythree, /turf/open/floor/plating, /area/lv522/landing_zone_2) "vJu" = ( @@ -57642,7 +57642,7 @@ }, /area/lv522/atmos/reactor_garage) "vTO" = ( -/obj/structure/machinery/landinglight/ds1{ +/obj/structure/machinery/landinglight{ dir = 1 }, /turf/open/floor/plating, @@ -59394,7 +59394,7 @@ }, /area/lv522/landing_zone_forecon/UD6_Tornado) "wBx" = ( -/obj/structure/machinery/landinglight/ds2/delayone{ +/obj/structure/machinery/landinglight/delayone{ dir = 1 }, /turf/open/floor/plating, @@ -61404,7 +61404,7 @@ /turf/open/floor/wood, /area/lv522/indoors/a_block/executive) "xsq" = ( -/obj/structure/machinery/landinglight/ds2{ +/obj/structure/machinery/landinglight{ dir = 8 }, /turf/open/floor/plating, @@ -61687,7 +61687,7 @@ }, /area/lv522/indoors/lone_buildings/outdoor_bot) "xyC" = ( -/obj/structure/machinery/landinglight/ds2/delaythree, +/obj/structure/machinery/landinglight/delaythree, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/lv522/landing_zone_2) @@ -62018,7 +62018,7 @@ }, /area/lv522/atmos/way_in_command_centre) "xEH" = ( -/obj/structure/machinery/landinglight/ds1{ +/obj/structure/machinery/landinglight{ dir = 1 }, /turf/open/floor/prison{ @@ -63467,7 +63467,7 @@ /turf/open/floor/plating, /area/lv522/indoors/b_block/hydro) "yfK" = ( -/obj/structure/machinery/landinglight/ds2/delaytwo{ +/obj/structure/machinery/landinglight/delaytwo{ dir = 1 }, /turf/open/floor/plating, diff --git a/maps/map_files/LV624/LV624.dmm b/maps/map_files/LV624/LV624.dmm index 9c84577bbbdd..a0e0d550ef37 100644 --- a/maps/map_files/LV624/LV624.dmm +++ b/maps/map_files/LV624/LV624.dmm @@ -5487,7 +5487,7 @@ /turf/open/floor/sandstone/runed, /area/lv624/ground/caves/sand_temple) "azZ" = ( -/obj/structure/machinery/landinglight/ds2{ +/obj/structure/machinery/landinglight{ dir = 4 }, /turf/open/floor/plating, @@ -5661,7 +5661,7 @@ /turf/open/floor/vault, /area/lv624/lazarus/quartstorage) "aAJ" = ( -/obj/structure/machinery/landinglight/ds2/delaytwo{ +/obj/structure/machinery/landinglight/delaytwo{ dir = 8 }, /turf/open/floor/plating, @@ -6138,7 +6138,7 @@ }, /area/lv624/lazarus/sleep_female) "aCh" = ( -/obj/structure/machinery/landinglight/ds2/delaytwo{ +/obj/structure/machinery/landinglight/delaytwo{ dir = 4 }, /turf/open/floor/plating, @@ -6574,19 +6574,19 @@ }, /area/lv624/lazarus/landing_zones/lz1) "aDI" = ( -/obj/structure/machinery/landinglight/ds1/delaytwo, +/obj/structure/machinery/landinglight/delaytwo, /turf/open/floor/plating, /area/lv624/lazarus/landing_zones/lz1) "aDJ" = ( -/obj/structure/machinery/landinglight/ds1/delayone, +/obj/structure/machinery/landinglight/delayone, /turf/open/floor/plating, /area/lv624/lazarus/landing_zones/lz1) "aDK" = ( -/obj/structure/machinery/landinglight/ds1, +/obj/structure/machinery/landinglight, /turf/open/floor/plating, /area/lv624/lazarus/landing_zones/lz1) "aDL" = ( -/obj/structure/machinery/landinglight/ds1/delaythree, +/obj/structure/machinery/landinglight/delaythree, /turf/open/floor/plating, /area/lv624/lazarus/landing_zones/lz1) "aDM" = ( @@ -6600,7 +6600,7 @@ /turf/open/gm/river, /area/lv624/ground/jungle/west_jungle) "aDO" = ( -/obj/structure/machinery/landinglight/ds2/delaythree{ +/obj/structure/machinery/landinglight/delaythree{ dir = 8 }, /turf/open/floor/plating, @@ -6689,13 +6689,13 @@ /turf/open/floor/vault, /area/lv624/lazarus/quartstorage) "aEj" = ( -/obj/structure/machinery/landinglight/ds1/delaythree{ +/obj/structure/machinery/landinglight/delaythree{ dir = 4 }, /turf/open/floor/plating, /area/lv624/lazarus/landing_zones/lz1) "aEl" = ( -/obj/structure/machinery/landinglight/ds1/delayone{ +/obj/structure/machinery/landinglight/delayone{ dir = 8 }, /turf/open/floor/plating, @@ -6726,7 +6726,7 @@ /turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "aEw" = ( -/obj/structure/machinery/landinglight/ds2{ +/obj/structure/machinery/landinglight{ dir = 1 }, /turf/open/floor/plating, @@ -7207,13 +7207,13 @@ /turf/open/floor/vault, /area/lv624/lazarus/quartstorage) "aFK" = ( -/obj/structure/machinery/landinglight/ds1{ +/obj/structure/machinery/landinglight{ dir = 4 }, /turf/open/floor/plating, /area/lv624/lazarus/landing_zones/lz1) "aFM" = ( -/obj/structure/machinery/landinglight/ds1{ +/obj/structure/machinery/landinglight{ dir = 8 }, /turf/open/floor/plating, @@ -7311,13 +7311,13 @@ }, /area/lv624/lazarus/landing_zones/lz1) "aGe" = ( -/obj/structure/machinery/landinglight/ds1/delayone{ +/obj/structure/machinery/landinglight/delayone{ dir = 4 }, /turf/open/floor/plating, /area/lv624/lazarus/landing_zones/lz1) "aGf" = ( -/obj/structure/machinery/landinglight/ds1/delaythree{ +/obj/structure/machinery/landinglight/delaythree{ dir = 8 }, /turf/open/floor/plating, @@ -7426,7 +7426,7 @@ /turf/open/floor, /area/lv624/lazarus/landing_zones/lz1) "aGB" = ( -/obj/structure/machinery/landinglight/ds1/delaytwo{ +/obj/structure/machinery/landinglight/delaytwo{ dir = 4 }, /turf/open/floor/plating, @@ -7436,7 +7436,7 @@ /turf/open/floor/plating, /area/lv624/lazarus/landing_zones/lz1) "aGE" = ( -/obj/structure/machinery/landinglight/ds1/delaytwo{ +/obj/structure/machinery/landinglight/delaytwo{ dir = 8 }, /turf/open/floor/plating, @@ -7524,7 +7524,7 @@ /turf/closed/wall, /area/lv624/lazarus/main_hall) "aGX" = ( -/obj/structure/machinery/landinglight/ds2/delayone{ +/obj/structure/machinery/landinglight/delayone{ dir = 8 }, /turf/open/floor/plating, @@ -8971,7 +8971,7 @@ /area/lv624/lazarus/canteen) "aNp" = ( /obj/effect/landmark/hunter_secondary, -/obj/structure/machinery/landinglight/ds1/delayone{ +/obj/structure/machinery/landinglight/delayone{ dir = 4 }, /turf/open/floor/plating, @@ -9943,7 +9943,7 @@ /turf/open/gm/grass/grass1, /area/lv624/lazarus/landing_zones/lz1) "aRu" = ( -/obj/structure/machinery/landinglight/ds2{ +/obj/structure/machinery/landinglight{ dir = 8 }, /turf/open/floor/plating, @@ -10118,25 +10118,25 @@ }, /area/lv624/lazarus/canteen) "aRZ" = ( -/obj/structure/machinery/landinglight/ds1/delaythree{ +/obj/structure/machinery/landinglight/delaythree{ dir = 1 }, /turf/open/floor/plating, /area/lv624/lazarus/landing_zones/lz1) "aSa" = ( -/obj/structure/machinery/landinglight/ds1{ +/obj/structure/machinery/landinglight{ dir = 1 }, /turf/open/floor/plating, /area/lv624/lazarus/landing_zones/lz1) "aSb" = ( -/obj/structure/machinery/landinglight/ds1/delayone{ +/obj/structure/machinery/landinglight/delayone{ dir = 1 }, /turf/open/floor/plating, /area/lv624/lazarus/landing_zones/lz1) "aSc" = ( -/obj/structure/machinery/landinglight/ds1/delaytwo{ +/obj/structure/machinery/landinglight/delaytwo{ dir = 1 }, /turf/open/floor/plating, @@ -10461,7 +10461,7 @@ }, /area/lv624/lazarus/engineering) "aTt" = ( -/obj/structure/machinery/landinglight/ds2/delaytwo, +/obj/structure/machinery/landinglight/delaytwo, /turf/open/floor/plating, /area/lv624/lazarus/landing_zones/lz2) "aTu" = ( @@ -10473,7 +10473,7 @@ }, /area/lv624/lazarus/engineering) "aTv" = ( -/obj/structure/machinery/landinglight/ds2, +/obj/structure/machinery/landinglight, /turf/open/floor/plating, /area/lv624/lazarus/landing_zones/lz2) "aTw" = ( @@ -12261,7 +12261,7 @@ /turf/open/gm/dirtgrassborder/north, /area/lv624/lazarus/landing_zones/lz2) "aZT" = ( -/obj/structure/machinery/landinglight/ds2/delaytwo{ +/obj/structure/machinery/landinglight/delaytwo{ dir = 1 }, /turf/open/floor/plating, @@ -12641,7 +12641,7 @@ /turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, /area/lv624/ground/river/east_river) "byK" = ( -/obj/structure/machinery/landinglight/ds2/delayone{ +/obj/structure/machinery/landinglight/delayone{ dir = 1 }, /turf/open/floor/plating, @@ -17055,7 +17055,7 @@ /turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, /area/lv624/ground/jungle/east_central_jungle) "kvE" = ( -/obj/structure/machinery/landinglight/ds2/delaythree, +/obj/structure/machinery/landinglight/delaythree, /turf/open/floor/plating, /area/lv624/lazarus/landing_zones/lz2) "kwG" = ( @@ -17308,7 +17308,7 @@ }, /area/lv624/lazarus/corporate_dome) "kWJ" = ( -/obj/structure/machinery/landinglight/ds2/delaythree{ +/obj/structure/machinery/landinglight/delaythree{ dir = 4 }, /turf/open/floor/plating, @@ -19046,7 +19046,7 @@ /turf/open/gm/coast/beachcorner/north_east, /area/lv624/ground/river/east_river) "odw" = ( -/obj/structure/machinery/landinglight/ds2/delaythree{ +/obj/structure/machinery/landinglight/delaythree{ dir = 1 }, /turf/open/floor/plating, @@ -19432,7 +19432,7 @@ }, /area/lv624/lazarus/landing_zones/lz2) "oOB" = ( -/obj/structure/machinery/landinglight/ds2/delayone, +/obj/structure/machinery/landinglight/delayone, /turf/open/floor/plating, /area/lv624/lazarus/landing_zones/lz2) "oOV" = ( @@ -20464,7 +20464,7 @@ /turf/open/gm/river, /area/lv624/ground/jungle/west_jungle) "qNQ" = ( -/obj/structure/machinery/landinglight/ds2/delayone{ +/obj/structure/machinery/landinglight/delayone{ dir = 4 }, /turf/open/floor/plating, diff --git a/maps/map_files/New_Varadero/New_Varadero.dmm b/maps/map_files/New_Varadero/New_Varadero.dmm index 656c4a7f48b1..edf6b4355ae8 100644 --- a/maps/map_files/New_Varadero/New_Varadero.dmm +++ b/maps/map_files/New_Varadero/New_Varadero.dmm @@ -238,7 +238,7 @@ }, /area/varadero/interior_protected/vessel) "ahK" = ( -/obj/structure/machinery/landinglight/ds2/delaytwo{ +/obj/structure/machinery/landinglight/delaytwo{ dir = 4 }, /turf/open/floor{ @@ -2269,7 +2269,7 @@ }, /area/varadero/interior/hall_NW) "bwP" = ( -/obj/structure/machinery/landinglight/ds2{ +/obj/structure/machinery/landinglight{ dir = 1 }, /turf/open/floor{ @@ -2788,7 +2788,7 @@ }, /area/varadero/interior/administration) "bNN" = ( -/obj/structure/machinery/landinglight/ds2/delayone{ +/obj/structure/machinery/landinglight/delayone{ dir = 4 }, /obj/item/prop/almayer/comp_open, @@ -3250,7 +3250,7 @@ /turf/open/floor/wood, /area/varadero/interior/court) "ccp" = ( -/obj/structure/machinery/landinglight/ds2/spoke{ +/obj/structure/machinery/landinglight/spoke{ pixel_x = -1; pixel_y = 22 }, @@ -3360,7 +3360,7 @@ /turf/open/gm/coast/north, /area/varadero/interior/caves/north_research) "cgA" = ( -/obj/structure/machinery/landinglight/ds2/delayone{ +/obj/structure/machinery/landinglight/delayone{ dir = 4 }, /obj/structure/machinery/floodlight/landing/floor{ @@ -4693,7 +4693,7 @@ }, /area/varadero/interior/hall_N) "cYr" = ( -/obj/structure/machinery/landinglight/ds2/delaytwo{ +/obj/structure/machinery/landinglight/delaytwo{ dir = 4 }, /obj/item/stack/cable_coil/cut, @@ -4727,7 +4727,7 @@ /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior/caves/north_research) "cYZ" = ( -/obj/structure/machinery/landinglight/ds2, +/obj/structure/machinery/landinglight, /turf/open/floor{ dir = 1; icon_state = "asteroidfloor" @@ -5510,7 +5510,7 @@ }, /area/varadero/interior_protected/maintenance/south) "dEJ" = ( -/obj/structure/machinery/landinglight/ds2/spoke{ +/obj/structure/machinery/landinglight/spoke{ pixel_x = -1; pixel_y = 22 }, @@ -6244,7 +6244,7 @@ /turf/closed/wall/rock/brown, /area/varadero/exterior/eastocean) "efU" = ( -/obj/structure/machinery/landinglight/ds2{ +/obj/structure/machinery/landinglight{ dir = 4 }, /turf/open/floor{ @@ -6767,7 +6767,7 @@ }, /area/varadero/exterior/monsoon) "evX" = ( -/obj/structure/machinery/landinglight/ds2/delaytwo{ +/obj/structure/machinery/landinglight/delaytwo{ dir = 1 }, /turf/open/floor{ @@ -9089,7 +9089,7 @@ }, /area/varadero/interior/caves/east) "fUF" = ( -/obj/structure/machinery/landinglight/ds2/delaythree{ +/obj/structure/machinery/landinglight/delaythree{ dir = 8 }, /turf/open/floor{ @@ -9247,7 +9247,7 @@ /turf/open/floor/wood, /area/varadero/interior/hall_SE) "fXH" = ( -/obj/structure/machinery/landinglight/ds2/delaythree, +/obj/structure/machinery/landinglight/delaythree, /turf/open/floor{ dir = 1; icon_state = "asteroidfloor" @@ -11701,7 +11701,7 @@ /turf/open/gm/dirt, /area/varadero/exterior/monsoon) "hEs" = ( -/obj/structure/machinery/landinglight/ds2{ +/obj/structure/machinery/landinglight{ dir = 1 }, /obj/effect/decal/cleanable/blood/gibs, @@ -12294,7 +12294,7 @@ /area/varadero/interior/comms1) "ias" = ( /obj/structure/machinery/camera/autoname/lz_camera, -/obj/structure/machinery/landinglight/ds1/spoke{ +/obj/structure/machinery/landinglight/spoke{ pixel_y = -5; pixel_x = 13 }, @@ -12850,7 +12850,7 @@ }, /area/varadero/interior/security) "irk" = ( -/obj/structure/machinery/landinglight/ds2/delayone, +/obj/structure/machinery/landinglight/delayone, /turf/open/floor{ dir = 1; icon_state = "asteroidfloor" @@ -14435,7 +14435,7 @@ /area/varadero/exterior/comms4) "jqd" = ( /obj/effect/decal/cleanable/blood/oil, -/obj/structure/machinery/landinglight/ds1/spoke{ +/obj/structure/machinery/landinglight/spoke{ pixel_y = -5; pixel_x = 13 }, @@ -14663,7 +14663,7 @@ }, /area/varadero/interior/maintenance) "jyq" = ( -/obj/structure/machinery/landinglight/ds2/delaytwo{ +/obj/structure/machinery/landinglight/delaytwo{ dir = 8 }, /turf/open/floor{ @@ -16081,7 +16081,7 @@ /turf/open/floor/shiva, /area/varadero/interior/technical_storage) "kvQ" = ( -/obj/structure/machinery/landinglight/ds2/delaythree{ +/obj/structure/machinery/landinglight/delaythree{ dir = 8 }, /obj/structure/machinery/floodlight/landing/floor{ @@ -16599,7 +16599,7 @@ }, /area/varadero/interior/cargo) "kMy" = ( -/obj/structure/machinery/landinglight/ds2/delaytwo{ +/obj/structure/machinery/landinglight/delaytwo{ dir = 1 }, /obj/effect/decal/cleanable/blood/oil, @@ -18932,7 +18932,7 @@ /turf/open/floor/plating, /area/varadero/interior/hall_NW) "miF" = ( -/obj/structure/machinery/landinglight/ds2/delayone{ +/obj/structure/machinery/landinglight/delayone{ dir = 1 }, /turf/open/floor{ @@ -21477,7 +21477,7 @@ /turf/open/floor/plating, /area/varadero/interior/cargo) "nQA" = ( -/obj/structure/machinery/landinglight/ds2/spoke{ +/obj/structure/machinery/landinglight/spoke{ pixel_x = -1; pixel_y = 22 }, @@ -21701,7 +21701,7 @@ }, /area/varadero/interior/records) "nXR" = ( -/obj/structure/machinery/landinglight/ds2{ +/obj/structure/machinery/landinglight{ dir = 8 }, /turf/open/floor{ @@ -22167,7 +22167,7 @@ /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior/maintenance/north) "onr" = ( -/obj/structure/machinery/landinglight/ds2/delayone{ +/obj/structure/machinery/landinglight/delayone{ dir = 4 }, /turf/open/floor{ @@ -24890,7 +24890,7 @@ }, /area/varadero/interior/hall_N) "pXT" = ( -/obj/structure/machinery/landinglight/ds1/spoke{ +/obj/structure/machinery/landinglight/spoke{ pixel_y = -5; pixel_x = 13 }, @@ -28829,7 +28829,7 @@ /area/varadero/interior/comms1) "ssv" = ( /obj/effect/landmark/hunter_secondary, -/obj/structure/machinery/landinglight/ds2/delaythree{ +/obj/structure/machinery/landinglight/delaythree{ dir = 4 }, /turf/open/floor{ @@ -29353,7 +29353,7 @@ /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior/maintenance/security) "sHV" = ( -/obj/structure/machinery/landinglight/ds2/delaytwo, +/obj/structure/machinery/landinglight/delaytwo, /turf/open/floor{ dir = 1; icon_state = "asteroidfloor" @@ -31370,7 +31370,7 @@ /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior_protected/caves/digsite) "uaV" = ( -/obj/structure/machinery/landinglight/ds2/delayone{ +/obj/structure/machinery/landinglight/delayone{ dir = 8 }, /turf/open/floor{ @@ -32194,7 +32194,7 @@ /area/varadero/exterior/monsoon) "uFE" = ( /obj/effect/decal/cleanable/blood/oil, -/obj/structure/machinery/landinglight/ds2/delaythree{ +/obj/structure/machinery/landinglight/delaythree{ dir = 4 }, /turf/open/floor{ @@ -32233,7 +32233,7 @@ }, /area/varadero/interior/maintenance/north) "uHD" = ( -/obj/structure/machinery/landinglight/ds1/spoke{ +/obj/structure/machinery/landinglight/spoke{ pixel_y = -5; pixel_x = -13 }, @@ -34076,7 +34076,7 @@ }, /area/varadero/interior/security) "vLV" = ( -/obj/structure/machinery/landinglight/ds2/spoke{ +/obj/structure/machinery/landinglight/spoke{ pixel_x = -1; pixel_y = 22 }, @@ -34739,7 +34739,7 @@ }, /area/varadero/interior/maintenance/north) "weJ" = ( -/obj/structure/machinery/landinglight/ds2/spoke{ +/obj/structure/machinery/landinglight/spoke{ pixel_x = -1; pixel_y = 22 }, @@ -36540,7 +36540,7 @@ /area/varadero/interior/technical_storage) "xpL" = ( /obj/structure/machinery/camera/autoname/lz_camera, -/obj/structure/machinery/landinglight/ds1/spoke{ +/obj/structure/machinery/landinglight/spoke{ pixel_y = -5; pixel_x = -13 }, @@ -36655,7 +36655,7 @@ }, /area/varadero/interior/security) "xsH" = ( -/obj/structure/machinery/landinglight/ds2/delaythree{ +/obj/structure/machinery/landinglight/delaythree{ dir = 1 }, /turf/open/floor{ @@ -37152,7 +37152,7 @@ }, /area/varadero/interior/cargo) "xJb" = ( -/obj/structure/machinery/landinglight/ds2/spoke{ +/obj/structure/machinery/landinglight/spoke{ pixel_x = -1; pixel_y = 22 }, @@ -37936,7 +37936,7 @@ }, /area/varadero/exterior/lz1_near) "ygZ" = ( -/obj/structure/machinery/landinglight/ds2/delaythree{ +/obj/structure/machinery/landinglight/delaythree{ dir = 4 }, /turf/open/floor{ diff --git a/maps/map_files/Sorokyne_Strata/Sorokyne_Strata.dmm b/maps/map_files/Sorokyne_Strata/Sorokyne_Strata.dmm index 84355a59b16d..47bd0a4de74f 100644 --- a/maps/map_files/Sorokyne_Strata/Sorokyne_Strata.dmm +++ b/maps/map_files/Sorokyne_Strata/Sorokyne_Strata.dmm @@ -5020,32 +5020,32 @@ /turf/open/auto_turf/snow/brown_base/layer1, /area/strata/ag/exterior/paths/cabin_area) "apf" = ( -/obj/structure/machinery/landinglight/ds1/delayone, +/obj/structure/machinery/landinglight/delayone, /turf/open/asphalt/cement{ icon_state = "cement12" }, /area/strata/ag/interior/landingzone_1) "aph" = ( -/obj/structure/machinery/landinglight/ds1, +/obj/structure/machinery/landinglight, /turf/open/asphalt/cement{ icon_state = "cement12" }, /area/strata/ag/interior/landingzone_1) "api" = ( /obj/effect/decal/cleanable/blood/oil, -/obj/structure/machinery/landinglight/ds1/delaythree, +/obj/structure/machinery/landinglight/delaythree, /turf/open/asphalt/cement{ icon_state = "cement12" }, /area/strata/ag/interior/landingzone_1) "apj" = ( -/obj/structure/machinery/landinglight/ds1/delaytwo, +/obj/structure/machinery/landinglight/delaytwo, /turf/open/asphalt/cement{ icon_state = "cement12" }, /area/strata/ag/interior/landingzone_1) "apk" = ( -/obj/structure/machinery/landinglight/ds1/delaythree, +/obj/structure/machinery/landinglight/delaythree, /turf/open/asphalt/cement{ icon_state = "cement12" }, @@ -5108,7 +5108,7 @@ }, /area/strata/ag/interior/research_decks/security) "apv" = ( -/obj/structure/machinery/landinglight/ds2/delayone{ +/obj/structure/machinery/landinglight/delayone{ dir = 4 }, /turf/open/asphalt/cement{ @@ -5936,7 +5936,7 @@ /turf/closed/wall/strata_outpost, /area/strata/ug/interior/jungle/deep/structures/res) "arR" = ( -/obj/structure/machinery/landinglight/ds1{ +/obj/structure/machinery/landinglight{ dir = 4 }, /turf/open/asphalt/cement{ @@ -5948,7 +5948,7 @@ /turf/open/floor/plating, /area/strata/ag/interior/landingzone_1) "arT" = ( -/obj/structure/machinery/landinglight/ds1{ +/obj/structure/machinery/landinglight{ dir = 8 }, /turf/open/asphalt/cement{ @@ -6502,7 +6502,7 @@ /turf/open/auto_turf/snow/brown_base/layer3, /area/strata/ag/exterior/paths/cabin_area) "atp" = ( -/obj/structure/machinery/landinglight/ds1/delayone{ +/obj/structure/machinery/landinglight/delayone{ dir = 4 }, /turf/open/asphalt/cement{ @@ -6511,7 +6511,7 @@ /area/strata/ag/interior/landingzone_1) "atq" = ( /obj/effect/decal/cleanable/blood/oil, -/obj/structure/machinery/landinglight/ds1/delaythree{ +/obj/structure/machinery/landinglight/delaythree{ dir = 8 }, /turf/open/asphalt/cement{ @@ -6773,7 +6773,7 @@ /turf/closed/wall/strata_outpost/reinforced, /area/strata/ag/interior/dorms/maintenance) "auj" = ( -/obj/structure/machinery/landinglight/ds1/delaytwo{ +/obj/structure/machinery/landinglight/delaytwo{ dir = 4 }, /turf/open/asphalt/cement{ @@ -6781,7 +6781,7 @@ }, /area/strata/ag/interior/landingzone_1) "auk" = ( -/obj/structure/machinery/landinglight/ds1/delaytwo{ +/obj/structure/machinery/landinglight/delaytwo{ dir = 8 }, /turf/open/asphalt/cement{ @@ -8125,7 +8125,7 @@ }, /area/strata/ag/interior/landingzone_1) "ayh" = ( -/obj/structure/machinery/landinglight/ds2/delaythree{ +/obj/structure/machinery/landinglight/delaythree{ dir = 1 }, /turf/open/asphalt/cement{ @@ -14201,7 +14201,7 @@ /turf/closed/wall/strata_outpost/reinforced/hull, /area/strata/ag/interior/outpost/canteen/bar) "aRx" = ( -/obj/structure/machinery/landinglight/ds1/delayone{ +/obj/structure/machinery/landinglight/delayone{ dir = 1 }, /turf/open/asphalt/cement{ @@ -14216,7 +14216,7 @@ /area/strata/ag/exterior/paths/adminext) "aRz" = ( /obj/effect/decal/cleanable/blood/oil, -/obj/structure/machinery/landinglight/ds1/delayone{ +/obj/structure/machinery/landinglight/delayone{ dir = 1 }, /turf/open/asphalt/cement{ @@ -14649,7 +14649,7 @@ /area/strata/ag/interior/dorms/south) "aSX" = ( /obj/effect/decal/cleanable/blood/oil, -/obj/structure/machinery/landinglight/ds2{ +/obj/structure/machinery/landinglight{ dir = 1 }, /turf/open/asphalt/cement{ @@ -18252,7 +18252,7 @@ /turf/open/auto_turf/snow/brown_base/layer0, /area/strata/ag/interior/outpost/engi/drome) "bgk" = ( -/obj/structure/machinery/landinglight/ds2/delaythree{ +/obj/structure/machinery/landinglight/delaythree{ dir = 4 }, /obj/structure/machinery/floodlight/landing, @@ -29012,7 +29012,7 @@ }, /area/strata/ag/interior/administration) "crW" = ( -/obj/structure/machinery/landinglight/ds1/delaytwo{ +/obj/structure/machinery/landinglight/delaytwo{ dir = 1 }, /turf/open/asphalt/cement{ @@ -29551,7 +29551,7 @@ }, /area/strata/ag/interior/landingzone_checkpoint) "cwQ" = ( -/obj/structure/machinery/landinglight/ds1/delayone{ +/obj/structure/machinery/landinglight/delayone{ dir = 8 }, /turf/open/asphalt/cement{ @@ -29934,7 +29934,7 @@ }, /area/strata/ag/interior/dorms/hive) "cZH" = ( -/obj/structure/machinery/landinglight/ds1/delaythree{ +/obj/structure/machinery/landinglight/delaythree{ dir = 8 }, /turf/open/asphalt/cement{ @@ -30083,7 +30083,7 @@ }, /area/strata/ug/interior/outpost/jung/dorms/sec1) "dnS" = ( -/obj/structure/machinery/landinglight/ds1{ +/obj/structure/machinery/landinglight{ dir = 1 }, /turf/open/asphalt/cement{ @@ -30743,7 +30743,7 @@ }, /area/strata/ag/exterior/tcomms/tcomms_deck) "eBo" = ( -/obj/structure/machinery/landinglight/ds2/delaytwo, +/obj/structure/machinery/landinglight/delaytwo, /turf/open/asphalt/cement{ icon_state = "cement12" }, @@ -31279,7 +31279,7 @@ }, /area/strata/ag/interior/dorms/flight_control) "fuA" = ( -/obj/structure/machinery/landinglight/ds1/delaythree{ +/obj/structure/machinery/landinglight/delaythree{ dir = 1 }, /turf/open/asphalt/cement{ @@ -32551,7 +32551,7 @@ /turf/open/auto_turf/strata_grass/layer1, /area/strata/ug/interior/jungle/platform/east/scrub) "hue" = ( -/obj/structure/machinery/landinglight/ds2{ +/obj/structure/machinery/landinglight{ dir = 8 }, /turf/open/asphalt/cement{ @@ -32593,7 +32593,7 @@ /turf/open/auto_turf/strata_grass/layer0_mud, /area/strata/ug/interior/jungle/deep/east_engi) "hzb" = ( -/obj/structure/machinery/landinglight/ds2/delaythree{ +/obj/structure/machinery/landinglight/delaythree{ dir = 8 }, /turf/open/asphalt/cement{ @@ -33085,7 +33085,7 @@ /turf/open/auto_turf/ice/layer1, /area/strata/ag/exterior/paths/north_outpost) "iwp" = ( -/obj/structure/machinery/landinglight/ds2/delaythree{ +/obj/structure/machinery/landinglight/delaythree{ dir = 4 }, /turf/open/asphalt/cement{ @@ -33910,7 +33910,7 @@ }, /area/strata/ug/interior/jungle/deep/structures/engi) "jPQ" = ( -/obj/structure/machinery/landinglight/ds2{ +/obj/structure/machinery/landinglight{ dir = 4 }, /turf/open/asphalt/cement{ @@ -34934,7 +34934,7 @@ /turf/open/gm/river, /area/strata/ag/interior/tcomms) "lEo" = ( -/obj/structure/machinery/landinglight/ds2, +/obj/structure/machinery/landinglight, /turf/open/asphalt/cement{ icon_state = "cement12" }, @@ -36280,7 +36280,7 @@ }, /area/strata/ag/interior/outpost/med) "nTf" = ( -/obj/structure/machinery/landinglight/ds2/delaytwo{ +/obj/structure/machinery/landinglight/delaytwo{ dir = 4 }, /turf/open/asphalt/cement{ @@ -36387,7 +36387,7 @@ }, /area/strata/ag/interior/tcomms) "odB" = ( -/obj/structure/machinery/landinglight/ds2/delayone, +/obj/structure/machinery/landinglight/delayone, /turf/open/asphalt/cement{ icon_state = "cement12" }, @@ -37580,7 +37580,7 @@ /turf/open/auto_turf/strata_grass/layer1, /area/strata/ug/interior/jungle/deep/south_dorms) "qbk" = ( -/obj/structure/machinery/landinglight/ds2/delaytwo{ +/obj/structure/machinery/landinglight/delaytwo{ dir = 1 }, /turf/open/asphalt/cement{ @@ -37597,7 +37597,7 @@ /turf/closed/wall/strata_outpost/reinforced/hull, /area/strata/ug/interior/outpost/jung/dorms/sec2) "qbU" = ( -/obj/structure/machinery/landinglight/ds2/delaytwo{ +/obj/structure/machinery/landinglight/delaytwo{ dir = 8 }, /turf/open/asphalt/cement{ @@ -38301,7 +38301,7 @@ }, /area/strata/ag/interior/dorms/maintenance) "rhk" = ( -/obj/structure/machinery/landinglight/ds1/delaythree{ +/obj/structure/machinery/landinglight/delaythree{ dir = 4 }, /turf/open/asphalt/cement{ @@ -38858,7 +38858,7 @@ /area/strata/ag/interior/outpost/engi/drome) "skJ" = ( /obj/effect/decal/cleanable/blood/oil, -/obj/structure/machinery/landinglight/ds2{ +/obj/structure/machinery/landinglight{ dir = 4 }, /turf/open/asphalt/cement{ @@ -39030,7 +39030,7 @@ }, /area/strata/ug/interior/jungle/deep/structures/res) "sBg" = ( -/obj/structure/machinery/landinglight/ds2/delaythree, +/obj/structure/machinery/landinglight/delaythree, /turf/open/asphalt/cement{ icon_state = "cement12" }, @@ -39079,7 +39079,7 @@ /turf/open/gm/dirt, /area/strata/ug/exterior/jungle/deep/carplake_center) "sFB" = ( -/obj/structure/machinery/landinglight/ds2{ +/obj/structure/machinery/landinglight{ dir = 1 }, /turf/open/asphalt/cement{ @@ -40853,7 +40853,7 @@ }, /area/strata/ag/interior/outpost/med) "vsp" = ( -/obj/structure/machinery/landinglight/ds2/delayone{ +/obj/structure/machinery/landinglight/delayone{ dir = 8 }, /turf/open/asphalt/cement{ @@ -42113,7 +42113,7 @@ /area/strata/ug/interior/jungle/deep/west_engi) "xGE" = ( /obj/effect/decal/cleanable/blood/oil, -/obj/structure/machinery/landinglight/ds2/delaythree, +/obj/structure/machinery/landinglight/delaythree, /turf/open/asphalt/cement{ icon_state = "cement12" }, @@ -42434,7 +42434,7 @@ /turf/open/floor/strata, /area/strata/ag/exterior/research_decks) "yee" = ( -/obj/structure/machinery/landinglight/ds2/delayone{ +/obj/structure/machinery/landinglight/delayone{ dir = 1 }, /turf/open/asphalt/cement{ diff --git a/maps/map_files/USS_Almayer/USS_Almayer.dmm b/maps/map_files/USS_Almayer/USS_Almayer.dmm index d940706c547c..c6fb666b5319 100644 --- a/maps/map_files/USS_Almayer/USS_Almayer.dmm +++ b/maps/map_files/USS_Almayer/USS_Almayer.dmm @@ -3883,7 +3883,7 @@ /area/almayer/hallways/stern_hallway) "anS" = ( /obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/machinery/landinglight/ds2/delayone{ +/obj/structure/machinery/landinglight/delayone{ dir = 8 }, /turf/open/floor/almayer{ @@ -3959,7 +3959,7 @@ /area/almayer/medical/morgue) "aof" = ( /obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/machinery/landinglight/ds1/delayone{ +/obj/structure/machinery/landinglight/delayone{ dir = 4 }, /turf/open/floor/almayer{ @@ -3967,7 +3967,7 @@ }, /area/almayer/hallways/hangar) "aog" = ( -/obj/structure/machinery/landinglight/ds2/delayone{ +/obj/structure/machinery/landinglight/delayone{ dir = 8 }, /obj/structure/pipes/standard/simple/hidden/supply{ @@ -4193,7 +4193,7 @@ }, /area/almayer/medical/medical_science) "aoN" = ( -/obj/structure/machinery/landinglight/ds1/delayone{ +/obj/structure/machinery/landinglight/delayone{ dir = 4 }, /obj/structure/pipes/standard/simple/hidden/supply{ @@ -10626,6 +10626,9 @@ }, /area/almayer/shipboard/starboard_point_defense) "aKU" = ( +/obj/structure/machinery/landinglight{ + dir = 4 + }, /obj/structure/machinery/light/small{ dir = 8 }, @@ -10638,6 +10641,9 @@ /obj/structure/machinery/light/small{ dir = 4 }, +/obj/structure/machinery/landinglight/delaythree{ + dir = 8 + }, /turf/open/floor/almayer{ dir = 5; icon_state = "plating" @@ -13169,6 +13175,9 @@ pixel_x = 8; pixel_y = -32 }, +/obj/structure/machinery/landinglight/delaytwo{ + dir = 1 + }, /turf/open/floor/almayer{ dir = 5; icon_state = "plating" @@ -13551,49 +13560,55 @@ }, /area/almayer/medical/lower_medical_medbay) "aZO" = ( -/obj/structure/machinery/landinglight/ds2/delaytwo, +/obj/structure/machinery/landinglight/delayone{ + dir = 8 + }, /turf/open/floor/almayer{ - icon_state = "plate" + dir = 5; + icon_state = "plating" }, -/area/almayer/hallways/hangar) +/area/almayer/shipboard/starboard_point_defense) "aZP" = ( -/obj/structure/machinery/landinglight/ds2/delayone, +/obj/structure/machinery/landinglight/delayone{ + dir = 1 + }, /turf/open/floor/almayer{ - icon_state = "plate" + dir = 5; + icon_state = "plating" }, -/area/almayer/hallways/hangar) +/area/almayer/shipboard/port_point_defense) "aZQ" = ( -/obj/structure/machinery/landinglight/ds2, -/turf/open/floor/almayer{ - icon_state = "plate" +/obj/structure/machinery/landinglight{ + dir = 8 }, -/area/almayer/hallways/hangar) -"aZR" = ( -/obj/structure/machinery/landinglight/ds2/delaythree, /turf/open/floor/almayer{ - icon_state = "plate" + dir = 5; + icon_state = "plating" }, -/area/almayer/hallways/hangar) +/area/almayer/shipboard/port_point_defense) +"aZR" = ( +/turf/open/floor/plating, +/area/almayer/hull/lower_hull/l_a_p) "aZV" = ( -/obj/structure/machinery/landinglight/ds1/delaytwo, +/obj/structure/machinery/landinglight/delaytwo, /turf/open/floor/almayer{ icon_state = "plate" }, /area/almayer/hallways/hangar) "aZW" = ( -/obj/structure/machinery/landinglight/ds1/delayone, +/obj/structure/machinery/landinglight/delayone, /turf/open/floor/almayer{ icon_state = "plate" }, /area/almayer/hallways/hangar) "aZX" = ( -/obj/structure/machinery/landinglight/ds1, +/obj/structure/machinery/landinglight, /turf/open/floor/almayer{ icon_state = "plate" }, /area/almayer/hallways/hangar) "aZY" = ( -/obj/structure/machinery/landinglight/ds1/delaythree, +/obj/structure/machinery/landinglight/delaythree, /turf/open/floor/almayer{ icon_state = "plate" }, @@ -13712,24 +13727,23 @@ /turf/open/floor/almayer, /area/almayer/hallways/hangar) "baH" = ( -/obj/structure/machinery/landinglight/ds2/delaythree{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hallways/hangar) +/turf/open/floor/plating, +/area/almayer/hull/lower_hull/l_a_s) "baI" = ( /turf/open/floor/plating, /area/almayer/hallways/hangar) "baM" = ( -/obj/structure/machinery/landinglight/ds2/delaythree{ +/obj/structure/machinery/landinglight/delaythree{ + dir = 4 + }, +/obj/structure/machinery/light/small{ dir = 8 }, /turf/open/floor/almayer{ - icon_state = "plate" + dir = 5; + icon_state = "plating" }, -/area/almayer/hallways/hangar) +/area/almayer/shipboard/starboard_point_defense) "baN" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ @@ -13741,7 +13755,7 @@ /turf/open/floor/almayer, /area/almayer/hallways/hangar) "baS" = ( -/obj/structure/machinery/landinglight/ds1/delaythree{ +/obj/structure/machinery/landinglight/delaythree{ dir = 4 }, /turf/open/floor/almayer{ @@ -13749,7 +13763,7 @@ }, /area/almayer/hallways/hangar) "baX" = ( -/obj/structure/machinery/landinglight/ds1/delaythree{ +/obj/structure/machinery/landinglight/delaythree{ dir = 8 }, /turf/open/floor/almayer{ @@ -13905,6 +13919,9 @@ /obj/effect/decal/warning_stripes{ icon_state = "SE-out" }, +/obj/structure/machinery/landinglight{ + dir = 1 + }, /turf/open/floor/almayer{ dir = 5; icon_state = "plating" @@ -13914,6 +13931,9 @@ /obj/effect/decal/warning_stripes{ icon_state = "S" }, +/obj/structure/machinery/landinglight/delaythree{ + dir = 1 + }, /turf/open/floor/almayer{ dir = 5; icon_state = "plating" @@ -13923,6 +13943,9 @@ /obj/effect/decal/warning_stripes{ icon_state = "SW-out" }, +/obj/structure/machinery/landinglight/delaytwo{ + dir = 1 + }, /turf/open/floor/almayer{ dir = 5; icon_state = "plating" @@ -14038,7 +14061,7 @@ /obj/effect/decal/warning_stripes{ icon_state = "S" }, -/obj/structure/machinery/landinglight/ds2{ +/obj/structure/machinery/landinglight{ dir = 4 }, /turf/open/floor/almayer{ @@ -14071,7 +14094,7 @@ icon_state = "S" }, /obj/structure/prop/almayer/hangar_stencil, -/obj/structure/machinery/landinglight/ds1/delaytwo{ +/obj/structure/machinery/landinglight/delaytwo{ dir = 8 }, /turf/open/floor/almayer{ @@ -14362,21 +14385,23 @@ }, /area/almayer/hallways/hangar) "bdO" = ( -/obj/structure/machinery/landinglight/ds2/delayone{ - dir = 4 +/obj/structure/machinery/landinglight/delayone{ + dir = 1 }, /turf/open/floor/almayer{ - icon_state = "plate" + dir = 5; + icon_state = "plating" }, -/area/almayer/hallways/hangar) +/area/almayer/hull/lower_hull/l_a_p) "bdU" = ( -/obj/structure/machinery/landinglight/ds2/delayone{ +/obj/structure/machinery/landinglight{ dir = 8 }, /turf/open/floor/almayer{ - icon_state = "plate" + dir = 5; + icon_state = "plating" }, -/area/almayer/hallways/hangar) +/area/almayer/hull/lower_hull/l_a_p) "bdV" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 4 @@ -14394,7 +14419,7 @@ }, /area/almayer/stair_clone) "bea" = ( -/obj/structure/machinery/landinglight/ds1/delayone{ +/obj/structure/machinery/landinglight/delayone{ dir = 4 }, /turf/open/floor/almayer{ @@ -14402,7 +14427,7 @@ }, /area/almayer/hallways/hangar) "beg" = ( -/obj/structure/machinery/landinglight/ds1/delayone{ +/obj/structure/machinery/landinglight/delayone{ dir = 8 }, /turf/open/floor/almayer{ @@ -14772,7 +14797,7 @@ /turf/open/floor/almayer, /area/almayer/hallways/hangar) "bfL" = ( -/obj/structure/machinery/landinglight/ds2/delaytwo{ +/obj/structure/machinery/landinglight/delaytwo{ dir = 4 }, /turf/open/floor/almayer{ @@ -14787,26 +14812,26 @@ /turf/open/floor/almayer, /area/almayer/hull/upper_hull/u_f_p) "bfV" = ( -/obj/structure/machinery/landinglight/ds2{ - dir = 8 - }, +/obj/structure/machinery/landinglight/delaytwo, /turf/open/floor/almayer{ - icon_state = "plate" + dir = 5; + icon_state = "plating" }, -/area/almayer/hallways/hangar) +/area/almayer/hull/lower_hull/l_a_s) "bfY" = ( /obj/structure/surface/table/almayer, /obj/item/prop/almayer/comp_open, /turf/open/floor/almayer, /area/almayer/hallways/hangar) "bfZ" = ( -/obj/structure/machinery/landinglight/ds1/delaytwo{ - dir = 4 +/obj/structure/machinery/landinglight/delaytwo{ + dir = 8 }, /turf/open/floor/almayer{ - icon_state = "plate" + dir = 5; + icon_state = "plating" }, -/area/almayer/hallways/hangar) +/area/almayer/shipboard/port_point_defense) "bga" = ( /turf/open/floor/almayer{ icon_state = "redcorner" @@ -14820,7 +14845,7 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_f_p) "bgj" = ( -/obj/structure/machinery/landinglight/ds1{ +/obj/structure/machinery/landinglight{ dir = 8 }, /turf/open/floor/almayer{ @@ -15124,6 +15149,7 @@ /obj/structure/machinery/light/small{ dir = 1 }, +/obj/structure/machinery/landinglight/delaythree, /turf/open/floor/almayer{ dir = 5; icon_state = "plating" @@ -15323,10 +15349,7 @@ /area/almayer/shipboard/brig/processing) "bjy" = ( /obj/docking_port/stationary/emergency_response/port3, -/turf/open/floor/almayer{ - dir = 5; - icon_state = "plating" - }, +/turf/open/floor/plating, /area/almayer/hull/lower_hull/l_a_p) "bjA" = ( /turf/open/floor/almayer{ @@ -15409,15 +15432,16 @@ /turf/open/floor/almayer, /area/almayer/hallways/hangar) "bjS" = ( -/obj/structure/machinery/landinglight/ds2{ - dir = 4 +/obj/structure/machinery/landinglight{ + dir = 8 }, /turf/open/floor/almayer{ - icon_state = "plate" + dir = 5; + icon_state = "plating" }, -/area/almayer/hallways/hangar) +/area/almayer/hull/lower_hull/l_a_s) "bkd" = ( -/obj/structure/machinery/landinglight/ds2/delaytwo{ +/obj/structure/machinery/landinglight/delaytwo{ dir = 8 }, /turf/open/floor/almayer{ @@ -15431,7 +15455,7 @@ }, /area/almayer/squads/alpha) "bkh" = ( -/obj/structure/machinery/landinglight/ds1{ +/obj/structure/machinery/landinglight{ dir = 4 }, /turf/open/floor/almayer{ @@ -15439,13 +15463,14 @@ }, /area/almayer/hallways/hangar) "bks" = ( -/obj/structure/machinery/landinglight/ds1/delaytwo{ +/obj/structure/machinery/landinglight/delaytwo{ dir = 8 }, /turf/open/floor/almayer{ - icon_state = "plate" + dir = 5; + icon_state = "plating" }, -/area/almayer/hallways/hangar) +/area/almayer/hull/lower_hull/l_a_s) "bkt" = ( /obj/structure/pipes/standard/simple/visible{ dir = 4 @@ -16002,6 +16027,9 @@ /obj/structure/machinery/light/small{ dir = 4 }, +/obj/structure/machinery/landinglight/delayone{ + dir = 8 + }, /turf/open/floor/almayer{ dir = 5; icon_state = "plating" @@ -19028,6 +19056,9 @@ /area/almayer/hull/lower_hull/l_m_s) "bCR" = ( /obj/structure/machinery/light/small, +/obj/structure/machinery/landinglight/delaythree{ + dir = 1 + }, /turf/open/floor/almayer{ dir = 5; icon_state = "plating" @@ -19413,7 +19444,7 @@ icon_state = "N"; pixel_y = 1 }, -/obj/structure/machinery/landinglight/ds2/delaytwo{ +/obj/structure/machinery/landinglight/delaytwo{ dir = 4 }, /turf/open/floor/almayer{ @@ -19425,7 +19456,7 @@ icon_state = "N"; pixel_y = 1 }, -/obj/structure/machinery/landinglight/ds2{ +/obj/structure/machinery/landinglight{ dir = 8 }, /obj/structure/platform_decoration{ @@ -19481,7 +19512,7 @@ icon_state = "N"; pixel_y = 1 }, -/obj/structure/machinery/landinglight/ds1/delaytwo{ +/obj/structure/machinery/landinglight/delaytwo{ dir = 4 }, /obj/structure/platform_decoration{ @@ -19496,7 +19527,7 @@ icon_state = "N"; pixel_y = 1 }, -/obj/structure/machinery/landinglight/ds1{ +/obj/structure/machinery/landinglight{ dir = 8 }, /turf/open/floor/almayer{ @@ -19868,15 +19899,16 @@ }, /area/almayer/squads/req) "bGF" = ( -/obj/structure/machinery/landinglight/ds2{ - dir = 1 +/obj/structure/machinery/landinglight{ + dir = 4 }, /turf/open/floor/almayer{ - icon_state = "plate" + dir = 5; + icon_state = "plating" }, -/area/almayer/hallways/hangar) +/area/almayer/shipboard/starboard_point_defense) "bGG" = ( -/obj/structure/machinery/landinglight/ds2/delayone{ +/obj/structure/machinery/landinglight/delayone{ dir = 1 }, /turf/open/floor/almayer{ @@ -19884,7 +19916,7 @@ }, /area/almayer/hallways/hangar) "bGH" = ( -/obj/structure/machinery/landinglight/ds2/delaytwo{ +/obj/structure/machinery/landinglight/delaytwo{ dir = 1 }, /turf/open/floor/almayer{ @@ -19892,13 +19924,8 @@ }, /area/almayer/hallways/hangar) "bGI" = ( -/obj/structure/machinery/landinglight/ds2/delaythree{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hallways/hangar) +/turf/open/floor/plating, +/area/almayer/shipboard/port_point_defense) "bGJ" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -19934,7 +19961,7 @@ }, /area/almayer/hallways/hangar) "bGM" = ( -/obj/structure/machinery/landinglight/ds1{ +/obj/structure/machinery/landinglight{ dir = 1 }, /turf/open/floor/almayer{ @@ -19942,23 +19969,19 @@ }, /area/almayer/hallways/hangar) "bGN" = ( -/obj/structure/machinery/landinglight/ds1/delayone{ - dir = 1 +/obj/structure/machinery/landinglight/delaythree{ + dir = 4 }, /turf/open/floor/almayer{ - icon_state = "plate" + dir = 5; + icon_state = "plating" }, -/area/almayer/hallways/hangar) +/area/almayer/shipboard/port_point_defense) "bGO" = ( -/obj/structure/machinery/landinglight/ds1/delaytwo{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hallways/hangar) +/turf/open/floor/plating, +/area/almayer/shipboard/starboard_point_defense) "bGP" = ( -/obj/structure/machinery/landinglight/ds1/delaythree{ +/obj/structure/machinery/landinglight/delaythree{ dir = 1 }, /turf/open/floor/almayer{ @@ -20949,6 +20972,9 @@ /obj/effect/decal/warning_stripes{ icon_state = "SW-out" }, +/obj/structure/machinery/landinglight{ + dir = 4 + }, /turf/open/floor/almayer{ dir = 5; icon_state = "plating" @@ -21427,6 +21453,9 @@ /obj/effect/decal/warning_stripes{ icon_state = "W" }, +/obj/structure/machinery/landinglight/delayone{ + dir = 4 + }, /turf/open/floor/almayer{ dir = 5; icon_state = "plating" @@ -21805,6 +21834,9 @@ /obj/effect/decal/warning_stripes{ icon_state = "W" }, +/obj/structure/machinery/landinglight/delayone{ + dir = 4 + }, /turf/open/floor/almayer{ dir = 5; icon_state = "plating" @@ -23322,6 +23354,9 @@ /obj/effect/decal/warning_stripes{ icon_state = "NW-out" }, +/obj/structure/machinery/landinglight/delaytwo{ + dir = 4 + }, /turf/open/floor/almayer{ dir = 5; icon_state = "plating" @@ -23543,6 +23578,9 @@ /obj/structure/machinery/light/small{ dir = 8 }, +/obj/structure/machinery/landinglight/delaythree{ + dir = 4 + }, /turf/open/floor/almayer{ dir = 5; icon_state = "plating" @@ -23550,15 +23588,15 @@ /area/almayer/shipboard/port_point_defense) "bWo" = ( /obj/docking_port/stationary/emergency_response/port2, -/turf/open/floor/almayer{ - dir = 5; - icon_state = "plating" - }, +/turf/open/floor/plating, /area/almayer/shipboard/port_point_defense) "bWp" = ( /obj/structure/machinery/light/small{ dir = 4 }, +/obj/structure/machinery/landinglight/delaythree{ + dir = 8 + }, /turf/open/floor/almayer{ dir = 5; icon_state = "plating" @@ -26775,6 +26813,7 @@ icon_state = "NE-out"; pixel_y = 1 }, +/obj/structure/machinery/landinglight/delaytwo, /turf/open/floor/almayer{ dir = 5; icon_state = "plating" @@ -26785,6 +26824,7 @@ icon_state = "N"; pixel_y = 1 }, +/obj/structure/machinery/landinglight, /turf/open/floor/almayer{ dir = 5; icon_state = "plating" @@ -26795,6 +26835,7 @@ icon_state = "NW-out"; pixel_y = 1 }, +/obj/structure/machinery/landinglight, /turf/open/floor/almayer{ dir = 5; icon_state = "plating" @@ -28195,6 +28236,9 @@ pixel_x = -17; pixel_y = -8 }, +/obj/structure/machinery/landinglight/delaythree{ + dir = 4 + }, /turf/open/floor/almayer{ dir = 5; icon_state = "plating" @@ -28574,6 +28618,15 @@ icon_state = "cargo" }, /area/almayer/hull/lower_hull/l_f_s) +"cQM" = ( +/obj/structure/machinery/landinglight/delaytwo{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/shipboard/port_point_defense) "cQN" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -31283,6 +31336,9 @@ pixel_x = -17; pixel_y = 7 }, +/obj/structure/machinery/landinglight{ + dir = 4 + }, /turf/open/floor/almayer{ dir = 5; icon_state = "plating" @@ -33208,6 +33264,15 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/lower_medical_medbay) +"eCn" = ( +/obj/structure/machinery/landinglight{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/shipboard/port_point_defense) "eCo" = ( /obj/structure/platform{ dir = 1 @@ -36534,6 +36599,18 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_a_p) +"gaz" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/structure/machinery/landinglight/delayone{ + dir = 1 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/shipboard/starboard_point_defense) "gaJ" = ( /turf/closed/wall/almayer, /area/almayer/shipboard/brig/cryo) @@ -37324,6 +37401,9 @@ /obj/structure/machinery/light/small{ dir = 4 }, +/obj/structure/machinery/landinglight/delayone{ + dir = 8 + }, /turf/open/floor/almayer{ dir = 5; icon_state = "plating" @@ -37736,7 +37816,7 @@ }, /area/almayer/engineering/ce_room) "gzn" = ( -/obj/structure/machinery/landinglight/ds2/delaytwo{ +/obj/structure/machinery/landinglight/delaytwo{ dir = 8 }, /obj/structure/platform_decoration, @@ -38573,6 +38653,13 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/medical/medical_science) +"gQK" = ( +/obj/structure/machinery/landinglight, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/hull/lower_hull/l_a_s) "gQO" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 6 @@ -38859,6 +38946,9 @@ /obj/structure/sign/safety/nonpress_0g{ pixel_x = 32 }, +/obj/structure/machinery/landinglight/delaythree{ + dir = 8 + }, /turf/open/floor/almayer{ dir = 5; icon_state = "plating" @@ -39922,6 +40012,17 @@ icon_state = "greenfull" }, /area/almayer/living/offices) +"htS" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/structure/machinery/landinglight/delaythree, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/shipboard/port_point_defense) "huK" = ( /turf/open/floor/almayer{ icon_state = "redcorner" @@ -40509,6 +40610,15 @@ /obj/structure/closet/secure_closet/guncabinet/red/mp_armory_m39_submachinegun, /turf/open/floor/plating/almayer, /area/almayer/shipboard/brig/armory) +"hGt" = ( +/obj/structure/machinery/landinglight/delaythree{ + dir = 1 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/shipboard/port_point_defense) "hGD" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -40820,6 +40930,15 @@ icon_state = "test_floor4" }, /area/almayer/shipboard/brig/main_office) +"hNK" = ( +/obj/structure/machinery/landinglight/delaythree{ + dir = 8 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/shipboard/starboard_point_defense) "hNM" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/stack/sheet/metal{ @@ -41230,6 +41349,19 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_a_p) +"hWe" = ( +/obj/structure/sign/safety/nonpress_0g{ + pixel_x = 8; + pixel_y = -32 + }, +/obj/structure/machinery/landinglight{ + dir = 1 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/hull/lower_hull/l_a_p) "hWq" = ( /obj/structure/platform{ layer = 3.1 @@ -42465,6 +42597,15 @@ icon_state = "red" }, /area/almayer/shipboard/weapon_room) +"iuD" = ( +/obj/structure/machinery/landinglight{ + dir = 8 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/shipboard/starboard_point_defense) "iuE" = ( /obj/structure/machinery/vending/coffee, /obj/structure/machinery/light{ @@ -43024,7 +43165,7 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_m_p) "iGQ" = ( -/obj/structure/machinery/landinglight/ds2/delayone{ +/obj/structure/machinery/landinglight/delayone{ dir = 8 }, /obj/structure/platform{ @@ -43116,6 +43257,15 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_f_s) +"iJl" = ( +/obj/structure/machinery/landinglight/delaythree{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/hull/lower_hull/l_a_s) "iJB" = ( /obj/structure/sign/safety/galley{ pixel_x = 8; @@ -43266,6 +43416,15 @@ "iMm" = ( /turf/open/floor/almayer, /area/almayer/living/grunt_rnr) +"iMo" = ( +/obj/structure/machinery/landinglight/delaythree{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/shipboard/starboard_point_defense) "iMr" = ( /obj/structure/machinery/cryopod/right, /turf/open/floor/almayer{ @@ -43833,6 +43992,17 @@ /obj/item/paper/almayer_storage, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_a_p) +"iYq" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/structure/machinery/landinglight/delayone, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/shipboard/port_point_defense) "iYr" = ( /obj/structure/machinery/light{ dir = 4 @@ -44027,6 +44197,9 @@ /obj/structure/sign/safety/nonpress_0g{ pixel_x = 32 }, +/obj/structure/machinery/landinglight/delaythree{ + dir = 8 + }, /turf/open/floor/almayer{ dir = 5; icon_state = "plating" @@ -45656,6 +45829,17 @@ icon_state = "cargo_arrow" }, /area/almayer/squads/charlie) +"jLm" = ( +/obj/structure/sign/safety/nonpress_0g{ + pixel_x = 8; + pixel_y = 32 + }, +/obj/structure/machinery/landinglight/delaytwo, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/hull/lower_hull/l_a_s) "jLs" = ( /obj/structure/machinery/vending/cola, /turf/open/floor/prison{ @@ -47050,6 +47234,9 @@ /obj/effect/decal/warning_stripes{ icon_state = "W" }, +/obj/structure/machinery/landinglight{ + dir = 4 + }, /turf/open/floor/almayer{ dir = 5; icon_state = "plating" @@ -47957,6 +48144,18 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering/starboard) +"kIe" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/obj/structure/machinery/landinglight/delaytwo{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/hull/lower_hull/l_a_s) "kIm" = ( /obj/structure/pipes/vents/pump{ dir = 4 @@ -48240,6 +48439,15 @@ }, /turf/open/floor/wood/ship, /area/almayer/living/basketball) +"kNT" = ( +/obj/structure/machinery/landinglight/delayone{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/shipboard/port_point_defense) "kNY" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/plating/plating_catwalk, @@ -52419,7 +52627,7 @@ }, /area/almayer/medical/lower_medical_medbay) "mwQ" = ( -/obj/structure/machinery/landinglight/ds1/delayone{ +/obj/structure/machinery/landinglight/delayone{ dir = 4 }, /obj/structure/platform{ @@ -52841,6 +53049,15 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/port_hallway) +"mHn" = ( +/obj/structure/machinery/landinglight/delaythree{ + dir = 8 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/shipboard/port_point_defense) "mHo" = ( /obj/structure/machinery/washing_machine, /obj/structure/machinery/washing_machine{ @@ -54650,6 +54867,15 @@ icon_state = "red" }, /area/almayer/lifeboat_pumps/south1) +"nqR" = ( +/obj/structure/machinery/landinglight/delaytwo{ + dir = 1 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/shipboard/port_point_defense) "nqU" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_f_p) @@ -55448,6 +55674,15 @@ icon_state = "plate" }, /area/almayer/shipboard/port_point_defense) +"nGU" = ( +/obj/structure/machinery/landinglight/delayone{ + dir = 8 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/shipboard/port_point_defense) "nHg" = ( /obj/structure/machinery/disposal, /obj/structure/disposalpipe/trunk{ @@ -56629,7 +56864,7 @@ }, /area/almayer/lifeboat_pumps/north1) "ohE" = ( -/obj/structure/machinery/landinglight/ds1/delayone{ +/obj/structure/machinery/landinglight/delayone{ dir = 4 }, /obj/structure/bed/chair{ @@ -56846,6 +57081,13 @@ icon_state = "test_floor4" }, /area/almayer/shipboard/brig/execution) +"okW" = ( +/obj/structure/machinery/landinglight/delayone, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/hull/lower_hull/l_a_s) "olk" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -57315,6 +57557,9 @@ pixel_x = -17; pixel_y = -7 }, +/obj/structure/machinery/landinglight/delaytwo{ + dir = 4 + }, /turf/open/floor/almayer{ dir = 5; icon_state = "plating" @@ -58273,6 +58518,15 @@ icon_state = "plate" }, /area/almayer/command/lifeboat) +"oOW" = ( +/obj/structure/machinery/landinglight{ + dir = 1 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/hull/lower_hull/l_a_p) "oPf" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 8 @@ -59231,6 +59485,15 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/starboard_hallway) +"pnw" = ( +/obj/structure/machinery/landinglight/delayone{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/shipboard/starboard_point_defense) "pnC" = ( /obj/structure/machinery/cm_vending/sorted/medical/blood, /turf/open/floor/almayer{ @@ -59456,6 +59719,15 @@ "ptK" = ( /turf/closed/wall/almayer, /area/almayer/engineering/upper_engineering/starboard) +"pui" = ( +/obj/structure/machinery/landinglight/delaytwo{ + dir = 8 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/shipboard/starboard_point_defense) "pun" = ( /obj/structure/window/framed/almayer/hull, /turf/open/floor/plating, @@ -59723,10 +59995,7 @@ /area/almayer/shipboard/brig/main_office) "pzG" = ( /obj/docking_port/stationary/emergency_response/port1, -/turf/open/floor/almayer{ - dir = 5; - icon_state = "plating" - }, +/turf/open/floor/plating, /area/almayer/shipboard/starboard_point_defense) "pzJ" = ( /obj/structure/pipes/standard/simple/hidden/supply, @@ -59838,6 +60107,9 @@ pixel_x = 15; pixel_y = -32 }, +/obj/structure/machinery/landinglight{ + dir = 1 + }, /turf/open/floor/almayer{ dir = 5; icon_state = "plating" @@ -60876,6 +61148,15 @@ icon_state = "blue" }, /area/almayer/living/pilotbunks) +"pXg" = ( +/obj/structure/machinery/landinglight/delaytwo{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/shipboard/starboard_point_defense) "pXj" = ( /obj/structure/closet/radiation, /turf/open/floor/almayer{ @@ -61180,6 +61461,15 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/starboard_hallway) +"qcs" = ( +/obj/structure/machinery/landinglight/delaythree{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/hull/lower_hull/l_a_p) "qcy" = ( /obj/structure/sign/safety/bathunisex{ pixel_x = 8; @@ -62039,6 +62329,7 @@ pixel_x = 8; pixel_y = 32 }, +/obj/structure/machinery/landinglight, /turf/open/floor/almayer{ dir = 5; icon_state = "plating" @@ -62394,6 +62685,7 @@ /obj/structure/sign/safety/press_area_ag{ pixel_y = 32 }, +/obj/structure/machinery/landinglight/delaytwo, /turf/open/floor/almayer{ dir = 5; icon_state = "plating" @@ -63307,7 +63599,7 @@ }, /area/almayer/hull/lower_hull/l_f_p) "qUL" = ( -/obj/structure/machinery/landinglight/ds1/delaythree{ +/obj/structure/machinery/landinglight/delaythree{ dir = 4 }, /obj/structure/bed/chair{ @@ -64947,6 +65239,15 @@ icon_state = "red" }, /area/almayer/shipboard/brig/processing) +"rCN" = ( +/obj/structure/machinery/landinglight/delaytwo{ + dir = 1 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/hull/lower_hull/l_a_p) "rCO" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/plating/plating_catwalk, @@ -68268,6 +68569,18 @@ icon_state = "plate" }, /area/almayer/squads/charlie) +"sZu" = ( +/obj/structure/machinery/light/small{ + dir = 4 + }, +/obj/structure/machinery/landinglight/delaytwo{ + dir = 8 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/shipboard/starboard_point_defense) "sZy" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -69522,7 +69835,7 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/port_hallway) "txO" = ( -/obj/structure/machinery/landinglight/ds1{ +/obj/structure/machinery/landinglight{ dir = 4 }, /obj/structure/platform_decoration{ @@ -70777,6 +71090,9 @@ /obj/effect/decal/warning_stripes{ icon_state = "W" }, +/obj/structure/machinery/landinglight/delayone{ + dir = 4 + }, /turf/open/floor/almayer{ dir = 5; icon_state = "plating" @@ -71982,6 +72298,9 @@ pixel_x = -17; pixel_y = -8 }, +/obj/structure/machinery/landinglight/delaythree{ + dir = 4 + }, /turf/open/floor/almayer{ dir = 5; icon_state = "plating" @@ -73344,6 +73663,15 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer, /area/almayer/command/lifeboat) +"uYZ" = ( +/obj/structure/machinery/landinglight/delaytwo{ + dir = 8 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/hull/lower_hull/l_a_p) "uZo" = ( /obj/structure/bed/stool, /obj/structure/pipes/standard/simple/hidden/supply{ @@ -73406,7 +73734,7 @@ }, /area/almayer/engineering/upper_engineering/port) "vbf" = ( -/obj/structure/machinery/landinglight/ds2/delaytwo{ +/obj/structure/machinery/landinglight/delaytwo{ dir = 8 }, /obj/structure/bed/chair{ @@ -73493,6 +73821,15 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer, /area/almayer/hull/upper_hull/u_f_p) +"vcM" = ( +/obj/structure/machinery/landinglight{ + dir = 1 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/shipboard/port_point_defense) "vdJ" = ( /obj/structure/surface/table/almayer, /obj/item/pipe{ @@ -76016,7 +76353,7 @@ /turf/open/floor/almayer, /area/almayer/squads/charlie_delta_shared) "vWJ" = ( -/obj/structure/machinery/landinglight/ds1/delaytwo{ +/obj/structure/machinery/landinglight/delaytwo{ dir = 4 }, /obj/structure/bed/chair{ @@ -78712,6 +79049,18 @@ /obj/effect/landmark/late_join/delta, /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/delta) +"wXe" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/structure/machinery/landinglight/delaytwo{ + dir = 1 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/shipboard/starboard_point_defense) "wXh" = ( /obj/structure/machinery/floodlight/landing{ name = "bolted floodlight" @@ -81647,7 +81996,7 @@ /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/south2) "yeN" = ( -/obj/structure/machinery/landinglight/ds2/delaythree{ +/obj/structure/machinery/landinglight/delaythree{ dir = 8 }, /obj/structure/bed/chair{ @@ -99228,27 +99577,27 @@ kVX xyw bHB sXB -baH +baS bcd -bdO +bea bfL -baH -bjS -bdO +baS +bkh +bea bfL -baH -bjS -bdO +baS +bkh +bea bfL -baH -bjS -bdO +baS +bkh +bea bfL -baH -bjS -bdO +baS +bkh +bea bEA -baH +baS fVz bHB bBN @@ -99430,7 +99779,7 @@ kdt kVX xyw bHB -aZO +aZV baI baI baI @@ -99452,7 +99801,7 @@ baI baI baI baI -bGF +bGM bHB aYt bcm @@ -99633,7 +99982,7 @@ hdR hJz hmy bHB -aZP +aZW baI baI baI @@ -99836,7 +100185,7 @@ mGL rII xyw bHB -aZQ +aZX baI baI baI @@ -100039,7 +100388,7 @@ pXQ kYa xyw bHB -aZR +aZY baI baI baI @@ -100061,7 +100410,7 @@ baI baI baI baI -bGI +bGP bHB xyw bcm @@ -100242,7 +100591,7 @@ uNL uNL xyw bHB -aZO +aZV baI baI baI @@ -100264,7 +100613,7 @@ baI baI baI baI -bGF +bGM bHB eEc mzo @@ -100445,7 +100794,7 @@ jFh uNL wlb bHB -aZP +aZW baI baI baI @@ -100648,7 +100997,7 @@ mGL mBb wqh bHB -aZQ +aZX baI baI baI @@ -100851,7 +101200,7 @@ cQF uNL pyC bHB -aZR +aZY baI baI baI @@ -100873,7 +101222,7 @@ baI baI baI baI -bGI +bGP bHB kwQ meN @@ -101054,7 +101403,7 @@ uNL uNL cCE bHB -aZO +aZV baI baI baI @@ -101076,7 +101425,7 @@ baI baI baI baI -bGF +bGM bHB iAw mzo @@ -101257,7 +101606,7 @@ vdJ bJo amo bHB -aZP +aZW baI baI baI @@ -101460,7 +101809,7 @@ sgw bJo gRP bHB -aZQ +aZX baI baI baI @@ -101666,17 +102015,17 @@ rgy bvf anS aog -bdU -bfV -baM +beg +bgj +baX bkd -bdU -bfV -baM +beg +bgj +baX bkd -bdU -bfV -baM +beg +bgj +baX vbf vbf vbf @@ -101684,7 +102033,7 @@ yeN gzn iGQ bED -baM +baX bcb bHB aYt @@ -103697,15 +104046,15 @@ bvf aof aoN bea -bfZ +bfL baS bkh bea -bfZ +bfL baS bkh bea -bfZ +bfL baS bkh ohE @@ -104121,7 +104470,7 @@ baI baI baI baI -bGN +bGG bHB xAY gHZ @@ -104324,7 +104673,7 @@ baI baI baI baI -bGO +bGH bHB xAY gHZ @@ -104933,7 +105282,7 @@ baI baI baI baI -bGN +bGG bHB btO cdA @@ -105136,7 +105485,7 @@ baI baI baI baI -bGO +bGH bHB aYt cdA @@ -105745,7 +106094,7 @@ baI baI baI baI -bGN +bGG bHB btO cdA @@ -105948,7 +106297,7 @@ baI baI baI baI -bGO +bGH bHB uAb bcm @@ -106135,19 +106484,19 @@ bcw beg bgj baX -bks +bkd beg bgj baX -bks +bkd beg bgj baX -bks +bkd beg bgj baX -bks +bkd beg bEN baX @@ -110156,19 +110505,19 @@ aaa aab aaa aKR -aKS -aKS -aKS -aKS -aKS -aKU -aKS -aKS -aKS -aKS -aKS -aKS +iMo +bGF +pnw +pXg +iMo aKU +pnw +pXg +iMo +bGF +pnw +pXg +baM aKS aLL iIY @@ -110233,17 +110582,17 @@ tVB bSf bWe bWn -bWe -bWe -bWe -bWe -bWe -bWe -bWe +eCn +kNT +cQM +bGN +eCn +kNT +cQM bWn -bWe -bWe -bWe +eCn +kNT +cQM bWn bWe bVU @@ -110359,18 +110708,18 @@ aaa aab aaa aKR -aKS -aKS -aKS -aKS -aKS -aKS -aKS -aKS -aKS -aKS -aKS -aKS +bGO +bGO +bGO +bGO +bGO +bGO +bGO +bGO +bGO +bGO +bGO +bGO pzG bby aLL @@ -110435,20 +110784,20 @@ ued bSf bSf cml -bWe -bWe -bWe -bWe -bWe -bWe -bWe -bWe -bWe -bWe -bWe -bWe +bGI +bGI +bGI +bGI +bGI +bGI +bGI +bGI +bGI +bGI +bGI +bGI bWo -bWe +vcM bVU aaa aab @@ -110562,20 +110911,20 @@ aaa aab aaa aKR -aKS -aKS -aKS -aKS -aKS -aKS -aKS -aKS -aKS -aKS -aKS -aKS -aKS -bbz +bGO +bGO +bGO +bGO +bGO +bGO +bGO +bGO +bGO +bGO +bGO +bGO +bGO +gaz aLL etF bbS @@ -110637,21 +110986,21 @@ bSf weC tZc bSf -cmm -bWe -bWe -bWe -bWe -bWe -bWe -bWe -bWe -bWe -bWe -bWe -bWe -bWe -bWe +iYq +bGI +bGI +bGI +bGI +bGI +bGI +bGI +bGI +bGI +bGI +bGI +bGI +bGI +aZP bVU aaa aab @@ -110765,20 +111114,20 @@ aaa aab aaa aKR -aKS -aKS -aKS -aKS -aKS -aKS -aKS -aKS -aKS -aKS -aKS -aKS -aKS -bbz +bGO +bGO +bGO +bGO +bGO +bGO +bGO +bGO +bGO +bGO +bGO +bGO +bGO +wXe aLL fXz bbS @@ -110841,20 +111190,20 @@ cpk bVd bSf cmm -bWe -bWe -bWe -bWe -bWe -bWe -bWe -bWe -bWe -bWe -bWe -bWe -bWe -bWe +bGI +bGI +bGI +bGI +bGI +bGI +bGI +bGI +bGI +bGI +bGI +bGI +bGI +nqR bVU aaa aab @@ -110968,19 +111317,19 @@ aaa aab aaa aKR -aKS -aKS -aKS -aKS -aKS -aKS -aKS -aKS -aKS -aKS -aKS -aKS -aKS +bGO +bGO +bGO +bGO +bGO +bGO +bGO +bGO +bGO +bGO +bGO +bGO +bGO bbz bdy bbS @@ -111043,21 +111392,21 @@ xoJ weC cls bWc -cmm -bWe -bWe -bWe -bWe -bWe -bWe -bWe -bWe -bWe -bWe -bWe -bWe -bWe -bWe +htS +bGI +bGI +bGI +bGI +bGI +bGI +bGI +bGI +bGI +bGI +bGI +bGI +bGI +hGt bVU aaa aab @@ -111171,19 +111520,19 @@ aaa aab aaa aKR -aKS -aKS -aKS -aKS -aKS -aKS -aKS -aKS -aKS -aKS -aKS -aKS -aKS +bGO +bGO +bGO +bGO +bGO +bGO +bGO +bGO +bGO +bGO +bGO +bGO +bGO pDo aLL aON @@ -111247,20 +111596,20 @@ weC rfI bSf qzc -bWe -bWe -bWe -bWe -bWe -bWe -bWe -bWe -bWe -bWe -bWe -bWe -bWe -bWe +bGI +bGI +bGI +bGI +bGI +bGI +bGI +bGI +bGI +bGI +bGI +bGI +bGI +vcM bVU aaa aab @@ -111374,20 +111723,20 @@ aaa aab aaa aKR -aKS -aKS -aKS -aKS -aKS -aKS -aKS -aKS -aKS -aKS -aKS -aKS -aKS -bbz +bGO +bGO +bGO +bGO +bGO +bGO +bGO +bGO +bGO +bGO +bGO +bGO +bGO +gaz aLL etF bbS @@ -111449,21 +111798,21 @@ bSf fvN tZc bSf -cmm -bWe -bWe -bWe -bWe -bWe -bWe -bWe -bWe -bWe -bWe -bWe -bWe -bWe -bWe +iYq +bGI +bGI +bGI +bGI +bGI +bGI +bGI +bGI +bGI +bGI +bGI +bGI +bGI +aZP bVU aaa aab @@ -111577,19 +111926,19 @@ aaa aab aaa aKR -aKS -aKS -aKS -aKS -aKS -aKS -aKS -aKS -aKS -aKS -aKS -aKS -aKS +bGO +bGO +bGO +bGO +bGO +bGO +bGO +bGO +bGO +bGO +bGO +bGO +bGO bbA aLL aLL @@ -111653,20 +112002,20 @@ ued bSf bSf cmn -bWe -bWe -bWe -bWe -bWe -bWe -bWe -bWe -bWe -bWe -bWe -bWe -bWe -bWe +bGI +bGI +bGI +bGI +bGI +bGI +bGI +bGI +bGI +bGI +bGI +bGI +bGI +nqR bVU aaa aab @@ -111780,18 +112129,18 @@ aaa aab aaa aKR -aKS -aKS -aKS -aKS -aKS -aKV -aKS -aKS -aKS -aKS -aKS -aKS +hNK +pui +aZO +iuD +hNK +sZu +aZO +iuD +hNK +pui +aZO +iuD aKV aKS aLL @@ -111857,17 +112206,17 @@ tVB bSf bWe bWp -bWe -bWe -bWe -bWe -bWe -bWe -bWe +bfZ +nGU +aZQ +mHn +bfZ +nGU +aZQ bWp -bWe -bWe -bWe +bfZ +nGU +aZQ bWp bWe bVU @@ -138614,10 +138963,10 @@ aah wVb wVb bdo -bdo +iJl bLg bMX -bOo +kIe uvG dSs bOo @@ -138626,7 +138975,7 @@ cII koT tZF bUZ -ovn +qcs ovn vTK vTK @@ -138816,21 +139165,21 @@ aaa aaa aaa wVb -qsF -bdo -bdo -bdo -bdo -bdo -bdo -bdo -ovn -ovn -ovn -ovn -ovn +jLm +baH +baH +baH +baH +baH +baH +baH +aZR +aZR +aZR +aZR +aZR bjy -aXQ +hWe vTK aaa aaa @@ -139019,21 +139368,21 @@ aaa aaa aaa wVb -bdo -bdo -bdo -bdo -bdo -bdo -bdo -bdo -ovn -ovn -ovn -ovn -ovn -ovn -ovn +okW +baH +baH +baH +baH +baH +baH +baH +aZR +aZR +aZR +aZR +aZR +aZR +bdO vTK aaa aaa @@ -139222,21 +139571,21 @@ aaa aaa aaa wVb -bdo -bdo -bdo -bdo -bdo -bdo -bdo -bdo -ovn -ovn -ovn -ovn -ovn -ovn -ovn +gQK +baH +baH +baH +baH +baH +baH +baH +aZR +aZR +aZR +aZR +aZR +aZR +rCN vTK aaa aaa @@ -139426,19 +139775,19 @@ aaa aaa wVb bhD -bdo -bdo -bdo -bdo -bdo -bdo -bdo -ovn -ovn -ovn -ovn -ovn -ovn +baH +baH +baH +baH +baH +baH +baH +aZR +aZR +aZR +aZR +aZR +aZR bCR vTK aaa @@ -139628,21 +139977,21 @@ aaa aaa aaa wVb -bdo -bdo -bdo -bdo -bdo -bdo -bdo -bdo -ovn -ovn -ovn -ovn -ovn -ovn -ovn +bfV +baH +baH +baH +baH +baH +baH +baH +aZR +aZR +aZR +aZR +aZR +aZR +oOW vTK aaa aaa @@ -139831,21 +140180,21 @@ aaa aaa aaa wVb -bdo -bdo -bdo -bdo -bdo -bdo -bdo -bdo -ovn -ovn -ovn -ovn -ovn -ovn -ovn +okW +baH +baH +baH +baH +baH +baH +baH +aZR +aZR +aZR +aZR +aZR +aZR +bdO vTK aaa aaa @@ -140035,19 +140384,19 @@ aaa aaa wVb qsF -bdo -bdo -bdo -bdo -bdo -bdo -bdo -ovn -ovn -ovn -ovn -ovn -ovn +baH +baH +baH +baH +baH +baH +baH +aZR +aZR +aZR +aZR +aZR +aZR aXQ vTK aaa @@ -140239,17 +140588,17 @@ aaa wVb bdo jbB -bdo +bks bne -bdo +bjS jbB -bdo +bks bne -ovn +bdU gXv -ovn +uYZ grX -ovn +bdU gXv ovn vTK From 3974aa32bb99c34d1105a553ca8642478ade66e7 Mon Sep 17 00:00:00 2001 From: forest2001 Date: Tue, 12 Dec 2023 01:27:37 +0000 Subject: [PATCH 2/9] idfk --- code/modules/shuttle/shuttle.dm | 2 +- code/modules/shuttle/shuttles/ert.dm | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm index 5459723d2b6a..47b8a0997258 100644 --- a/code/modules/shuttle/shuttle.dm +++ b/code/modules/shuttle/shuttle.dm @@ -742,7 +742,7 @@ set_mode(SHUTTLE_PREARRIVAL) setTimer(prearrivalTime) log_debug("WARNING: shuttle on approach failed check!") - return + //return on_prearrival() var/error = initiate_docking(destination, preferred_direction) if(error && error & (DOCKING_NULL_DESTINATION | DOCKING_NULL_SOURCE)) diff --git a/code/modules/shuttle/shuttles/ert.dm b/code/modules/shuttle/shuttles/ert.dm index 1760caf3d87c..de4e43542972 100644 --- a/code/modules/shuttle/shuttles/ert.dm +++ b/code/modules/shuttle/shuttles/ert.dm @@ -14,6 +14,7 @@ /obj/docking_port/mobile/emergency_response name = "ERT Shuttle" ignitionTime = DROPSHIP_WARMUP_TIME + prearrivalTime = DROPSHIP_WARMUP_TIME area_type = /area/shuttle/ert width = 7 height = 13 From df076841346f1e015e80c720b54ea7eded8cfedf Mon Sep 17 00:00:00 2001 From: forest2001 Date: Fri, 15 Dec 2023 22:51:08 +0000 Subject: [PATCH 3/9] conflict --- maps/map_files/USS_Almayer/USS_Almayer.dmm | 134 +++++++++++++++++---- 1 file changed, 111 insertions(+), 23 deletions(-) diff --git a/maps/map_files/USS_Almayer/USS_Almayer.dmm b/maps/map_files/USS_Almayer/USS_Almayer.dmm index a7043f9c7c01..4faf6acd1013 100644 --- a/maps/map_files/USS_Almayer/USS_Almayer.dmm +++ b/maps/map_files/USS_Almayer/USS_Almayer.dmm @@ -28643,6 +28643,15 @@ icon_state = "cargo" }, /area/almayer/shipboard/port_missiles) +"cRB" = ( +/obj/structure/machinery/landinglight/delaytwo{ + dir = 1 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/hull/lower_hull/l_a_p) "cRK" = ( /obj/structure/desertdam/decals/road_edge{ pixel_x = 16 @@ -31855,6 +31864,15 @@ icon_state = "kitchen" }, /area/almayer/living/grunt_rnr) +"efo" = ( +/obj/structure/machinery/landinglight/delaytwo{ + dir = 1 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/shipboard/port_point_defense) "efK" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -39183,6 +39201,15 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_f_p) +"hiV" = ( +/obj/structure/machinery/landinglight/delayone{ + dir = 8 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/shipboard/port_point_defense) "hji" = ( /obj/structure/bed/chair{ dir = 4 @@ -40688,6 +40715,15 @@ icon_state = "cargo_arrow" }, /area/almayer/squads/charlie_delta_shared) +"hQj" = ( +/obj/structure/machinery/landinglight/delayone{ + dir = 1 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/shipboard/starboard_point_defense) "hQU" = ( /obj/structure/machinery/disposal, /obj/structure/disposalpipe/trunk{ @@ -44939,6 +44975,15 @@ }, /turf/open/floor/plating, /area/almayer/living/bridgebunks) +"jxH" = ( +/obj/structure/machinery/landinglight/delaythree{ + dir = 1 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/shipboard/port_point_defense) "jxP" = ( /obj/effect/decal/warning_stripes{ icon_state = "W"; @@ -52332,6 +52377,15 @@ icon_state = "plate" }, /area/almayer/squads/alpha) +"muL" = ( +/obj/structure/machinery/landinglight/delayone{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/shipboard/starboard_point_defense) "muV" = ( /obj/structure/surface/table/woodentable/fancy, /obj/structure/machinery/faxmachine/uscm/command/capt{ @@ -67230,6 +67284,15 @@ icon_state = "silver" }, /area/almayer/command/cichallway) +"syw" = ( +/obj/structure/machinery/landinglight/delaythree{ + dir = 8 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/shipboard/starboard_point_defense) "syH" = ( /obj/structure/machinery/firealarm{ pixel_y = -28 @@ -70853,6 +70916,15 @@ icon_state = "test_floor4" }, /area/almayer/squads/req) +"tXG" = ( +/obj/structure/machinery/landinglight{ + dir = 1 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/shipboard/port_point_defense) "tXM" = ( /obj/structure/pipes/vents/pump{ dir = 8 @@ -73308,6 +73380,15 @@ dir = 8 }, /area/almayer/medical/containment/cell) +"uXr" = ( +/obj/structure/machinery/landinglight/delayone{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/shipboard/port_point_defense) "uXu" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -80836,6 +80917,13 @@ dir = 6 }, /area/almayer/command/cic) +"xMC" = ( +/obj/structure/machinery/landinglight/delayone, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/hull/lower_hull/l_a_s) "xML" = ( /obj/structure/machinery/computer/cameras/wooden_tv/prop{ pixel_x = -4; @@ -110285,15 +110373,15 @@ aaa aKR iMo bGF -pnw +muL pXg iMo aKU -pnw +muL pXg iMo bGF -pnw +muL pXg baM aKS @@ -110361,15 +110449,15 @@ bSf bWe bWn eCn -kNT +uXr cQM bGN eCn -kNT +uXr cQM bWn eCn -kNT +uXr cQM bWn bWe @@ -110575,7 +110663,7 @@ bGI bGI bGI bWo -vcM +tXG bVU aaa aab @@ -110702,7 +110790,7 @@ bGO bGO bGO bGO -gaz +hQj aLL etF bbS @@ -110981,7 +111069,7 @@ bGI bGI bGI bGI -nqR +efo bVU aaa aab @@ -111184,7 +111272,7 @@ bGI bGI bGI bGI -hGt +jxH bVU aaa aab @@ -111387,7 +111475,7 @@ bGI bGI bGI bGI -vcM +tXG bVU aaa aab @@ -111514,7 +111602,7 @@ bGO bGO bGO bGO -gaz +hQj aLL etF bbS @@ -111793,7 +111881,7 @@ bGI bGI bGI bGI -nqR +efo bVU aaa aab @@ -111907,15 +111995,15 @@ aaa aab aaa aKR -hNK +syw pui aZO iuD -hNK -sZu +syw +pui aZO iuD -hNK +syw pui aZO iuD @@ -111985,15 +112073,15 @@ bSf bWe bWp bfZ -nGU +hiV aZQ mHn bfZ -nGU +hiV aZQ bWp bfZ -nGU +hiV aZQ bWp bWe @@ -139146,7 +139234,7 @@ aaa aaa aaa wVb -okW +xMC baH baH baH @@ -139363,7 +139451,7 @@ aZR aZR aZR aZR -rCN +cRB vTK aaa aaa @@ -139958,7 +140046,7 @@ aaa aaa aaa wVb -okW +xMC baH baH baH From 49cce98db89e332fb180ac0a4f2e2d676fddcb5a Mon Sep 17 00:00:00 2001 From: forest2001 Date: Sat, 16 Dec 2023 00:37:42 +0000 Subject: [PATCH 4/9] codersprites --- code/modules/power/lighting.dm | 38 ++++++++++--------- code/modules/shuttle/shuttle.dm | 11 +++++- icons/obj/structures/props/landinglights.dmi | Bin 3250 -> 4146 bytes maps/map_files/USS_Almayer/USS_Almayer.dmm | 16 ++++---- 4 files changed, 37 insertions(+), 28 deletions(-) diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm index 637249b37dfe..93fcf559522c 100644 --- a/code/modules/power/lighting.dm +++ b/code/modules/power/lighting.dm @@ -744,7 +744,7 @@ /obj/structure/machinery/landinglight name = "landing light" icon = 'icons/obj/structures/props/landinglights.dmi' - icon_state = "landingstripe" + icon_state = "landingstripe0" desc = "A landing light, if it's flashing stay clear!" anchored = TRUE density = FALSE @@ -756,6 +756,9 @@ unslashable = TRUE unacidable = TRUE var/obj/docking_port/stationary/linked_port = null + var/icon_on = "landingstripe0_on" + var/icon_off = "landingstripe_off" + var/light_strength = 2 //Don't allow blowing those up, so Marine nades don't fuck them /obj/structure/machinery/landinglight/ex_act(severity) @@ -772,28 +775,27 @@ linked_port = null /obj/structure/machinery/landinglight/proc/turn_off() - icon_state = initial(icon_state) + icon_state = icon_off set_light(0) /obj/structure/machinery/landinglight/proc/turn_on() - icon_state = initial(icon_state) + "0" - set_light(2) + icon_state = icon_on + set_light(light_strength) -/obj/structure/machinery/landinglight/delayone/turn_on() - icon_state = initial(icon_state) + "1" - set_light(2) +/obj/structure/machinery/landinglight/delayone + icon_state = "landingstripe1" + icon_on = "landingstripe1_on" -/obj/structure/machinery/landinglight/delaytwo/turn_on() - icon_state = initial(icon_state) + "2" - set_light(2) +/obj/structure/machinery/landinglight/delaytwo + icon_state = "landingstripe2" + icon_on = "landingstripe2_on" -/obj/structure/machinery/landinglight/delaythree/turn_on() - icon_state = initial(icon_state) + "3" - set_light(2) +/obj/structure/machinery/landinglight/delaythree + icon_state = "landingstripe3" + icon_on = "landingstripe3_on" /obj/structure/machinery/landinglight/spoke - icon_state = "lz_spoke_light" - -/obj/structure/machinery/landinglight/spoke/turn_on() - icon_state = initial(icon_state) + "1" - set_light(3) + icon_state = "lz_spoke_light_off" + icon_on = "lz_spoke_light_on" + icon_off = "lz_spoke_light_off" + light_strength = 3 diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm index 47b8a0997258..9c017cce345b 100644 --- a/code/modules/shuttle/shuttle.dm +++ b/code/modules/shuttle/shuttle.dm @@ -293,6 +293,7 @@ /// Called when a new shuttle is about to arrive /obj/docking_port/stationary/proc/on_prearrival(obj/docking_port/mobile/arriving_shuttle) + log_debug("SHUTTLE DEBUG: [name] static prearrival called!") turn_on_landing_lights() return @@ -593,8 +594,14 @@ return /obj/docking_port/mobile/proc/on_prearrival() + log_debug("SHUTTLE DEBUG: [name] prearrival called!") if(destination) destination.on_prearrival(src) + log_debug("SHUTTLE DEBUG: destination is '[destination.name]'") + if(landing_sound) + playsound(destination.return_center_turf(), landing_sound, 60, 0, falloff=4) + else + log_debug("SHUTTLE DEBUG: No destination found.") playsound(return_center_turf(), landing_sound, 60, 0) return @@ -741,8 +748,8 @@ if(prearrivalTime && mode != SHUTTLE_PREARRIVAL) set_mode(SHUTTLE_PREARRIVAL) setTimer(prearrivalTime) - log_debug("WARNING: shuttle on approach failed check!") - //return + log_debug("SHUTTLE DEBUG: shuttle on approach failed check!") + return on_prearrival() var/error = initiate_docking(destination, preferred_direction) if(error && error & (DOCKING_NULL_DESTINATION | DOCKING_NULL_SOURCE)) diff --git a/icons/obj/structures/props/landinglights.dmi b/icons/obj/structures/props/landinglights.dmi index 8ec92b52dd32e2740a2044a17e5e9a07d8cfc33d..cb8f3ce5b40f42780e1a61047731be88131a5538 100644 GIT binary patch literal 4146 zcmai2d0dj|7Dg>~vXrStn^MW?woJP%t_kBZl`UG0Wr~HB=7Ng5sR&k<-qLLJsuh}= znKte@xTaXSwWzrui3^%33L$QQe#rOT52dE&cc=RYKVIJTyw7>gbI!}Zk69g9wq*4Z z1OlF zUaqeNI}^U3b4SoyoOT-JhVj_gK`gMjD6wl&e-P7w-yP&ZDo|x`-P3hwhyj_fDq}?~5kljpByV6Hb?h-Ux&35$1w4r=dGA_}<;w0XWns(4bJ(c3ENL zW3nfmTd-IT`BS)@+52r#?zf`rB3uf)p3;jR_kruNEvl>5S|Ai6lpVv7@W#?vi+27J zg-}%1Ra&~npQ%~a)o*l*!TiQF;&*ox@|yNO;2NC88!v3LYqY}accMI133mT2bRpp4ub6ns1dFz-8I8)|u?so>C3u@C*N3i;$k$=!71BcbIjWE-|&uYN-(L zwJ6+Kpt#E;Phe+_lQ8lKsT={TtGgSUE4(~B75upVQl@!SKG&+Fg4(IArKyP)K2O-f zp_wM7gMEPEjMUfL&X7$OEIU!XcmVmNB%RC30(5NbE5M=8IE?~$Q-ly498msyY?8zn9bD+ z`OWbC!y=F6&UuVRlpr>cYJ8ejbp5Tt{4@&>sws@NkJ?x}Jm#%Pz` z58BUNrW|5{O){^3K@J%pwVFE%b+ei-+umPRBHR0Gn50YI$gQvqR{al?5%p=#5Eglc zu`P~Uxy36HU?k>~XA$?UvaXUOba2>BsB|U;&F!QWR388+4n|=DR7JJSu7^aG^Z%D3 zDOFWfyCS6roC-z1CV&$So3)}Js_ASum!Q7p$V(Aat7G8_L$Rg;Og^f%;NT;gW*x(y zC?Y1G7_GS+-$Bz8w6tA8%%cbMDq}ArBQJka;QI2(KVJJ)lU%Ca6kc`Z!NPCNq0Htr zQB%v0d|ZgUgXQYA&h1hKsjhr~5sqGYgO9Dxp50Bwv=v|E9?5E-{%!3+75Vv?bv2C; z+%j9XZ?it7Nl^kMdunT6vw?C`rd86~bSz-yq2FgshLY!s4k@jpb7;&d95{XwN}d*D zsucp2k5kMWnLr;TCC9xY8hTo0z|+OQkC_@rH2NyrVOe7G2;)EnIDyFb@2|1s;IM+v zL2^k&ezT7Whj|MZ`z>`?TBy^&uHpTqD}Re6zZzuV-0Gr^b4m;9vq8!X>onlZ@%DMt z?@90Mx7Kw8C=lvf7h^^^({`m`n83uBr(pF~=92i}na+2`U0W+i0p<)EA(sQD<+Qu> z0-{?@0-}V&hoq#ab4R(NQp#bsetV7?LG5O#Wp`1QcQq; zT^fm`8b;)9Gl@u(S@o)Pt&A4aNVD0`XjFiIF;gC<#8_jtQ`tuQn17T7scg8e&!RIm zH#xnN`(Lsvg(trA&E-=MI;nSOX%3%wF_&mDA2V6}8}=yx<5U&w6gX&HNF=IDz`b=Q zNB6Vmd1A}rb&5b%pv*8>cJ7Fx%>=hzfKo_$g3D;YHI=lp>(vtc8j=*e{S!Q$^vNsteW zB5zZ_>n}W{q?-H?q`EEWCvuyz=fF|FO$M z{S2)F)_wg`0pz#z(PA%2Xv1(wHQ3zOclNF{ji~3Cqz>srGZzw6_qRnNIjNaoo{5ox z0rBItEw*|<@`kXZBLS2*4ql_?%1<=SE{-nv@3tjwMM&=kKUCx~J9tFU;;Vdj@8gAV zp#Uy2Om6$qqK?lpGm@L}4@%Z$#H|7Aw*I56KJ3vPciT-K{)KCh*ZI=$n0xWJ6eP7? z(^bp;Ot&*-wp2C`7Wgj&c0>4!NA06`Q*k`Il;MNc@vXry-G|xqpvunDgC!@@GJEDc-7p^JGc|OyC+gU#J4lm*sQrP*9}AKO#O*Gu z%5IV{qY@J)tg6hTYS;$Vjr=;fzas5jmfq|rKQoYQ;dVu^QeLRiNO~QeLcONc~s%}fVnZp z50>s`9#g=^;&F@llNXu~AQafXgPlC#%Sb*d_+z{pi=gk-t7?)lv3x$w8zjZvCsMo5 z2rmcOTtkUixCWbsx?f zbekex7)mCFDGh|0S>YqESEF#BIl}K8Bp!e?XN%haF(HTmz3*nZ(*QQV6h{)E ziT4y4w@?dklHq!@Yyc4TT?%6-BzcWFbh9vXd}&MbK6CeK>E@zNEN{>n<4Gfqr-jXp zX7NyGNnL=qReU~I51@H9lyBkA5QX9v<_^?8S5aR`4z-gRuZDJ&8YArDV~Rn;V2G}F z*D7n2UDG%xCeMYihiFw*GX*rLaz!i_B0h!Or*5utXngd%8SvN*Yt-$RM070rvNY;Z zaquYRA!S@u$34denh$iA^Ncn*w+-*xF2H~a{25V5BkEul9n&|T80Y0RI&{3!#sgWIcIFT1Lm$;9Ed#%?S=k}*@zw=CqaHtp2 z6PKBYXQUDcV`C-yK|$Sknj{9$D7J@&8ZPX4g*e+6=RDg)Xxe7C*{*7ROI1T`H>I+Y zgKK;OinKB4p2e|LFk`8sD=%j}^ATNZ{B+E&@T5{FJ8-&EG*g6qveI|qP>z`VvD9hx zkWSA)o~=-%h6)|Zq~uX4=`OV!;EJN#20A_#E?4qwQ&3G(D>B2Uo>zY%s?}gHaL}i< z)xfwv%XQ(GZmnywPvt~eqiZsPbO@&3ZZCapn3F%2u8F;QtNuI3OE+YlY^|6THP$cx zzE@ew^icn1pTqZ_0%C5~UNOE)j`tXQSU&VnBnPH8d*!hNS;hUg!sP4M&=-Tr z!M`;d2aRpD$43UCJ@d5st^)%vA~Ol=)z6b5fdvrK5CBsh1j9izw+$r7N86l~Wk^hbMs}FOw>JQFE^`TIfKj$h5|buz3AQ zk{1HYdxNMJ)pK#$fAaV!wD8qoeaiUa)2X_9{{C$H!qBhZbd8Y0*=QB}f!jYnhyMgX NSpI5dk#FXB<-aoF@8|#k literal 3250 zcmbuCdpMMN8^<4~kQi;pwL)#BEvGIkFJ(q*v$jGa78A=_F>*dNV+cMLKPGmPV7cAhcjePs4}ukG;9`~ET4eO>qbuIKmM-}`faf4}Ev zM|)fK^;+uz08qF4_P7%O$XT!cRMx?nwqNd-!Qna9*)8(8UxaUXKxkw@NH74z=BF{J z>#vw-CJb9#x_-=cmrl1wex>Lo7Hb8%-0J8=;!`xPoAnMSUm<4DG~2oN1Ai?& zuEUp+|pjXbODxHCiTchw*D06?wO?)XvX*!*cWHC223bLAn6 z%9O(%)oOQkhTV`Dm%ci5S=}f|W%u^X;>Xlep_1CoIe)pUZJO6jD*mqMnNww1dUvp5 za*}h{mlfwK<{r%LpvCa>Mo*Z|3`z==Z&X;Z<69eOs5W7H`Q0nr@IIG766pX7Woc=d z6G&qAL$Ots5=mQgGnro(j3g3~)t*NB_|rX|JVG@SU9ytJXYAiLQ%4@ykc39oMqz$) zwYl1ckQx!KVnc^n4JdMTBP9GBT8Rzr-~p~VfTB-UNTLJejS3vq;rdXwgQ8kDF9dc< zm;$l1uo^xS;-Vu!rdDHq$x2@tKSXWAAD<;ySIirR=90SRpPS~K3W*3Rsv$g|(3X>@ zD(Y#T1l|v?<(?%)w&OZ z>=>B5wDR2N;01j0WVy5hT6##9{@yG1^kG%?;FLvv1%8RjdogkQR&EFCob+uEZ;_gp zlEOn3;!6qKagJW(LH)wVX=sAc17(%fvJE_jeC%!f@*XSGPl9&W0_7jMIW-d(y6M@5 zChrPg@==?@#`bw4GWMr`tj^WqGZ}J%T#>2rI_FTuwWrFxA9CX~I$nDnV#WVR{Fl6< zkE*pE^StM0bSKP3bZsN;a*vZVXihG+-W~lHNGjOFYL7!w;#D_4R$8~Z^xX2+r!kv- zN6*}Y3+F9FQ2pliWkW2>(s+g4W`!OYep^A;OUBBSuU*>Q6DVXU-(h9mMQX{lO~~!& z%TId66pA?7`5eCq@iD|&pST`FJe}gbk%q7uAbzDKo^V^)+o}1^LO04IN^&vrT|-?O zm6CUpQ)<0F$-zhAkR?44n%6H5LR6v7_9JIy(wSjk@V%@-bYbU1LiHlV7+bi+g*Jad zTgj7<&^qaLmiS~QozmzbwC+1r-DGV5>zHep8q!wdX7C-$!8}?beqot@0(}p8jL$h- z-L;A;{ROo3J2SentsdGKlWu1%z?6Dd)Du zqwy4T4{yC}c(9*`B;K(q+TKvYQ%(;z*qVBj!!Yq>)nvdhOsFML_sD2?E2AL{bd|mW zTQdN$y-jEXEIBXJ5eq{P%etQagVC4V^V33rb7{L2q&HpX??ba;9cg^3qUBBdU{c45aQc zTefhJVEW`0R$UJ>Z#c^g5RL5gd{ARi{bqo^%Z7`4w((h+J{8JH4qB!J) z*j#*v76cyYJ&XrkIsCS*+uwQZoW~Hi>FivC?_nzj-OXSfiD7~Vb=^5go)_Qy0oca|nbS3iXDnpn@IEhx z&y$Rn6+DFHL;ZId<2}ZSHj`k@nkO!!>%w$PPeo)55M zTpzjfh=xdDd_h#op!ae5xx=O9UH%s&VjiuB<1^E{M(KfgwR&yQ6CB5_<;~jvxRz*a z0fFka!JYVn#tV%Eq}}NWWufLQJ;kLqa@Z@QDx@)-_o!rRs z;EYS_DrF=D^_gCOgDZ<4+SdZ#b`~WYOr!DQQUa-wA?+>u5Qu%!Jg@qwMdnK>s-7i4 zk6Co$9J?PYjXA}u(7U9Enl;Jm<^I)#qhoOrc2@~s7!O9j+;_AG(jOMCsClskNbLBM z*f=hVw&}9xQTfn>8GlBM7Yf^rN8ym+68H`$a3D}TzF7BJg2E9YyGsC?bEXQ!f`Cy7 z&5B~%&UBO16;zw#$}*bDSTl9)8}(ds0qr4ul%$VI3E)eYQJf&jde^l7&3actQ2&+_ zOreJa=%w~h$8P|Q*%^W)g3l@jbq6s*BmvA4FbKA6@a?bal+SBU=apGd}h=48VIvi66OGMGN z;x*P2=(zdmP5kC9y8z>1V}fMhcN$#;Lb`PEbZrX>;hF-}7xNG}cn5=tHKXLy%hH`j Vu7bBL;g1l&?i>5#WE=0x{{ca+9H{^R diff --git a/maps/map_files/USS_Almayer/USS_Almayer.dmm b/maps/map_files/USS_Almayer/USS_Almayer.dmm index 4faf6acd1013..a74134758df0 100644 --- a/maps/map_files/USS_Almayer/USS_Almayer.dmm +++ b/maps/map_files/USS_Almayer/USS_Almayer.dmm @@ -3947,7 +3947,7 @@ /area/almayer/hallways/stern_hallway) "anS" = ( /obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/machinery/landinglight/delayone{ +/obj/structure/machinery/landinglight/delaythree{ dir = 8 }, /turf/open/floor/almayer{ @@ -4023,7 +4023,7 @@ /area/almayer/medical/morgue) "aof" = ( /obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/machinery/landinglight/delayone{ +/obj/structure/machinery/landinglight/delaythree{ dir = 4 }, /turf/open/floor/almayer{ @@ -4031,12 +4031,12 @@ }, /area/almayer/hallways/hangar) "aog" = ( -/obj/structure/machinery/landinglight/delayone{ - dir = 8 - }, /obj/structure/pipes/standard/simple/hidden/supply{ dir = 5 }, +/obj/structure/machinery/landinglight/delaytwo{ + dir = 8 + }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/hangar) "aoh" = ( @@ -4257,12 +4257,12 @@ }, /area/almayer/medical/medical_science) "aoN" = ( -/obj/structure/machinery/landinglight/delayone{ - dir = 4 - }, /obj/structure/pipes/standard/simple/hidden/supply{ dir = 9 }, +/obj/structure/machinery/landinglight{ + dir = 4 + }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/hangar) "aoP" = ( From 8193d3d5a558748ae6c39ac3e1bf3b4880261598 Mon Sep 17 00:00:00 2001 From: forest2001 Date: Sun, 17 Dec 2023 03:31:10 +0000 Subject: [PATCH 5/9] conflict --- maps/map_files/USS_Almayer/USS_Almayer.dmm | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/maps/map_files/USS_Almayer/USS_Almayer.dmm b/maps/map_files/USS_Almayer/USS_Almayer.dmm index 08ba1dba5510..1d83b865491f 100644 --- a/maps/map_files/USS_Almayer/USS_Almayer.dmm +++ b/maps/map_files/USS_Almayer/USS_Almayer.dmm @@ -59009,6 +59009,15 @@ icon_state = "test_floor4" }, /area/almayer/hallways/aft_hallway) +"peE" = ( +/obj/structure/machinery/landinglight/delaytwo{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/shipboard/port_point_defense) "peO" = ( /obj/structure/sign/safety/medical{ pixel_x = -17; @@ -110553,15 +110562,15 @@ bWe bWn eCn uXr -cQM +peE bGN eCn uXr -cQM +peE bWn eCn uXr -cQM +peE bWn bWe bVU From 45f48bc688be5fc4af68b1071d485b26a11846ee Mon Sep 17 00:00:00 2001 From: forest2001 Date: Sun, 17 Dec 2023 07:00:39 +0000 Subject: [PATCH 6/9] fixed --- code/modules/shuttle/shuttle.dm | 15 +- code/modules/shuttle/shuttles/dropship.dm | 6 - maps/map_files/USS_Almayer/USS_Almayer.dmm | 50 +- maps/map_files/generic/Admin_level.dmm | 538 ++++++++++++--------- 4 files changed, 359 insertions(+), 250 deletions(-) diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm index 9c017cce345b..426ff8b5c471 100644 --- a/code/modules/shuttle/shuttle.dm +++ b/code/modules/shuttle/shuttle.dm @@ -292,9 +292,13 @@ return /// Called when a new shuttle is about to arrive -/obj/docking_port/stationary/proc/on_prearrival(obj/docking_port/mobile/arriving_shuttle) +/obj/docking_port/stationary/proc/on_prearrival(obj/docking_port/mobile/arriving_shuttle, landing_sound) + if(!landing_lights_on) + turn_on_landing_lights() + if(landing_sound) + playsound(return_center_turf(), landing_sound, 60, 0, falloff=4) + log_debug("SHUTTLE DEBUG: [name] static prearrival called!") - turn_on_landing_lights() return /// Called when the docked shuttle ignites @@ -313,7 +317,7 @@ /obj/docking_port/stationary/proc/link_landing_lights() var/list/coords = return_coords() - var/scan_range = 5 + var/scan_range = 3 var/x0 = coords[1] - scan_range var/y0 = coords[2] - scan_range var/x1 = coords[3] + scan_range @@ -596,10 +600,8 @@ /obj/docking_port/mobile/proc/on_prearrival() log_debug("SHUTTLE DEBUG: [name] prearrival called!") if(destination) - destination.on_prearrival(src) + destination.on_prearrival(src, landing_sound) log_debug("SHUTTLE DEBUG: destination is '[destination.name]'") - if(landing_sound) - playsound(destination.return_center_turf(), landing_sound, 60, 0, falloff=4) else log_debug("SHUTTLE DEBUG: No destination found.") playsound(return_center_turf(), landing_sound, 60, 0) @@ -749,6 +751,7 @@ set_mode(SHUTTLE_PREARRIVAL) setTimer(prearrivalTime) log_debug("SHUTTLE DEBUG: shuttle on approach failed check!") + on_prearrival() return on_prearrival() var/error = initiate_docking(destination, preferred_direction) diff --git a/code/modules/shuttle/shuttles/dropship.dm b/code/modules/shuttle/shuttles/dropship.dm index 84977b1d7b6e..a797526a443c 100644 --- a/code/modules/shuttle/shuttles/dropship.dm +++ b/code/modules/shuttle/shuttles/dropship.dm @@ -118,12 +118,6 @@ if(mode == SHUTTLE_CRASHED) return - /*if(mode == SHUTTLE_PREARRIVAL && !destination.landing_lights_on) - if(istype(destination, /obj/docking_port/stationary)) - destination.turn_on_landing_lights() - playsound(destination.return_center_turf(), landing_sound, 60, 0) - playsound(return_center_turf(), landing_sound, 60, 0) - */ automated_check() hijack?.check() diff --git a/maps/map_files/USS_Almayer/USS_Almayer.dmm b/maps/map_files/USS_Almayer/USS_Almayer.dmm index 1d83b865491f..23c68c9cd8a4 100644 --- a/maps/map_files/USS_Almayer/USS_Almayer.dmm +++ b/maps/map_files/USS_Almayer/USS_Almayer.dmm @@ -30926,6 +30926,13 @@ icon_state = "cargo" }, /area/almayer/hull/lower_hull/l_m_s) +"dJv" = ( +/obj/structure/machinery/landinglight/delaytwo, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/shipboard/starboard_point_defense) "dJI" = ( /obj/structure/bed/chair/comfy/bravo{ dir = 4 @@ -33393,6 +33400,13 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_m_s) +"eIH" = ( +/obj/structure/machinery/landinglight/delayone, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/shipboard/starboard_point_defense) "eJd" = ( /obj/structure/platform_decoration{ dir = 4 @@ -50726,6 +50740,13 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/synthcloset) +"lIb" = ( +/obj/structure/machinery/landinglight/delaythree, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/shipboard/starboard_point_defense) "lIh" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -73057,6 +73078,13 @@ "uOi" = ( /turf/closed/wall/almayer/outer, /area/almayer/lifeboat_pumps/south2) +"uOq" = ( +/obj/structure/machinery/landinglight, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/shipboard/starboard_point_defense) "uOJ" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer{ @@ -110278,7 +110306,7 @@ aKQ aaa aaa aab -aaa +aKR aKR aKR aKR @@ -110481,8 +110509,8 @@ aKQ aaa aaa aab -aaa aKR +aKS iMo bGF muL @@ -110684,8 +110712,8 @@ aKQ aaa aaa aab -aaa aKR +dJv bGO bGO bGO @@ -110887,8 +110915,8 @@ aKQ aaa aaa aab -aaa aKR +eIH bGO bGO bGO @@ -111090,8 +111118,8 @@ aKQ aaa aaa aab -aaa aKR +uOq bGO bGO bGO @@ -111293,8 +111321,8 @@ aKQ aaa aaa aab -aaa aKR +lIb bGO bGO bGO @@ -111496,8 +111524,8 @@ aKQ aaa aaa aab -aaa aKR +dJv bGO bGO bGO @@ -111699,8 +111727,8 @@ aKQ aaa aaa aab -aaa aKR +eIH bGO bGO bGO @@ -111902,8 +111930,8 @@ aKQ aaa aaa aab -aaa aKR +uOq bGO bGO bGO @@ -112105,8 +112133,8 @@ aKQ aaa aaa aab -aaa aKR +aKS syw pui aZO @@ -112308,7 +112336,7 @@ aKQ aaa aaa aab -aaa +aKR aKR aKR aKR diff --git a/maps/map_files/generic/Admin_level.dmm b/maps/map_files/generic/Admin_level.dmm index d085d7a99b0c..a9c9b3430a9f 100644 --- a/maps/map_files/generic/Admin_level.dmm +++ b/maps/map_files/generic/Admin_level.dmm @@ -116,6 +116,12 @@ icon_state = "silver" }, /area/adminlevel/ert_station) +"cd" = ( +/obj/structure/machinery/landinglight/delaythree{ + dir = 4 + }, +/turf/open/floor/plating/almayer, +/area/adminlevel/ert_station) "co" = ( /obj/structure/machinery/status_display{ pixel_y = 30 @@ -245,6 +251,12 @@ icon_state = "redfull" }, /area/adminlevel/ert_station) +"eH" = ( +/obj/structure/machinery/landinglight{ + dir = 4 + }, +/turf/open/floor/plating/almayer, +/area/adminlevel/ert_station) "eQ" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer{ @@ -544,6 +556,12 @@ icon_state = "silver" }, /area/adminlevel/ert_station) +"om" = ( +/obj/structure/machinery/landinglight/delaytwo{ + dir = 4 + }, +/turf/open/floor/plating/almayer, +/area/adminlevel/ert_station) "op" = ( /obj/structure/machinery/cryopod, /obj/structure/sign/safety/cryo{ @@ -688,6 +706,10 @@ icon_state = "plating" }, /area/tdome/tdomeobserve) +"qD" = ( +/obj/structure/machinery/landinglight/delaytwo, +/turf/open/floor/plating/almayer, +/area/adminlevel/ert_station) "rf" = ( /obj/structure/sink{ dir = 8; @@ -705,6 +727,12 @@ icon_state = "kitchen" }, /area/adminlevel/ert_station) +"sd" = ( +/obj/structure/machinery/landinglight/delaytwo{ + dir = 1 + }, +/turf/open/floor/plating/almayer, +/area/adminlevel/ert_station) "sj" = ( /obj/structure/machinery/faxmachine, /obj/structure/surface/table/reinforced/prison, @@ -731,6 +759,17 @@ }, /turf/open/floor/carpet, /area/adminlevel/ert_station) +"sV" = ( +/obj/structure/machinery/landinglight/delayone{ + dir = 8 + }, +/obj/structure/machinery/door_control{ + id = "ERT Lock 1"; + name = "Hangar Lock"; + pixel_x = 24 + }, +/turf/open/floor/plating/almayer, +/area/adminlevel/ert_station) "th" = ( /obj/structure/machinery/medical_pod/bodyscanner, /turf/open/floor/almayer{ @@ -742,8 +781,8 @@ /turf/open/floor/carpet, /area/centcom/living) "tP" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E" +/obj/structure/machinery/landinglight/delaythree{ + dir = 4 }, /obj/structure/machinery/door_control{ id = "ERT Lock 4"; @@ -901,6 +940,12 @@ icon_state = "w-y2" }, /area/tdome) +"wn" = ( +/obj/structure/machinery/landinglight/delayone{ + dir = 8 + }, +/turf/open/floor/plating/almayer, +/area/adminlevel/ert_station) "wp" = ( /turf/open/floor/almayer{ dir = 8; @@ -1007,8 +1052,8 @@ }, /area/adminlevel/ert_station) "ym" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W" +/obj/structure/machinery/landinglight/delaytwo{ + dir = 8 }, /obj/structure/machinery/door_control{ id = "ERT Lock 2"; @@ -1070,6 +1115,10 @@ }, /area/adminlevel/ert_station) "zr" = ( +/obj/structure/sign/poster{ + serial_number = 16; + pixel_y = 32 + }, /turf/open/floor/almayer{ dir = 9; icon_state = "silver" @@ -1110,6 +1159,12 @@ icon_state = "sterile_green_side" }, /area/adminlevel/ert_station) +"zP" = ( +/obj/structure/machinery/landinglight/delayone{ + dir = 4 + }, +/turf/open/floor/plating/almayer, +/area/adminlevel/ert_station) "AI" = ( /obj/structure/sign/poster{ pixel_x = -32; @@ -1127,6 +1182,10 @@ "AS" = ( /turf/closed/wall/almayer/outer, /area/tdome/tdome2) +"Bb" = ( +/obj/structure/machinery/landinglight, +/turf/open/floor/plating/almayer, +/area/adminlevel/ert_station) "Bv" = ( /obj/structure/disposalpipe/segment{ dir = 2 @@ -1174,6 +1233,12 @@ icon_state = "kitchen" }, /area/adminlevel/ert_station) +"Cb" = ( +/obj/structure/machinery/landinglight{ + dir = 8 + }, +/turf/open/floor/plating/almayer, +/area/adminlevel/ert_station) "Cc" = ( /obj/effect/landmark/sim_camera, /turf/open/floor/engine{ @@ -1276,6 +1341,12 @@ }, /turf/open/floor/plating/almayer, /area/adminlevel/ert_station/shuttle_dispatch) +"DM" = ( +/obj/structure/machinery/landinglight/delayone{ + dir = 1 + }, +/turf/open/floor/plating/almayer, +/area/adminlevel/ert_station) "DV" = ( /turf/open/floor/tdome{ icon_state = "tcomms" @@ -1322,13 +1393,8 @@ }, /area/adminlevel/ert_station) "EG" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/obj/structure/machinery/door_control{ - id = "ERT Lock 1"; - name = "Hangar Lock"; - pixel_x = 24 +/obj/structure/machinery/landinglight/delaytwo{ + dir = 8 }, /turf/open/floor/plating/almayer, /area/adminlevel/ert_station) @@ -1384,23 +1450,10 @@ /turf/open/floor/plating, /area/adminlevel/ert_station) "FO" = ( -/obj/structure/machinery/door/airlock/almayer/generic{ - damage_cap = 50000; - name = "\improper Hangar"; - no_panel = 1 - }, /obj/structure/sign/safety/debark_lounge{ - pixel_x = 15; - pixel_y = -32 - }, -/obj/structure/machinery/door/poddoor/almayer{ - dir = 4; - id = "ERT Lock 1"; - unacidable = 1 - }, -/turf/open/floor/almayer{ - icon_state = "tcomms" + pixel_x = 15 }, +/turf/closed/wall/r_wall/unmeltable, /area/adminlevel/ert_station) "FT" = ( /turf/open/floor/almayer{ @@ -1622,6 +1675,10 @@ icon_state = "orange" }, /area/adminlevel/ert_station) +"JM" = ( +/obj/structure/machinery/landinglight/delayone, +/turf/open/floor/plating/almayer, +/area/adminlevel/ert_station) "JT" = ( /obj/structure/sink{ dir = 8; @@ -1635,6 +1692,12 @@ /obj/structure/machinery/cm_vending/sorted/walkman, /turf/open/floor/wood/ship, /area/adminlevel/ert_station) +"Kb" = ( +/obj/structure/machinery/landinglight{ + dir = 1 + }, +/turf/open/floor/plating/almayer, +/area/adminlevel/ert_station) "Kk" = ( /turf/closed/wall/mineral/gold, /area/adminlevel/ert_station) @@ -1945,6 +2008,12 @@ "OT" = ( /turf/closed/wall/almayer/outer, /area/tdome/tdomeobserve) +"Pf" = ( +/obj/structure/machinery/landinglight/delaythree{ + dir = 8 + }, +/turf/open/floor/plating/almayer, +/area/adminlevel/ert_station) "Po" = ( /obj/structure/bed, /obj/item/bedsheet, @@ -2349,8 +2418,8 @@ }, /area/adminlevel/ert_station/shuttle_dispatch) "Wp" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E" +/obj/structure/machinery/landinglight/delaytwo{ + dir = 4 }, /obj/structure/machinery/door_control{ id = "ERT Lock 3"; @@ -2398,6 +2467,21 @@ /obj/structure/machinery/vending/cigarette/colony, /turf/open/floor/wood/ship, /area/adminlevel/ert_station) +"WY" = ( +/obj/structure/machinery/door/airlock/almayer/generic{ + damage_cap = 50000; + name = "\improper Hangar"; + no_panel = 1 + }, +/obj/structure/machinery/door/poddoor/almayer{ + dir = 4; + id = "ERT Lock 1"; + unacidable = 1 + }, +/turf/open/floor/almayer{ + icon_state = "tcomms" + }, +/area/adminlevel/ert_station) "Xi" = ( /obj/structure/sign/poster/music, /turf/closed/wall, @@ -2515,6 +2599,10 @@ icon_state = "sterile_green_side" }, /area/adminlevel/ert_station) +"Zm" = ( +/obj/structure/machinery/landinglight/delaythree, +/turf/open/floor/plating/almayer, +/area/adminlevel/ert_station) "Zp" = ( /obj/structure/surface/table/woodentable/fancy, /obj/item/paper_bin/wy, @@ -2522,14 +2610,10 @@ /turf/open/floor/carpet, /area/adminlevel/ert_station) "Zr" = ( -/obj/structure/sign/poster{ - pixel_x = -32; - serial_number = 16 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "silver" +/obj/structure/machinery/landinglight/delaythree{ + dir = 1 }, +/turf/open/floor/plating/almayer, /area/adminlevel/ert_station) "Zv" = ( /obj/structure/machinery/autodoc_console, @@ -3272,39 +3356,39 @@ Ly Ya wW Ya -Ly -Ly -Ly -Ly -Ly -Ly -Ly -Ly -Ly -Ly -Ly -Ly -Ly -Ly -Ly +zP +om +cd +eH +zP +om +cd +eH +zP +om +cd +eH +zP +om +cd Ya wW Ya -Ly -Ly -Ly -Ly -Ly -Ly -Ly -Ly -Ly -Ly -Ly -Ly -Ly -Ly -Ly +zP +om +cd +eH +zP +om +cd +eH +zP +om +cd +eH +zP +om +cd Ya wW aa @@ -3423,7 +3507,7 @@ FB FB Fo wW -KW +Bb FB FB FB @@ -3439,9 +3523,9 @@ FB FB FB FB -Fo +Kb wW -KW +Bb FB FB FB @@ -3457,7 +3541,7 @@ FB FB FB FB -Fo +Kb wW aa aC @@ -3575,7 +3659,7 @@ FB FB Fo wW -KW +Zm FB FB FB @@ -3591,9 +3675,9 @@ FB FB hP FB -Fo +DM wW -KW +Zm FB FB FB @@ -3609,7 +3693,7 @@ FB FB ks FB -Fo +DM wW aa aC @@ -3727,7 +3811,7 @@ FB FB Fo wW -KW +qD FB FB FB @@ -3743,9 +3827,9 @@ FB FB FB FB -Fo +sd wW -KW +qD FB FB FB @@ -3761,7 +3845,7 @@ FB FB FB FB -Fo +sd wW aa aC @@ -3879,7 +3963,7 @@ FB FB Fo wW -KW +JM FB FB FB @@ -3895,9 +3979,9 @@ FB FB FB FB -Fo +Zr wW -KW +JM FB FB FB @@ -3913,7 +3997,7 @@ FB FB FB FB -Fo +Zr wW aa aC @@ -4031,7 +4115,7 @@ FB FB Fo wW -KW +Bb FB FB FB @@ -4047,9 +4131,9 @@ FB FB FB FB -Fo +Kb wW -KW +Bb FB FB FB @@ -4065,7 +4149,7 @@ FB FB FB FB -Fo +Kb wW aa aC @@ -4183,7 +4267,7 @@ FB FB Fo wW -KW +Zm FB FB FB @@ -4199,9 +4283,9 @@ FB FB FB FB -Fo +DM wW -KW +Zm FB FB FB @@ -4217,7 +4301,7 @@ FB FB FB FB -Fo +DM wW aa aC @@ -4335,7 +4419,7 @@ FB FB Fo wW -KW +qD FB FB FB @@ -4351,9 +4435,9 @@ FB FB FB FB -Fo +sd wW -KW +qD FB FB FB @@ -4369,7 +4453,7 @@ FB FB FB FB -Fo +sd wW aa aC @@ -4487,7 +4571,7 @@ FB FB Fo wW -KW +JM FB FB FB @@ -4503,9 +4587,9 @@ FB FB FB FB -Fo +Zr wW -KW +JM FB FB FB @@ -4521,7 +4605,7 @@ FB FB FB FB -Fo +Zr wW aa aC @@ -4639,7 +4723,7 @@ FB FB Fo wW -KW +Bb FB FB FB @@ -4655,9 +4739,9 @@ FB FB FB FB -Fo +Kb wW -KW +Bb FB FB FB @@ -4673,7 +4757,7 @@ FB FB FB FB -Fo +Kb wW aa aC @@ -4792,39 +4876,39 @@ FB Fo wW Ya -Js -Js -Js -Js -Js -Js -Js -Js -Js -Js -Js -Js -Js +Pf EG -Js +wn +Cb +Pf +EG +wn +Cb +Pf +EG +wn +Cb +Pf +EG +sV Ya wW Ya -Js +Pf ym -Js -Js -Js -Js -Js -Js -Js -Js -Js -Js -Js -Js -Js +wn +Cb +Pf +EG +wn +Cb +Pf +EG +wn +Cb +Pf +EG +wn Ya wW aa @@ -4954,11 +5038,11 @@ wW wW wW wW -PT -wW -FO wW wW +FO +WY +FO wW Sw wW @@ -5110,7 +5194,7 @@ Zp YU zr Gq -Zr +Gq RK MG HY @@ -6920,39 +7004,39 @@ FB Fo wW Ya -Ly -Ly -Ly -Ly -Ly -Ly -Ly -Ly -Ly -Ly -Ly -Ly -Ly -Ly +zP +om +cd +eH +zP +om +cd +eH +zP +om +cd +eH +zP +om tP Ya wW Ya -Ly +zP Wp -Ly -Ly -Ly -Ly -Ly -Ly -Ly -Ly -Ly -Ly -Ly -Ly -Ly +cd +eH +zP +om +cd +eH +zP +om +cd +eH +zP +om +cd Ya wW aa @@ -7071,7 +7155,7 @@ FB FB Fo wW -KW +Bb FB FB FB @@ -7087,9 +7171,9 @@ FB FB FB FB -Fo +Kb wW -KW +Bb FB FB FB @@ -7105,7 +7189,7 @@ FB FB FB FB -Fo +Kb wW aa aC @@ -7223,7 +7307,7 @@ FB FB Fo wW -KW +Zm FB FB FB @@ -7239,9 +7323,9 @@ FB FB ur FB -Fo +DM wW -KW +Zm FB FB FB @@ -7257,7 +7341,7 @@ FB FB kn FB -Fo +DM wW aa aC @@ -7375,7 +7459,7 @@ FB FB Fo wW -KW +qD FB FB FB @@ -7391,9 +7475,9 @@ FB FB FB FB -Fo +sd wW -KW +qD FB FB FB @@ -7409,7 +7493,7 @@ FB FB FB FB -Fo +sd wW aa aC @@ -7527,7 +7611,7 @@ FB FB Fo wW -KW +JM FB FB FB @@ -7543,9 +7627,9 @@ FB FB FB FB -Fo +Zr wW -KW +JM FB FB FB @@ -7561,7 +7645,7 @@ FB FB FB FB -Fo +Zr wW aa aC @@ -7679,7 +7763,7 @@ FB FB Fo wW -KW +Bb FB FB FB @@ -7695,9 +7779,9 @@ FB FB FB FB -Fo +Kb wW -KW +Bb FB FB FB @@ -7713,7 +7797,7 @@ FB FB FB FB -Fo +Kb wW aa aC @@ -7831,7 +7915,7 @@ FB FB Fo wW -KW +Zm FB FB FB @@ -7847,9 +7931,9 @@ FB FB FB FB -Fo +DM wW -KW +Zm FB FB FB @@ -7865,7 +7949,7 @@ FB FB FB FB -Fo +DM wW aa aC @@ -7983,7 +8067,7 @@ FB FB Fo wW -KW +qD FB FB FB @@ -7999,9 +8083,9 @@ FB FB FB FB -Fo +sd wW -KW +qD FB FB FB @@ -8017,7 +8101,7 @@ FB FB FB FB -Fo +sd wW aa aC @@ -8135,7 +8219,7 @@ Js Js Ya wW -KW +JM FB FB FB @@ -8151,9 +8235,9 @@ FB FB FB FB -Fo +Zr wW -KW +JM FB FB FB @@ -8169,7 +8253,7 @@ FB FB FB FB -Fo +Zr wW aa aC @@ -8287,7 +8371,7 @@ wW wW wW wW -KW +Bb FB FB FB @@ -8303,9 +8387,9 @@ FB FB FB FB -Fo +Kb wW -KW +Bb FB FB FB @@ -8321,7 +8405,7 @@ FB FB FB FB -Fo +Kb wW aa aC @@ -8440,39 +8524,39 @@ as as wW Ya -Js -Js -Js -Js -Js -Js -Js -Js -Js -Js -Js -Js -Js -Js -Js +Pf +EG +wn +Cb +Pf +EG +wn +Cb +Pf +EG +wn +Cb +Pf +EG +wn Ya wW Ya -Js -Js -Js -Js -Js -Js -Js -Js -Js -Js -Js -Js -Js -Js -Js +Pf +EG +wn +Cb +Pf +EG +wn +Cb +Pf +EG +wn +Cb +Pf +EG +wn Ya wW aa From 2a24a1ffd394e01a3ffbcaa2b5ef9b37ff8e4815 Mon Sep 17 00:00:00 2001 From: forest2001 Date: Mon, 18 Dec 2023 16:59:52 +0000 Subject: [PATCH 7/9] conflict --- maps/map_files/New_Varadero/New_Varadero.dmm | 24 ++++---------------- 1 file changed, 4 insertions(+), 20 deletions(-) diff --git a/maps/map_files/New_Varadero/New_Varadero.dmm b/maps/map_files/New_Varadero/New_Varadero.dmm index 69adb45d134d..bb08d9d0f7eb 100644 --- a/maps/map_files/New_Varadero/New_Varadero.dmm +++ b/maps/map_files/New_Varadero/New_Varadero.dmm @@ -18115,14 +18115,6 @@ /obj/effect/spawner/random/attachment, /turf/open/floor/carpet, /area/varadero/interior/administration) -"lIW" = ( -/obj/structure/machinery/landinglight/ds1/spoke{ - pixel_y = -5; - pixel_x = 13 - }, -/obj/structure/machinery/camera/autoname/lz_camera, -/turf/open/auto_turf/sand_white/layer1, -/area/varadero/exterior/lz2_near) "lJo" = ( /obj/structure/machinery/light{ dir = 8 @@ -28320,14 +28312,6 @@ }, /turf/open/floor/wood, /area/varadero/interior/beach_bar) -"sbP" = ( -/obj/structure/machinery/landinglight/ds1/spoke{ - pixel_y = -5; - pixel_x = -13 - }, -/obj/structure/machinery/camera/autoname/lz_camera, -/turf/open/auto_turf/sand_white/layer1, -/area/varadero/exterior/lz2_near) "sbX" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_22"; @@ -63440,7 +63424,7 @@ wlB wlB wlB lTg -lIW +emP pXT rhu wlB @@ -63787,7 +63771,7 @@ wlB pXT lTg lTg -lTg +pXT wlB wlB wlB @@ -64879,7 +64863,7 @@ lTg uHD lTg lTg -lTg +uHD wlB wlB wlB @@ -65260,7 +65244,7 @@ wlB wlB wlB lTg -sbP +emP uHD lTg lTg From 6af650bde000c977b1757fd7d3a568cd26c6544d Mon Sep 17 00:00:00 2001 From: forest2001 Date: Wed, 20 Dec 2023 15:04:12 +0000 Subject: [PATCH 8/9] changes --- code/modules/shuttle/shuttle.dm | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm index 426ff8b5c471..ee7287d677c5 100644 --- a/code/modules/shuttle/shuttle.dm +++ b/code/modules/shuttle/shuttle.dm @@ -297,8 +297,6 @@ turn_on_landing_lights() if(landing_sound) playsound(return_center_turf(), landing_sound, 60, 0, falloff=4) - - log_debug("SHUTTLE DEBUG: [name] static prearrival called!") return /// Called when the docked shuttle ignites @@ -598,12 +596,10 @@ return /obj/docking_port/mobile/proc/on_prearrival() - log_debug("SHUTTLE DEBUG: [name] prearrival called!") if(destination) + if(destination.landing_lights_on) + return //Return early if the lights are on, something went wrong and called twice. destination.on_prearrival(src, landing_sound) - log_debug("SHUTTLE DEBUG: destination is '[destination.name]'") - else - log_debug("SHUTTLE DEBUG: No destination found.") playsound(return_center_turf(), landing_sound, 60, 0) return @@ -750,7 +746,7 @@ if(prearrivalTime && mode != SHUTTLE_PREARRIVAL) set_mode(SHUTTLE_PREARRIVAL) setTimer(prearrivalTime) - log_debug("SHUTTLE DEBUG: shuttle on approach failed check!") + /// Run on_prearrival after setting the mode rather than waiting for next check, as this doesn't occur until landing is complete. on_prearrival() return on_prearrival() From 4e4414b726f472e75add04f9877deba4444c52cd Mon Sep 17 00:00:00 2001 From: forest2001 Date: Wed, 20 Dec 2023 15:05:11 +0000 Subject: [PATCH 9/9] missed one --- code/modules/shuttle/shuttle.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm index ee7287d677c5..9b89698fd2db 100644 --- a/code/modules/shuttle/shuttle.dm +++ b/code/modules/shuttle/shuttle.dm @@ -259,7 +259,6 @@ light.linked_port = null if(landing_lights) landing_lights.Cut() - landing_lights = null // We didn't make them, so lets leave them . = ..() /obj/docking_port/stationary/Moved(atom/oldloc, dir, forced)