From 0402549078142c79910997e1e93df492cd33b5b8 Mon Sep 17 00:00:00 2001 From: harryob <55142896+harryob@users.noreply.github.com> Date: Sat, 26 Aug 2023 10:15:47 +0100 Subject: [PATCH 1/2] de-relatening of areas --- code/__HELPERS/unsorted.dm | 9 +- code/controllers/subsystem/weather.dm | 6 +- code/game/area/areas.dm | 97 +++++++++------------- code/game/atoms_movable.dm | 4 - code/game/machinery/air_alarm.dm | 14 ++-- code/game/machinery/hologram.dm | 2 +- code/game/machinery/lightswitch.dm | 11 ++- code/modules/mob/living/silicon/ai/life.dm | 9 +- code/modules/power/apc.dm | 9 +- code/modules/power/power.dm | 7 +- 10 files changed, 68 insertions(+), 100 deletions(-) diff --git a/code/__HELPERS/unsorted.dm b/code/__HELPERS/unsorted.dm index 0a03865aa17b..575071b76833 100644 --- a/code/__HELPERS/unsorted.dm +++ b/code/__HELPERS/unsorted.dm @@ -1251,13 +1251,8 @@ var/global/image/action_purple_power_up var/area/A = GLOB.areas_by_type[areatype] // Fix it up with /area/var/related due to lighting shenanigans - var/list/area/LA - if(!length(A.related)) - LA = list(A) - else LA = A.related - for(var/area/Ai in LA) - for(var/turf/T in Ai) - turfs += T + for(var/turf/T in A) + turfs += T return turfs diff --git a/code/controllers/subsystem/weather.dm b/code/controllers/subsystem/weather.dm index 4a9559d65eef..325c45fe2300 100644 --- a/code/controllers/subsystem/weather.dm +++ b/code/controllers/subsystem/weather.dm @@ -146,8 +146,7 @@ SUBSYSTEM_DEF(weather) curr_master_turf_overlay.icon_state = weather_event_instance.turf_overlay_icon_state curr_master_turf_overlay.alpha = weather_event_instance.turf_overlay_alpha for(var/area/area as anything in weather_areas) - for(var/area/subarea as anything in area.related) - subarea.overlays += curr_master_turf_overlay + area.overlays += curr_master_turf_overlay update_mobs_weather() SEND_GLOBAL_SIGNAL(COMSIG_GLOB_WEATHER_CHANGE) @@ -169,8 +168,7 @@ SUBSYSTEM_DEF(weather) message_admins(SPAN_BLUE("Weather Event of unknown type [weather_event_type] ending after [DisplayTimeText(world.time - current_event_start_time)].")) for(var/area/area as anything in weather_areas) - for(var/area/subarea as anything in area.related) - subarea.overlays -= curr_master_turf_overlay + area.overlays -= curr_master_turf_overlay if (map_holder.no_weather_turf_icon_state) curr_master_turf_overlay.icon_state = map_holder.no_weather_turf_icon_state diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm index 66f9ae250d21..826b2dc0585f 100644 --- a/code/game/area/areas.dm +++ b/code/game/area/areas.dm @@ -28,7 +28,6 @@ var/unique = TRUE var/has_gravity = 1 - var/list/related // the other areas of the same type as this // var/list/lights // list of all lights on this area var/list/all_doors = list() //Added by Strumpetplaya - Alarm Change - Contains a list of doors adjacent to this area var/air_doors_activated = 0 @@ -88,7 +87,6 @@ GLOB.areas_by_type[type] = src ..() - related = list(src) initialize_power() /area/Initialize(mapload, ...) @@ -134,13 +132,12 @@ poweralm = state if(istype(source)) //Only report power alarms on the z-level where the source is located. var/list/cameras = list() - for (var/area/RA in related) - for (var/obj/structure/machinery/camera/C in RA) - cameras += C - if(state == 1) - C.network.Remove(CAMERA_NET_POWER_ALARMS) - else - C.network.Add(CAMERA_NET_POWER_ALARMS) + for (var/obj/structure/machinery/camera/C in src) + cameras += C + if(state == 1) + C.network.Remove(CAMERA_NET_POWER_ALARMS) + else + C.network.Add(CAMERA_NET_POWER_ALARMS) for (var/mob/living/silicon/aiPlayer in ai_mob_list) if(aiPlayer.z == source.z) if (state == 1) @@ -160,10 +157,9 @@ // return 0 //redudant //Check all the alarms before lowering atmosalm. Raising is perfectly fine. - for (var/area/RA in related) - for (var/obj/structure/machinery/alarm/AA in RA) - if ( !(AA.inoperable()) && !AA.shorted) - danger_level = max(danger_level, AA.danger_level) + for (var/obj/structure/machinery/alarm/AA in src) + if ( !(AA.inoperable()) && !AA.shorted) + danger_level = max(danger_level, AA.danger_level) if(danger_level != atmosalm) if (danger_level < 1 && atmosalm >= 1) @@ -171,9 +167,8 @@ air_doors_open() if (danger_level < 2 && atmosalm >= 2) - for(var/area/RA in related) - for(var/obj/structure/machinery/camera/C in RA) - C.network.Remove(CAMERA_NET_ATMOSPHERE_ALARMS) + for(var/obj/structure/machinery/camera/C in src) + C.network.Remove(CAMERA_NET_ATMOSPHERE_ALARMS) for(var/mob/living/silicon/aiPlayer in ai_mob_list) aiPlayer.cancelAlarm("Atmosphere", src, src) for(var/obj/structure/machinery/computer/station_alert/a in machines) @@ -181,11 +176,10 @@ if (danger_level >= 2 && atmosalm < 2) var/list/cameras = list() - for(var/area/RA in related) - //updateicon() - for(var/obj/structure/machinery/camera/C in RA) - cameras += C - C.network.Add(CAMERA_NET_ATMOSPHERE_ALARMS) + //updateicon() + for(var/obj/structure/machinery/camera/C in src) + cameras += C + C.network.Add(CAMERA_NET_ATMOSPHERE_ALARMS) for(var/mob/living/silicon/aiPlayer in ai_mob_list) aiPlayer.triggerAlarm("Atmosphere", src, cameras, src) for(var/obj/structure/machinery/computer/station_alert/a in machines) @@ -193,9 +187,8 @@ air_doors_close() atmosalm = danger_level - for(var/area/RA in related) - for (var/obj/structure/machinery/alarm/AA in RA) - AA.update_icon() + for (var/obj/structure/machinery/alarm/AA in src) + AA.update_icon() return 1 return 0 @@ -225,7 +218,6 @@ if(name == "Space") //no fire alarms in space return if(!(flags_alarm_state & ALARM_WARNING_FIRE)) - flags_alarm_state |= ALARM_WARNING_FIRE flags_alarm_state |= ALARM_WARNING_FIRE //used for firedoor checks updateicon() mouse_opacity = MOUSE_OPACITY_TRANSPARENT @@ -236,10 +228,9 @@ else if(!D.density) INVOKE_ASYNC(D, TYPE_PROC_REF(/obj/structure/machinery/door, close)) var/list/cameras = list() - for(var/area/RA in related) - for (var/obj/structure/machinery/camera/C in RA) - cameras.Add(C) - C.network.Add(CAMERA_NET_FIRE_ALARMS) + for (var/obj/structure/machinery/camera/C in src) + cameras.Add(C) + C.network.Add(CAMERA_NET_FIRE_ALARMS) for (var/mob/living/silicon/ai/aiPlayer in ai_mob_list) aiPlayer.triggerAlarm("Fire", src, cameras, src) for (var/obj/structure/machinery/computer/station_alert/a in machines) @@ -247,7 +238,6 @@ /area/proc/firereset() if(flags_alarm_state & ALARM_WARNING_FIRE) - flags_alarm_state &= ~ALARM_WARNING_FIRE flags_alarm_state &= ~ALARM_WARNING_FIRE //used for firedoor checks mouse_opacity = MOUSE_OPACITY_TRANSPARENT updateicon() @@ -257,9 +247,8 @@ D.nextstate = OPEN else if(D.density) INVOKE_ASYNC(D, TYPE_PROC_REF(/obj/structure/machinery/door, open)) - for(var/area/RA in related) - for (var/obj/structure/machinery/camera/C in RA) - C.network.Remove(CAMERA_NET_FIRE_ALARMS) + for (var/obj/structure/machinery/camera/C in src) + C.network.Remove(CAMERA_NET_FIRE_ALARMS) for (var/mob/living/silicon/ai/aiPlayer in ai_mob_list) aiPlayer.cancelAlarm("Fire", src, src) for (var/obj/structure/machinery/computer/station_alert/a in machines) @@ -341,12 +330,11 @@ // called when power status changes /area/proc/power_change() - for(var/area/RA in related) - for(var/obj/structure/machinery/M in RA) // for each machine in the area - if(!M.gc_destroyed) - M.power_change() // reverify power status (to update icons etc.) - if(flags_alarm_state) - RA.updateicon() + for(var/obj/structure/machinery/M in src) // for each machine in the area + if(!M.gc_destroyed) + M.power_change() // reverify power status (to update icons etc.) + if(flags_alarm_state) + updateicon() /area/proc/usage(chan, reset_oneoff = FALSE) var/used = 0 @@ -413,24 +401,21 @@ A.has_gravity = gravitystate - for(var/area/SubA in A.related) - SubA.has_gravity = gravitystate - - if(gravitystate) - for(var/mob/living/carbon/human/M in SubA) - thunk(M) - for(var/mob/M1 in SubA) - M1.make_floating(0) - else - for(var/mob/M in SubA) - if(M.Check_Dense_Object() && istype(src,/mob/living/carbon/human/)) - var/mob/living/carbon/human/H = src - if(istype(H.shoes, /obj/item/clothing/shoes/magboots) && (H.shoes.flags_inventory & NOSLIPPING)) //magboots + dense_object = no floaty effect - H.make_floating(0) - else - H.make_floating(1) + if(gravitystate) + for(var/mob/living/carbon/human/M in A) + thunk(M) + for(var/mob/M1 in A) + M1.make_floating(0) + else + for(var/mob/M in A) + if(M.Check_Dense_Object() && istype(src,/mob/living/carbon/human/)) + var/mob/living/carbon/human/H = src + if(istype(H.shoes, /obj/item/clothing/shoes/magboots) && (H.shoes.flags_inventory & NOSLIPPING)) //magboots + dense_object = no floaty effect + H.make_floating(0) else - M.make_floating(1) + H.make_floating(1) + else + M.make_floating(1) /area/proc/thunk(M) if(istype(get_turf(M), /turf/open/space)) // Can't fall onto nothing. diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm index 0b766ed08ebc..9b64833cb547 100644 --- a/code/game/atoms_movable.dm +++ b/code/game/atoms_movable.dm @@ -38,10 +38,6 @@ if(pulledby) pulledby.stop_pulling() QDEL_NULL(launch_metadata) - - if(opacity) - RemoveElement(/datum/element/light_blocking) - QDEL_NULL(em_block) if(loc) diff --git a/code/game/machinery/air_alarm.dm b/code/game/machinery/air_alarm.dm index 31ac1b519581..16512a944be1 100644 --- a/code/game/machinery/air_alarm.dm +++ b/code/game/machinery/air_alarm.dm @@ -201,11 +201,10 @@ /obj/structure/machinery/alarm/proc/elect_master() if(!alarm_area) return 0 - for (var/area/A in alarm_area.related) - for (var/obj/structure/machinery/alarm/AA in A) - if (!(AA.inoperable())) - alarm_area.master_air_alarm = AA - return 1 + for (var/obj/structure/machinery/alarm/AA in alarm_area) + if (!(AA.inoperable())) + alarm_area.master_air_alarm = AA + return 1 return 0 /obj/structure/machinery/alarm/proc/get_danger_level(current_value, list/danger_levels) @@ -312,9 +311,8 @@ /obj/structure/machinery/alarm/proc/apply_mode() //propagate mode to other air alarms in the area //TODO: make it so that players can choose between applying the new mode to the room they are in (related area) vs the entire alarm area - for (var/area/RA in alarm_area.related) - for (var/obj/structure/machinery/alarm/AA in RA) - AA.mode = mode + for (var/obj/structure/machinery/alarm/AA in alarm_area) + AA.mode = mode switch(mode) if(AALARM_MODE_SCRUBBING) diff --git a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm index 516f5a633c1e..2f8f113ddd23 100644 --- a/code/game/machinery/hologram.dm +++ b/code/game/machinery/hologram.dm @@ -175,7 +175,7 @@ For the other part of the code, check silicon say.dm. Particularly robot talk.*/ var/area/holo_area = get_area(src) var/area/eye_area = get_area(master.eyeobj) - if(eye_area in holo_area.related) + if(eye_area == holo_area) return 1 clear_holo()//If not, we want to get rid of the hologram. diff --git a/code/game/machinery/lightswitch.dm b/code/game/machinery/lightswitch.dm index 1c51b93aa96c..66eb0386713f 100644 --- a/code/game/machinery/lightswitch.dm +++ b/code/game/machinery/lightswitch.dm @@ -42,13 +42,12 @@ /obj/structure/machinery/light_switch/attack_hand(mob/user) on = !on - for(var/area/A in area.related) - A.lightswitch = on - A.updateicon() + area.lightswitch = on + area.updateicon() - for(var/obj/structure/machinery/light_switch/L in A) - L.on = on - L.updateicon() + for(var/obj/structure/machinery/light_switch/L in area) + L.on = on + L.updateicon() area.power_change() diff --git a/code/modules/mob/living/silicon/ai/life.dm b/code/modules/mob/living/silicon/ai/life.dm index 7440ee2b4124..5b190143f5bc 100644 --- a/code/modules/mob/living/silicon/ai/life.dm +++ b/code/modules/mob/living/silicon/ai/life.dm @@ -133,11 +133,10 @@ var/PRP //like ERP with the code, at least this stuff is no more 4x sametext for (PRP=1, PRP<=4, PRP++) var/area/AIarea = get_area(src) - for(var/area/A in AIarea.related) - for (var/obj/structure/machinery/power/apc/APC in A) - if (!(APC.stat & BROKEN)) - theAPC = APC - break + for (var/obj/structure/machinery/power/apc/APC in AIarea) + if (!(APC.stat & BROKEN)) + theAPC = APC + break if (!theAPC) switch(PRP) if (1) to_chat(src, "Unable to locate APC!") diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm index 531e3d04b782..ef4c5cc292ce 100644 --- a/code/modules/power/apc.dm +++ b/code/modules/power/apc.dm @@ -1314,11 +1314,10 @@ GLOBAL_LIST_INIT(apc_wire_descriptions, list( if(cell && cell.charge >= 20) cell.use(20) spawn(0) - for(var/area/A in area.related) - for(var/obj/structure/machinery/light/L in A) - L.on = 1 - L.broken() - sleep(1) + for(var/obj/structure/machinery/light/L in area) + L.on = 1 + L.broken() + sleep(1) /obj/structure/machinery/power/apc/Destroy() area.power_light = 0 diff --git a/code/modules/power/power.dm b/code/modules/power/power.dm index eeaea8729642..bee3e0aac8c2 100644 --- a/code/modules/power/power.dm +++ b/code/modules/power/power.dm @@ -274,10 +274,9 @@ return null /area/proc/get_apc() - for(var/area/RA in src.related) - var/obj/structure/machinery/power/apc/FINDME = locate() in RA - if (FINDME) - return FINDME + var/obj/structure/machinery/power/apc/FINDME = locate() in src + if (FINDME) + return FINDME //Determines how strong could be shock, deals damage to mob, uses power. From 3161fb80a1414813a8360444e4857857934e80bd Mon Sep 17 00:00:00 2001 From: harryob <55142896+harryob@users.noreply.github.com> Date: Sat, 26 Aug 2023 10:34:09 +0100 Subject: [PATCH 2/2] removes that one sticky tile on the dropships --- code/modules/shuttle/shuttles/dropship.dm | 7 ++++ maps/map_files/BigRed/BigRed.dmm | 8 ++--- maps/map_files/CORSAT/Corsat.dmm | 26 +++++++++------ maps/map_files/DesertDam/Desert_Dam.dmm | 8 ++--- .../FOP_v2_Cellblocks/Prison_Station_FOP.dmm | 16 +++------- .../FOP_v3_Sciannex/Fiorina_SciAnnex.dmm | 30 ++++++++--------- .../map_files/Ice_Colony_v2/Ice_Colony_v2.dmm | 26 +++++++-------- .../Ice_Colony_v3/Shivas_Snowball.dmm | 31 ++++++++---------- maps/map_files/Kutjevo/Kutjevo.dmm | 32 +++++++++---------- .../LV522_Chances_Claim.dmm | 32 +++++++++---------- maps/map_files/LV624/LV624.dmm | 8 ++--- .../Sorokyne_Strata/Sorokyne_Strata.dmm | 8 ++--- maps/map_files/USS_Almayer/USS_Almayer.dmm | 8 ++--- maps/shuttles/dropship_alamo.dmm | 7 ++-- maps/shuttles/dropship_normandy.dmm | 7 ++-- 15 files changed, 125 insertions(+), 129 deletions(-) diff --git a/code/modules/shuttle/shuttles/dropship.dm b/code/modules/shuttle/shuttles/dropship.dm index c6b302bf846e..d81484b0343d 100644 --- a/code/modules/shuttle/shuttles/dropship.dm +++ b/code/modules/shuttle/shuttles/dropship.dm @@ -1,6 +1,10 @@ /obj/docking_port/mobile/marine_dropship width = 11 height = 21 + + dwidth = 5 + dheight = 10 + preferred_direction = SOUTH callTime = DROPSHIP_TRANSIT_DURATION rechargeTime = SHUTTLE_RECHARGE @@ -157,6 +161,9 @@ dir = NORTH width = 11 height = 21 + dwidth = 5 + dheight = 10 + var/list/landing_lights = list() var/auto_open = FALSE var/landing_lights_on = FALSE diff --git a/maps/map_files/BigRed/BigRed.dmm b/maps/map_files/BigRed/BigRed.dmm index 7714d8acf658..de70f22dcd8c 100644 --- a/maps/map_files/BigRed/BigRed.dmm +++ b/maps/map_files/BigRed/BigRed.dmm @@ -43036,7 +43036,7 @@ aah aah aah aah -aau +aah aeh aaf aaf @@ -44111,7 +44111,7 @@ aah aah aah aah -aah +aau aah aah aah @@ -44438,7 +44438,7 @@ bie bie bie bie -biI +bie bsb eWd eWd @@ -45513,7 +45513,7 @@ bie bie bie bie -bie +biI bie bie bie diff --git a/maps/map_files/CORSAT/Corsat.dmm b/maps/map_files/CORSAT/Corsat.dmm index 5d0fa6556980..88b90c7180e0 100644 --- a/maps/map_files/CORSAT/Corsat.dmm +++ b/maps/map_files/CORSAT/Corsat.dmm @@ -580,10 +580,6 @@ }, /area/corsat/gamma/residential/researcher) "abV" = ( -/obj/docking_port/stationary/marine_dropship/lz1{ - dwidth = 1; - name = "Gamma Landing Zone" - }, /turf/open/floor/plating{ dir = 10; icon_state = "warnplate" @@ -1887,10 +1883,6 @@ /turf/open/floor/plating, /area/corsat/sigma/hangar) "afN" = ( -/obj/docking_port/stationary/marine_dropship/lz2{ - dwidth = 1; - name = "Sigma Landing Zone" - }, /turf/open/floor/plating{ dir = 10; icon_state = "warnplate" @@ -37481,6 +37473,13 @@ icon_state = "purplewhite" }, /area/corsat/gamma/biodome/virology) +"drp" = ( +/obj/docking_port/stationary/marine_dropship/lz1{ + dwidth = 1; + name = "Gamma Landing Zone" + }, +/turf/open/floor/plating, +/area/corsat/gamma/hangar) "drv" = ( /obj/effect/landmark/hunter_secondary, /turf/open/gm/river/desert/shallow{ @@ -38250,6 +38249,13 @@ icon_state = "purplewhite" }, /area/corsat/omega/complex) +"dUj" = ( +/obj/docking_port/stationary/marine_dropship/lz2{ + dwidth = 1; + name = "Sigma Landing Zone" + }, +/turf/open/floor/plating, +/area/corsat/sigma/hangar) "dUn" = ( /obj/structure/machinery/camera/autoname{ network = list("gamma") @@ -94404,7 +94410,7 @@ aaG aaG aaG aaG -aaG +drp aaG aaG aaG @@ -121917,7 +121923,7 @@ afi afi afi afi -afi +dUj afi afi afi diff --git a/maps/map_files/DesertDam/Desert_Dam.dmm b/maps/map_files/DesertDam/Desert_Dam.dmm index 9d9fe90aa149..3eb5dabff911 100644 --- a/maps/map_files/DesertDam/Desert_Dam.dmm +++ b/maps/map_files/DesertDam/Desert_Dam.dmm @@ -70081,7 +70081,7 @@ cDY cDY cDY cDY -cFa +cDY cMD cBS cUl @@ -71241,7 +71241,7 @@ cDY cDY cDY cDY -cDY +cFa cDY cDY cDY @@ -72943,7 +72943,7 @@ aWh aWh aWh aWh -dGU +aWh bAF aVi aVh @@ -74103,7 +74103,7 @@ aWh aWh aWh aWh -aWh +dGU aWh aWh aWh 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 b31a6f0aa787..0fd8b269d33c 100644 --- a/maps/map_files/FOP_v2_Cellblocks/Prison_Station_FOP.dmm +++ b/maps/map_files/FOP_v2_Cellblocks/Prison_Station_FOP.dmm @@ -44001,12 +44001,6 @@ }, /turf/open/floor/plating, /area/prison/maintenance/staff_research) -"fny" = ( -/obj/docking_port/stationary/marine_dropship/lz1{ - name = "Hangar Landing Zone" - }, -/turf/open/space, -/area/space) "foY" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/prison{ @@ -70315,7 +70309,7 @@ aAO aAO aAO aAO -fny +aAO coo con aAO @@ -88418,7 +88412,7 @@ amu amu amu amu -aoj +amu axy jDr uaW @@ -89468,7 +89462,7 @@ amu amu amu amu -amu +aoj amu amu amu @@ -99065,7 +99059,7 @@ aYM aYM aYM aYM -bcF +aYM bts blH bkt @@ -100115,7 +100109,7 @@ aYM aYM aYM aYM -aYM +bcF aYM aYM aYM diff --git a/maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm b/maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm index 2f4c0bb13457..9d8033ae0ae8 100644 --- a/maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm +++ b/maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm @@ -6552,6 +6552,12 @@ icon_state = "blue_plate" }, /area/fiorina/station/botany) +"dYp" = ( +/obj/docking_port/stationary/marine_dropship/lz1{ + name = "Hangar Landing Zone" + }, +/turf/open/floor/plating/prison, +/area/fiorina/lz/near_lzI) "dYr" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/explosive/grenade/incendiary/molotov, @@ -16465,11 +16471,6 @@ icon_state = "bluefull" }, /area/fiorina/station/power_ring) -"kfE" = ( -/obj/structure/machinery/floodlight/landing/floor, -/obj/docking_port/stationary/marine_dropship/lz2, -/turf/open/floor/plating/prison, -/area/fiorina/lz/near_lzII) "kfF" = ( /obj/item/stack/sheet/metal, /obj/item/stack/sheet/metal, @@ -29187,13 +29188,6 @@ icon_state = "blue_plate" }, /area/fiorina/station/botany) -"saV" = ( -/obj/structure/machinery/floodlight/landing/floor, -/obj/docking_port/stationary/marine_dropship/lz1{ - name = "Hangar Landing Zone" - }, -/turf/open/floor/plating/prison, -/area/fiorina/lz/near_lzI) "sbf" = ( /obj/effect/landmark/corpsespawner/prisoner, /turf/open/gm/river{ @@ -38477,6 +38471,10 @@ icon_state = "floor_plate" }, /area/fiorina/station/civres_blue) +"xYg" = ( +/obj/docking_port/stationary/marine_dropship/lz2, +/turf/open/floor/plating/prison, +/area/fiorina/lz/near_lzII) "xYA" = ( /turf/open/floor/prison{ dir = 8; @@ -72144,7 +72142,7 @@ wSm wSm wSm wSm -kfE +wQN eAM wSm wSm @@ -73194,7 +73192,7 @@ wSm wSm wSm wSm -wSm +xYg wSm wSm wSm @@ -87961,7 +87959,7 @@ xeO xeO xeO xeO -saV +iOa nBR hlK hKI @@ -89011,7 +89009,7 @@ xeO xeO xeO xeO -xeO +dYp xeO xeO xeO 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 e5fddf6f5082..aaaaeb0c1199 100644 --- a/maps/map_files/Ice_Colony_v2/Ice_Colony_v2.dmm +++ b/maps/map_files/Ice_Colony_v2/Ice_Colony_v2.dmm @@ -18022,9 +18022,6 @@ /obj/structure/machinery/landinglight/ds1/delaytwo{ dir = 8 }, -/obj/docking_port/stationary/marine_dropship/lz1{ - name = "Hangar Landing Zone" - }, /turf/open/floor/plating/icefloor{ dir = 8; icon_state = "warnplate" @@ -19847,13 +19844,6 @@ icon_state = "dark2" }, /area/ice_colony/underground/requesition/lobby) -"bhs" = ( -/obj/docking_port/stationary/marine_dropship/lz2, -/turf/open/floor/plating/icefloor{ - dir = 10; - icon_state = "warnplate" - }, -/area/ice_colony/underground/hangar) "bht" = ( /turf/open/floor/plating/icefloor{ icon_state = "warnplate" @@ -34504,6 +34494,10 @@ icon_state = "dark2" }, /area/ice_colony/surface/research) +"cEG" = ( +/obj/docking_port/stationary/marine_dropship/lz2, +/turf/open/floor/plating/icefloor, +/area/ice_colony/underground/hangar) "cVM" = ( /obj/structure/machinery/light/small{ dir = 8 @@ -34908,6 +34902,12 @@ icon_state = "darkbrown2" }, /area/ice_colony/surface/hangar/alpha) +"sto" = ( +/obj/docking_port/stationary/marine_dropship/lz1{ + name = "Hangar Landing Zone" + }, +/turf/open/floor/plating, +/area/ice_colony/exterior/surface/landing_pad) "sKH" = ( /obj/structure/surface/table, /obj/item/device/analyzer, @@ -52192,7 +52192,7 @@ baJ baJ baJ baJ -bhs +bhV bhF bht aZW @@ -53592,7 +53592,7 @@ aZW aZW aZW aZW -aZW +cEG aZW aZW aZW @@ -90516,7 +90516,7 @@ aWp aWp aWp aWp -aWp +sto aWp aWp aWp diff --git a/maps/map_files/Ice_Colony_v3/Shivas_Snowball.dmm b/maps/map_files/Ice_Colony_v3/Shivas_Snowball.dmm index e4e97ca9dcfc..6a7f5c0f1694 100644 --- a/maps/map_files/Ice_Colony_v3/Shivas_Snowball.dmm +++ b/maps/map_files/Ice_Colony_v3/Shivas_Snowball.dmm @@ -7354,10 +7354,6 @@ /obj/structure/machinery/space_heater, /turf/open/auto_turf/snow/layer2, /area/shiva/exterior/junkyard) -"boD" = ( -/obj/docking_port/stationary/marine_dropship/lz1, -/turf/open/auto_turf/snow/layer0, -/area/shiva/exterior/lz1_valley) "boS" = ( /obj/structure/flora/bush/snow{ icon_state = "snowgrassbb_3" @@ -18064,6 +18060,10 @@ icon_state = "floor3" }, /area/shiva/interior/bar) +"mXl" = ( +/obj/docking_port/stationary/marine_dropship/lz1, +/turf/open/floor/plating, +/area/shiva/exterior/lz1_valley) "mXq" = ( /obj/structure/bed/chair{ dir = 8 @@ -19947,6 +19947,12 @@ /obj/effect/landmark/objective_landmark/close, /turf/open/floor/wood, /area/shiva/interior/colony/medseceng) +"pkJ" = ( +/obj/docking_port/stationary/marine_dropship/lz2{ + name = "Research Landing Zone" + }, +/turf/open/floor/plating, +/area/shiva/exterior/lz2_fortress) "pkK" = ( /obj/structure/machinery/light/double, /turf/open/floor/shiva{ @@ -22592,15 +22598,6 @@ /obj/item/weapon/gun/rifle/m41aMK1, /turf/open/floor/shiva, /area/shiva/interior/colony/research_hab) -"rZt" = ( -/obj/structure/machinery/landinglight/ds2/spoke, -/obj/docking_port/stationary/marine_dropship/lz2{ - name = "Research Landing Zone" - }, -/turf/open/floor/shiva{ - dir = 1 - }, -/area/shiva/exterior/lz2_fortress) "rZC" = ( /obj/structure/bed, /obj/effect/landmark/objective_landmark/medium, @@ -31019,7 +31016,7 @@ gkY gkY mFm mFm -rZt +sxD cBF mhP mFm @@ -31819,7 +31816,7 @@ gkY gkY gkY gkY -gkY +pkJ gkY gkY gkY @@ -59314,7 +59311,7 @@ cQW cQW kLM iQq -boD +iQq kLM kLM lNg @@ -60114,7 +60111,7 @@ cQW cQW cQW cQW -cQW +mXl cQW cQW cQW diff --git a/maps/map_files/Kutjevo/Kutjevo.dmm b/maps/map_files/Kutjevo/Kutjevo.dmm index e5ebab9e93cb..646ed4dcbc8c 100644 --- a/maps/map_files/Kutjevo/Kutjevo.dmm +++ b/maps/map_files/Kutjevo/Kutjevo.dmm @@ -4752,6 +4752,12 @@ }, /turf/open/auto_turf/sand/layer0, /area/kutjevo/interior/oob) +"gnj" = ( +/obj/docking_port/stationary/marine_dropship/lz1{ + name = "Dunes Landing Zone" + }, +/turf/open/floor/plating/kutjevo, +/area/shuttle/drop1/kutjevo) "gnP" = ( /turf/open/floor/kutjevo/colors/cyan/tile, /area/kutjevo/interior/complex/med/cells) @@ -7172,12 +7178,6 @@ "jYS" = ( /turf/open/auto_turf/sand/layer2, /area/kutjevo/interior/colony_S_East) -"jZJ" = ( -/obj/docking_port/stationary/marine_dropship/lz2{ - name = "NW Colony Landing Zone" - }, -/turf/open/floor/plating/kutjevo, -/area/kutjevo/exterior/lz_pad) "jZT" = ( /turf/open/floor/kutjevo/colors/cyan/edge{ dir = 8 @@ -7494,12 +7494,6 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, /turf/open/auto_turf/sand/layer1, /area/kutjevo/interior/colony_north) -"kvd" = ( -/obj/docking_port/stationary/marine_dropship/lz1{ - name = "Dunes Landing Zone" - }, -/turf/open/floor/plating/kutjevo, -/area/kutjevo/exterior/lz_dunes) "kvf" = ( /obj/structure/platform_decoration/kutjevo/rock{ dir = 4 @@ -8095,6 +8089,12 @@ /obj/effect/landmark/corpsespawner/colonist/kutjevo, /turf/open/gm/river/desert/deep/covered, /area/kutjevo/interior/power/comms) +"lkY" = ( +/obj/docking_port/stationary/marine_dropship/lz2{ + name = "NW Colony Landing Zone" + }, +/turf/open/floor/plating/kutjevo, +/area/shuttle/drop2/kutjevo) "llg" = ( /obj/effect/decal/cleanable/blood/drip, /turf/open/auto_turf/sand/layer0, @@ -19721,7 +19721,7 @@ lAI lAI nbV umo -kvd +nbV nbV qVc cWV @@ -20546,7 +20546,7 @@ lAI lAI lAI lAI -lAI +gnj lAI lAI lAI @@ -20793,7 +20793,7 @@ ppX ppX hzN wqk -jZJ +hzN hzN dpt xBm @@ -21618,7 +21618,7 @@ ppX ppX ppX ppX -ppX +lkY ppX ppX ppX 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 f82946467d23..9fcb8b7386a7 100644 --- a/maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm +++ b/maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm @@ -1009,6 +1009,12 @@ }, /turf/open/floor/plating, /area/lv522/outdoors/colony_streets/north_east_street) +"aDE" = ( +/obj/docking_port/stationary/marine_dropship/lz2{ + name = "Southeast Landing Zone" + }, +/turf/open/floor/plating, +/area/shuttle/drop2/lv522) "aDS" = ( /turf/open/floor/corsat{ dir = 5; @@ -2166,12 +2172,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/lv522/indoors/c_block/cargo) -"bhy" = ( -/obj/docking_port/stationary/marine_dropship/lz2{ - name = "Southeast Landing Zone" - }, -/turf/open/floor/plating, -/area/lv522/landing_zone_2) "bhD" = ( /obj/structure/platform_decoration{ dir = 1 @@ -6938,6 +6938,12 @@ icon_state = "marked" }, /area/lv522/indoors/a_block/dorms) +"dos" = ( +/obj/docking_port/stationary/marine_dropship/lz1{ + name = "Southwest Landing Zone" + }, +/turf/open/floor/plating, +/area/shuttle/drop1/lv522) "dox" = ( /obj/structure/prop/invuln/ice_prefab/roof_greeble{ icon_state = "vent5"; @@ -11236,12 +11242,6 @@ /obj/item/trash/plate, /turf/open/floor/carpet, /area/lv522/indoors/b_block/bar) -"fdt" = ( -/obj/docking_port/stationary/marine_dropship/lz1{ - name = "Southwest Landing Zone" - }, -/turf/open/floor/plating, -/area/lv522/landing_zone_1) "fdC" = ( /obj/structure/machinery/light{ dir = 4 @@ -65924,7 +65924,7 @@ sYH sYH nFj pRg -fdt +nFj vER uZc wdY @@ -67049,7 +67049,7 @@ sYH sYH sYH sYH -sYH +dos sYH sYH sYH @@ -98174,7 +98174,7 @@ aIp aIp xYA aiP -bhy +xYA jYr gRp aVa @@ -99299,7 +99299,7 @@ aIp aIp aIp aIp -aIp +aDE aIp aIp aIp diff --git a/maps/map_files/LV624/LV624.dmm b/maps/map_files/LV624/LV624.dmm index d3cdfea34656..d438b91d214a 100644 --- a/maps/map_files/LV624/LV624.dmm +++ b/maps/map_files/LV624/LV624.dmm @@ -28722,7 +28722,7 @@ aRg aRg aRg aRg -aBo +aRg odw aRg wLz @@ -29852,7 +29852,7 @@ aRg aKO aRg aRg -aRg +aBo aRg aRg aRg @@ -55405,7 +55405,7 @@ ank ank ank ano -aLz +ank aRZ aMq aky @@ -56535,7 +56535,7 @@ ank ank ank ank -ank +aLz ank ank ank diff --git a/maps/map_files/Sorokyne_Strata/Sorokyne_Strata.dmm b/maps/map_files/Sorokyne_Strata/Sorokyne_Strata.dmm index 8ad211bbce4c..199513731c12 100644 --- a/maps/map_files/Sorokyne_Strata/Sorokyne_Strata.dmm +++ b/maps/map_files/Sorokyne_Strata/Sorokyne_Strata.dmm @@ -43544,7 +43544,7 @@ crE crE crE arS -ciy +crE crE crW cmA @@ -44509,7 +44509,7 @@ crE crE crE crE -crE +ciy crE crE crE @@ -50654,7 +50654,7 @@ jWs jWs jWs ewk -iUK +jWs jWs yee wvF @@ -51619,7 +51619,7 @@ jWs jWs jWs jWs -jWs +iUK jWs jWs jWs diff --git a/maps/map_files/USS_Almayer/USS_Almayer.dmm b/maps/map_files/USS_Almayer/USS_Almayer.dmm index 92061c9fabda..24d268c376c1 100644 --- a/maps/map_files/USS_Almayer/USS_Almayer.dmm +++ b/maps/map_files/USS_Almayer/USS_Almayer.dmm @@ -95994,7 +95994,7 @@ baI baI baI baI -bFJ +baI bGF bHB aYt @@ -96999,7 +96999,7 @@ baI baI baI baI -baI +bFJ baI baI baI @@ -100460,7 +100460,7 @@ baI baI baI baI -bFR +baI bGM bHB aqs @@ -101465,7 +101465,7 @@ baI baI baI baI -baI +bFR baI baI baI diff --git a/maps/shuttles/dropship_alamo.dmm b/maps/shuttles/dropship_alamo.dmm index 18f5ae631c4a..3caf9fc2c988 100644 --- a/maps/shuttles/dropship_alamo.dmm +++ b/maps/shuttles/dropship_alamo.dmm @@ -26,10 +26,6 @@ /obj/structure/shuttle/part/dropship1/transparent/nose_top_right, /turf/template_noop, /area/shuttle/drop1/sulaco) -"bM" = ( -/obj/docking_port/mobile/marine_dropship/alamo, -/turf/template_noop, -/area/template_noop) "cr" = ( /obj/structure/machinery/camera/autoname/almayer/dropship_one{ dir = 8; @@ -544,6 +540,7 @@ }, /area/shuttle/drop1/sulaco) "OK" = ( +/obj/docking_port/mobile/marine_dropship/alamo, /turf/closed/shuttle/dropship1{ icon_state = "53" }, @@ -749,7 +746,7 @@ iz EN mb mb -bM +mb "} (2,1,1) = {" mb diff --git a/maps/shuttles/dropship_normandy.dmm b/maps/shuttles/dropship_normandy.dmm index aafbc21b563b..0affefa2119c 100644 --- a/maps/shuttles/dropship_normandy.dmm +++ b/maps/shuttles/dropship_normandy.dmm @@ -471,6 +471,7 @@ }, /area/shuttle/drop2/sulaco) "Iv" = ( +/obj/docking_port/mobile/marine_dropship/normandy, /turf/closed/shuttle/dropship2{ icon_state = "53" }, @@ -751,10 +752,6 @@ /obj/structure/shuttle/part/dropship2/transparent/engine_left_exhaust, /turf/template_noop, /area/shuttle/drop2/sulaco) -"XX" = ( -/obj/docking_port/mobile/marine_dropship/normandy, -/turf/template_noop, -/area/template_noop) "ZK" = ( /turf/closed/shuttle/dropship2{ icon_state = "63" @@ -782,7 +779,7 @@ sk Xr Rr Rr -XX +Rr "} (2,1,1) = {" Rr