From 8b19da6bf9b08f401d3d8fd43708e9bd3303c8ce Mon Sep 17 00:00:00 2001 From: Drulikar Date: Fri, 23 Feb 2024 19:59:00 -0800 Subject: [PATCH] Moar fixes --- code/_globalvars/lists/mapping_globals.dm | 1 + .../objects/effects/landmarks/landmarks.dm | 8 +- code/modules/nightmare/nmtasks/mapload.dm | 6 +- .../sprinkles/25.containerroom_xenos.dmm | 325 ------- .../sprinkles/30.labs-elevator_alternate.dmm | 282 ------ .../sprinkles/35.south-spidercave_cleared.dmm | 877 ------------------ maps/map_files/LV624/LV624.dmm | 2 +- 7 files changed, 12 insertions(+), 1489 deletions(-) delete mode 100644 maps/map_files/BigRed/sprinkles/25.containerroom_xenos.dmm delete mode 100644 maps/map_files/Ice_Colony_v3/sprinkles/30.labs-elevator_alternate.dmm delete mode 100644 maps/map_files/Ice_Colony_v3/sprinkles/35.south-spidercave_cleared.dmm diff --git a/code/_globalvars/lists/mapping_globals.dm b/code/_globalvars/lists/mapping_globals.dm index 47cc22dae5e1..772561dbf4a6 100644 --- a/code/_globalvars/lists/mapping_globals.dm +++ b/code/_globalvars/lists/mapping_globals.dm @@ -53,6 +53,7 @@ GLOBAL_LIST_EMPTY(teleporter_landmarks) GLOBAL_LIST_INIT(cardinals, list(NORTH, SOUTH, EAST, WEST)) GLOBAL_LIST_EMPTY(nightmare_landmarks) +GLOBAL_LIST_EMPTY(nightmare_landmark_tags_removed) GLOBAL_LIST_EMPTY(ship_areas) diff --git a/code/game/objects/effects/landmarks/landmarks.dm b/code/game/objects/effects/landmarks/landmarks.dm index a7afb80ef080..bf3b952edcf5 100644 --- a/code/game/objects/effects/landmarks/landmarks.dm +++ b/code/game/objects/effects/landmarks/landmarks.dm @@ -90,9 +90,11 @@ return GLOB.nightmare_landmarks[insert_tag] = get_turf(src) /obj/effect/landmark/nightmare/Destroy() - if(insert_tag && autoremove \ - && GLOB.nightmare_landmarks[insert_tag] == get_turf(src)) - GLOB.nightmare_landmarks.Remove(insert_tag) + if(insert_tag) + var/turf/turf = get_turf(src) + if(autoremove && GLOB.nightmare_landmarks[insert_tag] == turf) + GLOB.nightmare_landmarks.Remove(insert_tag) + GLOB.nightmare_landmark_tags_removed += insert_tag return ..() /obj/effect/landmark/ert_spawns/distress diff --git a/code/modules/nightmare/nmtasks/mapload.dm b/code/modules/nightmare/nmtasks/mapload.dm index 23dcae72cae4..a49bbbabdde5 100644 --- a/code/modules/nightmare/nmtasks/mapload.dm +++ b/code/modules/nightmare/nmtasks/mapload.dm @@ -48,7 +48,11 @@ UNTIL(!Master.map_loading) target_turf = GLOB.nightmare_landmarks[landmark] if(!target_turf?.z) - CRASH("Nightmare Mapload: Could not find landmark: [landmark]") + if(landmark in GLOB.nightmare_landmark_tags_removed) + log_debug("Nightmare Mapload: Could not find landmark: [landmark] because it was deleted") + return + else + CRASH("Nightmare Mapload: Could not find landmark: [landmark]") var/result = parsed.load(target_turf.x, target_turf.y, target_turf.z, crop_map = TRUE, no_changeturf = FALSE, place_on_top = FALSE, delete = replace) if(!result || !parsed.bounds) CRASH("Nightmare Mapload: Map insertion failed unexpectedly for file: [filepath]") diff --git a/maps/map_files/BigRed/sprinkles/25.containerroom_xenos.dmm b/maps/map_files/BigRed/sprinkles/25.containerroom_xenos.dmm deleted file mode 100644 index 6aa3dfd2cfc2..000000000000 --- a/maps/map_files/BigRed/sprinkles/25.containerroom_xenos.dmm +++ /dev/null @@ -1,325 +0,0 @@ -//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"b" = ( -/turf/closed/wall/solaris/reinforced, -/area/bigredv2/outside/nw) -"c" = ( -/turf/open/floor/plating{ - dir = 1; - icon_state = "warnplate" - }, -/area/bigredv2/outside/nw) -"d" = ( -/obj/structure/pipes/standard/simple/hidden/green, -/turf/open/floor/plating{ - dir = 1; - icon_state = "warnplate" - }, -/area/bigredv2/outside/nw) -"e" = ( -/obj/structure/largecrate/random/barrel/red, -/turf/open/floor/plating, -/area/bigredv2/outside/nw) -"f" = ( -/obj/structure/machinery/light{ - dir = 1; - icon_state = "tube1" - }, -/obj/structure/largecrate/random/case/small, -/turf/open/floor/plating, -/area/bigredv2/outside/nw) -"g" = ( -/obj/structure/xenoautopsy/tank/larva, -/turf/open/floor/plating, -/area/bigredv2/outside/nw) -"h" = ( -/obj/structure/xenoautopsy/tank/broken, -/turf/open/floor/plating, -/area/bigredv2/outside/nw) -"i" = ( -/obj/structure/machinery/light{ - dir = 1; - icon_state = "tube1" - }, -/turf/open/floor/plating, -/area/bigredv2/outside/nw) -"j" = ( -/turf/open/floor/plating, -/area/bigredv2/outside/nw) -"k" = ( -/obj/structure/pipes/standard/simple/hidden/green, -/turf/open/floor/plating, -/area/bigredv2/outside/nw) -"l" = ( -/obj/structure/largecrate/random/case/double, -/turf/open/floor/plating, -/area/bigredv2/outside/nw) -"m" = ( -/obj/item/shard, -/turf/open/floor/plating, -/area/bigredv2/outside/nw) -"n" = ( -/turf/open/floor/plating{ - dir = 8; - icon_state = "warnplate" - }, -/area/bigredv2/outside/nw) -"p" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4; - layer = 2.4 - }, -/turf/open/floor/plating{ - dir = 8; - icon_state = "warnplate" - }, -/area/bigredv2/outside/nw) -"q" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4; - layer = 2.4 - }, -/turf/open/floor/plating, -/area/bigredv2/outside/nw) -"r" = ( -/obj/effect/landmark/hunter_primary, -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4; - layer = 2.4 - }, -/turf/open/floor/plating, -/area/bigredv2/outside/nw) -"s" = ( -/obj/structure/pipes/standard/manifold/hidden/green, -/turf/open/floor/plating, -/area/bigredv2/outside/nw) -"u" = ( -/obj/structure/machinery/light{ - dir = 8; - icon_state = "tube1"; - pixel_y = 0 - }, -/turf/open/floor/plating, -/area/bigredv2/outside/nw) -"v" = ( -/obj/structure/cargo_container/horizontal/blue/top, -/turf/open/floor/plating, -/area/bigredv2/outside/nw) -"w" = ( -/obj/structure/cargo_container/horizontal/blue/middle, -/turf/open/floor/plating, -/area/bigredv2/outside/nw) -"x" = ( -/obj/structure/prop/dam/crane/damaged, -/turf/open/floor/plating, -/area/bigredv2/outside/nw) -"y" = ( -/obj/structure/cargo_container/horizontal/blue/bottom, -/turf/open/floor/plating, -/area/bigredv2/outside/nw) -"z" = ( -/obj/structure/machinery/light, -/obj/structure/largecrate/random/barrel/red, -/turf/open/floor/plating, -/area/bigredv2/outside/nw) -"A" = ( -/obj/structure/surface/rack, -/obj/item/alienjar, -/turf/open/floor/plating, -/area/bigredv2/outside/nw) -"B" = ( -/obj/structure/machinery/light, -/turf/open/floor/plating, -/area/bigredv2/outside/nw) - -(1,1,1) = {" -b -b -b -n -p -n -b -b -b -b -"} -(2,1,1) = {" -b -e -j -j -q -j -u -j -j -b -"} -(3,1,1) = {" -b -f -j -j -q -j -v -w -y -b -"} -(4,1,1) = {" -b -g -m -j -q -j -j -j -j -b -"} -(5,1,1) = {" -b -h -m -j -q -j -j -j -j -b -"} -(6,1,1) = {" -b -g -j -j -r -j -v -w -y -b -"} -(7,1,1) = {" -b -g -j -j -q -j -j -j -j -b -"} -(8,1,1) = {" -b -i -j -j -q -j -j -j -z -b -"} -(9,1,1) = {" -c -j -j -j -q -j -j -g -g -b -"} -(10,1,1) = {" -c -j -j -j -q -j -m -h -g -b -"} -(11,1,1) = {" -d -k -k -k -s -j -j -m -A -b -"} -(12,1,1) = {" -b -l -j -j -q -j -j -j -j -b -"} -(13,1,1) = {" -b -f -j -j -q -j -j -x -B -b -"} -(14,1,1) = {" -b -l -j -j -q -j -j -j -j -b -"} -(15,1,1) = {" -b -j -j -j -q -j -v -w -y -b -"} -(16,1,1) = {" -b -j -j -j -q -j -j -j -j -b -"} diff --git a/maps/map_files/Ice_Colony_v3/sprinkles/30.labs-elevator_alternate.dmm b/maps/map_files/Ice_Colony_v3/sprinkles/30.labs-elevator_alternate.dmm deleted file mode 100644 index f75a526b4f78..000000000000 --- a/maps/map_files/Ice_Colony_v3/sprinkles/30.labs-elevator_alternate.dmm +++ /dev/null @@ -1,282 +0,0 @@ -//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"a" = ( -/obj/structure/machinery/door/poddoor/shutters/almayer{ - density = 0; - id = "garage_ice_labs"; - name = "\improper Garage Shutters" - }, -/turf/open/floor/shiva{ - icon_state = "floor3" - }, -/area/shiva/interior/colony/research_hab) -"b" = ( -/obj/structure/curtain/black, -/turf/open/floor/shiva, -/area/shiva/interior/colony/research_hab) -"c" = ( -/obj/effect/spawner/random/tool, -/turf/open/floor/shiva{ - icon_state = "multi_tiles" - }, -/area/shiva/interior/colony/research_hab) -"e" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "NW-out" - }, -/turf/open/floor/shiva{ - dir = 8; - icon_state = "purplefull" - }, -/area/shiva/interior/colony/research_hab) -"f" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/obj/structure/machinery/light/double{ - dir = 4; - pixel_x = 6 - }, -/turf/open/floor/shiva{ - dir = 4; - icon_state = "purplefull" - }, -/area/shiva/interior/colony/research_hab) -"g" = ( -/obj/effect/decal/cleanable/blood/oil, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/shiva{ - icon_state = "multi_tiles" - }, -/area/shiva/interior/colony/research_hab) -"h" = ( -/turf/open/floor/shiva{ - icon_state = "multi_tiles" - }, -/area/shiva/interior/colony/research_hab) -"k" = ( -/turf/open/floor/shiva{ - icon_state = "floor3" - }, -/area/shiva/interior/colony/research_hab) -"l" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E" - }, -/turf/open/floor/shiva{ - dir = 4; - icon_state = "purplefull" - }, -/area/shiva/interior/colony/research_hab) -"s" = ( -/turf/open/floor/plating/plating_catwalk/shiva, -/area/shiva/interior/colony/research_hab) -"t" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/turf/open/floor/shiva{ - dir = 8; - icon_state = "purplefull" - }, -/area/shiva/interior/colony/research_hab) -"u" = ( -/obj/structure/machinery/door_control{ - id = "garage_ice_labs"; - name = "garage shutter control" - }, -/turf/closed/wall/shiva/prefabricated/orange, -/area/shiva/interior/colony/research_hab) -"w" = ( -/obj/effect/decal/cleanable/blood/oil, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating/plating_catwalk/shiva, -/area/shiva/interior/colony/research_hab) -"z" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N" - }, -/turf/open/floor/shiva{ - dir = 1; - icon_state = "purplefull" - }, -/area/shiva/interior/colony/research_hab) -"B" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/turf/open/floor/shiva{ - dir = 4; - icon_state = "purplefull" - }, -/area/shiva/interior/colony/research_hab) -"E" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E" - }, -/obj/structure/machinery/light/double{ - dir = 8; - pixel_x = -6 - }, -/turf/open/floor/shiva{ - dir = 4; - icon_state = "purplefull" - }, -/area/shiva/interior/colony/research_hab) -"F" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/shiva{ - icon_state = "floor3" - }, -/area/shiva/interior/colony/research_hab) -"I" = ( -/turf/closed/wall/shiva/prefabricated/orange, -/area/shiva/interior/colony/research_hab) -"L" = ( -/obj/structure/prop/dam/truck, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/shiva{ - icon_state = "floor3" - }, -/area/shiva/interior/colony/research_hab) -"Q" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E" - }, -/turf/open/floor/shiva{ - dir = 8; - icon_state = "purplefull" - }, -/area/shiva/interior/colony/research_hab) -"S" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating/plating_catwalk/shiva, -/area/shiva/interior/colony/research_hab) -"T" = ( -/obj/effect/decal/cleanable/blood/oil, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/shiva{ - icon_state = "floor3" - }, -/area/shiva/interior/colony/research_hab) -"U" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N" - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/shiva{ - dir = 1; - icon_state = "purplefull" - }, -/area/shiva/interior/colony/research_hab) -"W" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "NE-out" - }, -/turf/open/floor/shiva{ - dir = 8; - icon_state = "purplefull" - }, -/area/shiva/interior/colony/research_hab) -"X" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/curtain/black, -/turf/open/floor/shiva, -/area/shiva/interior/colony/research_hab) -"Z" = ( -/obj/structure/prop/dam/crane, -/turf/open/floor/shiva{ - icon_state = "multi_tiles" - }, -/area/shiva/interior/colony/research_hab) - -(1,1,1) = {" -I -I -I -I -I -I -I -"} -(2,1,1) = {" -u -Q -E -l -E -W -I -"} -(3,1,1) = {" -a -k -k -L -F -z -I -"} -(4,1,1) = {" -a -s -k -g -k -U -b -"} -(5,1,1) = {" -a -w -h -h -h -z -b -"} -(6,1,1) = {" -a -s -Z -c -h -z -X -"} -(7,1,1) = {" -a -S -k -h -k -z -b -"} -(8,1,1) = {" -a -k -k -T -F -U -I -"} -(9,1,1) = {" -u -t -f -B -f -e -I -"} -(10,1,1) = {" -I -I -I -I -I -I -I -"} diff --git a/maps/map_files/Ice_Colony_v3/sprinkles/35.south-spidercave_cleared.dmm b/maps/map_files/Ice_Colony_v3/sprinkles/35.south-spidercave_cleared.dmm deleted file mode 100644 index 5ae1484c7915..000000000000 --- a/maps/map_files/Ice_Colony_v3/sprinkles/35.south-spidercave_cleared.dmm +++ /dev/null @@ -1,877 +0,0 @@ -//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"af" = ( -/mob/living/simple_animal/hostile/giant_spider/hunter, -/turf/open/auto_turf/ice/layer1, -/area/shiva/interior/caves/left_spiders) -"aL" = ( -/obj/structure/prop/ice_colony/ground_wire, -/turf/open/auto_turf/ice/layer1, -/area/shiva/interior/caves/left_spiders) -"bL" = ( -/obj/structure/prop/ice_colony/ground_wire{ - dir = 1 - }, -/turf/open/auto_turf/ice/layer2, -/area/shiva/interior/caves/left_spiders) -"bP" = ( -/obj/structure/prop/static_tank/fuel, -/turf/open/floor/shiva{ - dir = 1 - }, -/area/shiva/interior/caves/left_spiders) -"cf" = ( -/obj/structure/prop/ice_colony/ground_wire{ - dir = 8 - }, -/turf/open/auto_turf/ice/layer1, -/area/shiva/interior/caves/left_spiders) -"cz" = ( -/obj/structure/prop/ice_colony/ground_wire, -/turf/open/auto_turf/ice/layer2, -/area/shiva/interior/caves/left_spiders) -"dS" = ( -/obj/structure/platform/strata{ - dir = 1 - }, -/obj/structure/platform/strata{ - dir = 8 - }, -/turf/open/gm/river, -/area/shiva/interior/caves/left_spiders) -"fd" = ( -/obj/structure/prop/ice_colony/ground_wire{ - dir = 8 - }, -/obj/item/lightstick/planted, -/turf/open/auto_turf/snow/layer0, -/area/shiva/interior/caves/cp_camp) -"ff" = ( -/obj/structure/barricade/handrail/wire, -/turf/open/auto_turf/ice/layer2, -/area/shiva/interior/caves/left_spiders) -"fj" = ( -/obj/structure/prop/ice_colony/ground_wire, -/turf/open/auto_turf/snow/layer0, -/area/shiva/interior/caves/cp_camp) -"gf" = ( -/obj/structure/ice/thin/single{ - opacity = 1; - unacidable = 0 - }, -/obj/structure/blocker/forcefield/multitile_vehicles, -/turf/open/auto_turf/ice/layer2, -/area/shiva/interior/caves/left_spiders) -"hY" = ( -/turf/open/auto_turf/ice/layer2, -/area/shiva/interior/caves/cp_camp) -"hZ" = ( -/obj/structure/prop/ice_colony/ground_wire{ - dir = 1 - }, -/turf/open/auto_turf/snow/layer0, -/area/shiva/interior/caves/cp_camp) -"ia" = ( -/obj/item/tool/pickaxe/diamond{ - desc = "So we back in the mine, swinging pickaxe from side to side, side side, to side." - }, -/turf/open/auto_turf/ice/layer1, -/area/shiva/interior/caves/left_spiders) -"jt" = ( -/obj/structure/prop/ice_colony/ground_wire{ - dir = 4 - }, -/obj/structure/prop/ice_colony/ground_wire{ - dir = 4 - }, -/turf/open/auto_turf/snow/layer0, -/area/shiva/interior/caves/cp_camp) -"jP" = ( -/obj/item/device/flashlight/lamp/tripod/grey, -/turf/open/auto_turf/ice/layer1, -/area/shiva/interior/caves/left_spiders) -"kW" = ( -/obj/structure/platform/strata{ - dir = 8 - }, -/obj/structure/platform/strata, -/turf/open/gm/river, -/area/shiva/interior/caves/left_spiders) -"lz" = ( -/obj/structure/barricade/handrail/wire{ - dir = 1 - }, -/turf/open/auto_turf/ice/layer1, -/area/shiva/interior/caves/left_spiders) -"lP" = ( -/obj/item/device/flashlight/lamp/tripod/grey, -/obj/structure/barricade/handrail/wire{ - dir = 1 - }, -/turf/open/auto_turf/ice/layer2, -/area/shiva/interior/caves/left_spiders) -"mC" = ( -/obj/effect/spider/stickyweb, -/turf/open/auto_turf/ice/layer2, -/area/shiva/interior/caves/left_spiders) -"oL" = ( -/obj/structure/prop/ice_colony/ground_wire{ - dir = 1 - }, -/turf/open/auto_turf/ice/layer1, -/area/shiva/interior/caves/left_spiders) -"pr" = ( -/turf/open/auto_turf/snow/layer0, -/area/shiva/interior/caves/cp_camp) -"rh" = ( -/obj/structure/barricade/handrail/wire, -/turf/open/auto_turf/ice/layer1, -/area/shiva/interior/caves/left_spiders) -"sA" = ( -/obj/effect/spider/stickyweb{ - icon_state = "stickyweb2" - }, -/turf/open/auto_turf/ice/layer1, -/area/shiva/interior/caves/left_spiders) -"tr" = ( -/obj/item/lightstick/red/spoke/planted{ - pixel_x = -16; - pixel_y = -3 - }, -/turf/open/auto_turf/ice/layer1, -/area/shiva/interior/caves/left_spiders) -"tF" = ( -/obj/effect/spider/cocoon{ - icon_state = "cocoon_large2" - }, -/turf/open/auto_turf/ice/layer1, -/area/shiva/interior/caves/left_spiders) -"tR" = ( -/obj/effect/spider/cocoon{ - icon_state = "cocoon_large1" - }, -/turf/open/auto_turf/ice/layer2, -/area/shiva/interior/caves/left_spiders) -"ug" = ( -/obj/effect/spider/cocoon, -/obj/effect/spider/stickyweb, -/turf/open/auto_turf/ice/layer1, -/area/shiva/interior/caves/left_spiders) -"vX" = ( -/obj/effect/decal/cleanable/blood/writing{ - dir = 9 - }, -/turf/open/auto_turf/ice/layer2, -/area/shiva/interior/caves/left_spiders) -"wj" = ( -/turf/closed/wall/shiva/ice, -/area/shiva/interior/caves/left_spiders) -"xx" = ( -/turf/open/auto_turf/ice/layer1, -/area/shiva/interior/caves/cp_camp) -"xy" = ( -/obj/structure/largecrate/random, -/turf/open/auto_turf/ice/layer1, -/area/shiva/interior/caves/left_spiders) -"xF" = ( -/obj/structure/surface/rack, -/obj/item/weapon/ice_axe/green{ - pixel_y = 4 - }, -/obj/item/weapon/ice_axe, -/obj/item/weapon/ice_axe/red{ - pixel_y = -4 - }, -/turf/open/floor/shiva{ - icon_state = "floor3" - }, -/area/shiva/interior/caves/left_spiders) -"xG" = ( -/obj/structure/largecrate/random/case/double, -/turf/open/floor/shiva{ - dir = 1 - }, -/area/shiva/interior/caves/left_spiders) -"yu" = ( -/turf/closed/wall/shiva/prefabricated/pink, -/area/shiva/interior/caves/left_spiders) -"yS" = ( -/obj/structure/largecrate/random/barrel/blue, -/turf/open/floor/shiva{ - dir = 1 - }, -/area/shiva/interior/caves/left_spiders) -"Am" = ( -/obj/effect/spider/cocoon, -/turf/open/auto_turf/ice/layer1, -/area/shiva/interior/caves/left_spiders) -"Ao" = ( -/obj/item/lightstick/planted, -/obj/structure/barricade/handrail/wire, -/turf/open/auto_turf/ice/layer1, -/area/shiva/interior/caves/left_spiders) -"Ar" = ( -/obj/structure/prop/static_tank, -/turf/open/floor/shiva{ - dir = 1 - }, -/area/shiva/interior/caves/left_spiders) -"AW" = ( -/obj/structure/barricade/handrail/wire{ - dir = 4 - }, -/obj/structure/prop/ice_colony/ground_wire, -/turf/open/auto_turf/ice/layer1, -/area/shiva/interior/caves/left_spiders) -"Br" = ( -/obj/effect/decal/cleanable/blood/writing{ - dir = 6 - }, -/turf/open/auto_turf/ice/layer2, -/area/shiva/interior/caves/left_spiders) -"By" = ( -/turf/closed/wall/shiva/ice, -/area/shiva/interior/oob) -"BH" = ( -/obj/item/lightstick/red/spoke/planted{ - pixel_x = -16; - pixel_y = -3 - }, -/turf/open/auto_turf/ice/layer2, -/area/shiva/interior/caves/left_spiders) -"BI" = ( -/obj/effect/decal/cleanable/blood/drip, -/turf/open/auto_turf/ice/layer1, -/area/shiva/interior/caves/cp_camp) -"FF" = ( -/obj/effect/decal/cleanable/blood/drip, -/turf/open/auto_turf/snow/layer0, -/area/shiva/interior/caves/cp_camp) -"FT" = ( -/turf/open/auto_turf/ice/layer2, -/area/shiva/interior/caves/left_spiders) -"Hm" = ( -/obj/structure/prop/ice_colony/surveying_device/measuring_device{ - pixel_y = -5 - }, -/turf/open/auto_turf/ice/layer1, -/area/shiva/interior/caves/left_spiders) -"Ie" = ( -/obj/item/lightstick/planted, -/turf/open/auto_turf/snow/layer0, -/area/shiva/interior/caves/cp_camp) -"IQ" = ( -/turf/open/auto_turf/ice/layer1, -/area/shiva/interior/caves/left_spiders) -"JM" = ( -/obj/structure/ice/thin/single{ - opacity = 1; - unacidable = 0 - }, -/turf/open/auto_turf/ice/layer2, -/area/shiva/interior/caves/left_spiders) -"Kd" = ( -/obj/effect/decal/cleanable/blood/writing, -/turf/open/auto_turf/ice/layer2, -/area/shiva/interior/caves/left_spiders) -"Kh" = ( -/obj/structure/prop/ice_colony/surveying_device, -/turf/open/auto_turf/ice/layer1, -/area/shiva/interior/caves/left_spiders) -"Kx" = ( -/obj/structure/platform/strata{ - dir = 1 - }, -/obj/structure/platform/strata{ - dir = 4 - }, -/turf/open/gm/river, -/area/shiva/interior/caves/left_spiders) -"MY" = ( -/obj/effect/spider/stickyweb{ - icon_state = "stickyweb2" - }, -/turf/open/auto_turf/ice/layer2, -/area/shiva/interior/caves/left_spiders) -"NP" = ( -/mob/living/simple_animal/hostile/giant_spider/hunter, -/turf/open/auto_turf/ice/layer2, -/area/shiva/interior/caves/left_spiders) -"NW" = ( -/obj/structure/ice/thin/single{ - opacity = 1; - unacidable = 0 - }, -/obj/structure/blocker/forcefield/multitile_vehicles, -/turf/open/auto_turf/ice/layer1, -/area/shiva/interior/caves/left_spiders) -"On" = ( -/obj/structure/barricade/handrail/wire{ - dir = 1 - }, -/obj/structure/prop/ice_colony/ground_wire{ - dir = 8 - }, -/turf/open/auto_turf/ice/layer1, -/area/shiva/interior/caves/left_spiders) -"OD" = ( -/obj/item/device/flashlight/lamp/tripod/grey, -/obj/structure/barricade/handrail/wire{ - dir = 4 - }, -/obj/structure/prop/ice_colony/ground_wire, -/turf/open/auto_turf/ice/layer1, -/area/shiva/interior/caves/left_spiders) -"Qs" = ( -/obj/item/device/flashlight/lamp/tripod/grey, -/turf/open/auto_turf/ice/layer2, -/area/shiva/interior/caves/left_spiders) -"SK" = ( -/obj/structure/barricade/handrail/wire{ - dir = 8; - layer = 2.991 - }, -/obj/structure/prop/ice_colony/ground_wire, -/turf/open/auto_turf/ice/layer1, -/area/shiva/interior/caves/left_spiders) -"Un" = ( -/obj/structure/prop/ice_colony/ground_wire{ - dir = 8 - }, -/turf/open/auto_turf/ice/layer2, -/area/shiva/interior/caves/left_spiders) -"Vc" = ( -/obj/structure/barricade/handrail/wire{ - dir = 8; - layer = 2.991 - }, -/turf/open/auto_turf/ice/layer1, -/area/shiva/interior/caves/left_spiders) -"Vm" = ( -/obj/item/lightstick/planted, -/turf/open/auto_turf/ice/layer2, -/area/shiva/interior/caves/left_spiders) -"VT" = ( -/obj/structure/platform/strata{ - dir = 4 - }, -/obj/structure/platform/strata, -/obj/structure/prop/ice_colony/dense/planter_box/hydro{ - density = 0; - pixel_x = -16; - pixel_y = 13 - }, -/turf/open/gm/river, -/area/shiva/interior/caves/left_spiders) -"Yi" = ( -/obj/item/lightstick/planted, -/turf/open/auto_turf/ice/layer1, -/area/shiva/interior/caves/left_spiders) -"ZL" = ( -/obj/effect/spider/stickyweb, -/turf/open/auto_turf/ice/layer1, -/area/shiva/interior/caves/left_spiders) - -(1,1,1) = {" -By -By -By -By -By -By -By -By -yu -yu -yu -By -By -By -By -By -By -By -By -By -By -By -"} -(2,1,1) = {" -By -By -By -By -By -By -By -FT -xF -yS -xG -IQ -IQ -By -By -By -By -By -By -By -IQ -By -"} -(3,1,1) = {" -By -By -By -By -By -By -By -FT -cz -IQ -IQ -Qs -IQ -By -By -By -sA -IQ -sA -IQ -sA -By -"} -(4,1,1) = {" -By -By -By -By -By -By -IQ -vX -Kd -IQ -IQ -IQ -Hm -IQ -IQ -JM -IQ -sA -af -sA -IQ -gf -"} -(5,1,1) = {" -By -By -By -By -By -By -IQ -Br -aL -IQ -IQ -Kh -IQ -Vm -ia -JM -IQ -sA -IQ -sA -IQ -gf -"} -(6,1,1) = {" -By -By -By -By -By -IQ -FT -IQ -AW -wj -wj -IQ -IQ -IQ -IQ -wj -wj -wj -wj -Am -ug -gf -"} -(7,1,1) = {" -By -By -By -By -IQ -IQ -IQ -Ao -dS -kW -wj -IQ -FT -xy -wj -wj -wj -wj -wj -wj -wj -wj -"} -(8,1,1) = {" -By -By -By -IQ -IQ -FT -IQ -rh -Kx -VT -lz -IQ -IQ -xy -wj -wj -wj -wj -wj -wj -wj -wj -"} -(9,1,1) = {" -By -By -FT -bL -IQ -IQ -IQ -tr -SK -Vc -IQ -IQ -FT -rh -dS -kW -wj -wj -wj -wj -wj -wj -"} -(10,1,1) = {" -By -IQ -FT -bL -Yi -IQ -IQ -IQ -IQ -IQ -IQ -IQ -FT -ff -Kx -VT -wj -wj -wj -ZL -ZL -wj -"} -(11,1,1) = {" -By -IQ -IQ -IQ -IQ -IQ -IQ -FT -aL -IQ -IQ -IQ -FT -BH -yu -wj -wj -sA -sA -FT -IQ -wj -"} -(12,1,1) = {" -By -IQ -IQ -oL -IQ -IQ -wj -wj -OD -IQ -IQ -IQ -IQ -IQ -yu -wj -JM -FT -FT -MY -IQ -NW -"} -(13,1,1) = {" -IQ -FT -Yi -oL -IQ -wj -wj -dS -kW -lP -IQ -IQ -IQ -FT -FT -IQ -JM -sA -sA -IQ -sA -NW -"} -(14,1,1) = {" -FT -IQ -IQ -oL -IQ -wj -wj -Kx -VT -yu -Ar -IQ -IQ -IQ -IQ -FT -JM -sA -af -sA -IQ -NW -"} -(15,1,1) = {" -FT -FT -FT -wj -wj -wj -wj -wj -wj -yu -bP -FT -IQ -IQ -Yi -IQ -JM -IQ -sA -IQ -sA -IQ -"} -(16,1,1) = {" -pr -xx -xx -wj -wj -wj -wj -wj -wj -dS -kW -lz -FT -IQ -IQ -jP -JM -sA -IQ -MY -NP -MY -"} -(17,1,1) = {" -hZ -xx -xx -wj -wj -wj -wj -wj -wj -Kx -VT -On -FT -IQ -IQ -IQ -wj -tR -MY -FT -mC -wj -"} -(18,1,1) = {" -pr -pr -xx -xx -wj -wj -wj -wj -wj -wj -wj -FT -oL -IQ -IQ -IQ -wj -tF -sA -sA -wj -wj -"} -(19,1,1) = {" -FF -fd -pr -xx -BI -xx -wj -wj -wj -wj -wj -Un -oL -cf -wj -wj -wj -wj -wj -wj -wj -wj -"} -(20,1,1) = {" -fj -hY -hZ -xx -xx -xx -xx -xx -wj -wj -IQ -FT -IQ -IQ -wj -wj -wj -wj -wj -wj -wj -wj -"} -(21,1,1) = {" -pr -jt -Ie -pr -pr -pr -xx -BI -xx -wj -FT -FT -IQ -wj -wj -wj -wj -wj -wj -wj -wj -wj -"} diff --git a/maps/map_files/LV624/LV624.dmm b/maps/map_files/LV624/LV624.dmm index e3733e802bb1..663fbf366027 100644 --- a/maps/map_files/LV624/LV624.dmm +++ b/maps/map_files/LV624/LV624.dmm @@ -12929,7 +12929,7 @@ /area/lv624/ground/colony/west_tcomms_road) "bTw" = ( /obj/effect/landmark/nightmare{ - insert_tag = "cargospecial" + insert_tag = "cargospecial1" }, /turf/open/floor/vault, /area/lv624/lazarus/quartstorage)