From 03f46e42923102fcca9dad9201da35d411de677f Mon Sep 17 00:00:00 2001 From: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com> Date: Sun, 24 Mar 2024 16:06:26 +0100 Subject: [PATCH] Infected IPCs Have Been Cured (#18735) * Infected IPCs Have Been Cured * Clinic Bodies * Fix Name Changes * Fixes --- aurorastation.dme | 6 +- .../modules/maps/planet_types/lore/konyang.dm | 26 +- html/changelogs/SleepyGemmy-cured.yml | 6 + .../konyang/konyang_wreck/konyang_wreck.dmm | 331 ++--- .../abandoned_outpost.dm} | 10 +- .../abandoned_outpost.dmm} | 105 +- .../abandoned_village.dm} | 12 +- .../abandoned_village.dmm} | 106 +- .../konyang/abandoned/rural_clinic.dmm | 150 +- .../konyang/infected_recovery_post.dm | 59 - .../konyang/infected_recovery_post.dmm | 1228 ----------------- .../exoplanets/konyang/stranded_police.dm | 2 +- .../exoplanets/konyang/stranded_police.dmm | 72 +- .../exoplanets/konyang/telecomms_outpost.dm | 2 +- .../exoplanets/konyang/village.dm | 2 +- .../exoplanets/konyang/zombies.dm | 19 - .../exoplanets/konyang/zombies.dmm | 1214 ---------------- 17 files changed, 283 insertions(+), 3067 deletions(-) create mode 100644 html/changelogs/SleepyGemmy-cured.yml rename maps/random_ruins/exoplanets/konyang/{zombie_outpost.dm => abandoned/abandoned_outpost.dm} (71%) rename maps/random_ruins/exoplanets/konyang/{zombie_outpost.dmm => abandoned/abandoned_outpost.dmm} (94%) rename maps/random_ruins/exoplanets/konyang/{zombie_village.dm => abandoned/abandoned_village.dm} (70%) rename maps/random_ruins/exoplanets/konyang/{zombie_village.dmm => abandoned/abandoned_village.dmm} (96%) delete mode 100644 maps/random_ruins/exoplanets/konyang/infected_recovery_post.dm delete mode 100644 maps/random_ruins/exoplanets/konyang/infected_recovery_post.dmm delete mode 100644 maps/random_ruins/exoplanets/konyang/zombies.dm delete mode 100644 maps/random_ruins/exoplanets/konyang/zombies.dmm diff --git a/aurorastation.dme b/aurorastation.dme index 26aedd24cbf..78c1443c5e6 100644 --- a/aurorastation.dme +++ b/aurorastation.dme @@ -3920,7 +3920,6 @@ #include "maps\random_ruins\exoplanets\konyang\hivebot_burrows_1.dm" #include "maps\random_ruins\exoplanets\konyang\hivebot_burrows_2.dm" #include "maps\random_ruins\exoplanets\konyang\homestead.dm" -#include "maps\random_ruins\exoplanets\konyang\infected_recovery_post.dm" #include "maps\random_ruins\exoplanets\konyang\jeweler_nest.dm" #include "maps\random_ruins\exoplanets\konyang\landing_zone.dm" #include "maps\random_ruins\exoplanets\konyang\pirate_moonshine.dm" @@ -3933,9 +3932,8 @@ #include "maps\random_ruins\exoplanets\konyang\telecomms_outpost.dm" #include "maps\random_ruins\exoplanets\konyang\tribute.dm" #include "maps\random_ruins\exoplanets\konyang\village.dm" -#include "maps\random_ruins\exoplanets\konyang\zombie_outpost.dm" -#include "maps\random_ruins\exoplanets\konyang\zombie_village.dm" -#include "maps\random_ruins\exoplanets\konyang\zombies.dm" +#include "maps\random_ruins\exoplanets\konyang\abandoned\abandoned_outpost.dm" +#include "maps\random_ruins\exoplanets\konyang\abandoned\abandoned_village.dm" #include "maps\random_ruins\exoplanets\konyang\abandoned\factory_arms.dm" #include "maps\random_ruins\exoplanets\konyang\abandoned\factory_refinery.dm" #include "maps\random_ruins\exoplanets\konyang\abandoned\factory_robotics.dm" diff --git a/code/modules/maps/planet_types/lore/konyang.dm b/code/modules/maps/planet_types/lore/konyang.dm index cf817fcbdcd..ca68fda333e 100644 --- a/code/modules/maps/planet_types/lore/konyang.dm +++ b/code/modules/maps/planet_types/lore/konyang.dm @@ -23,9 +23,27 @@ flora_diversity = 0 has_trees = FALSE ruin_planet_type = PLANET_LORE - ruin_type_whitelist = list(/datum/map_template/ruin/exoplanet/konyang_landing_zone, /datum/map_template/ruin/exoplanet/konyang_jeweler_nest, /datum/map_template/ruin/exoplanet/konyang_village, /datum/map_template/ruin/exoplanet/konyang_telecomms_outpost, /datum/map_template/ruin/exoplanet/pirate_outpost, /datum/map_template/ruin/exoplanet/pirate_moonshine, /datum/map_template/ruin/exoplanet/hivebot_burrows_1, /datum/map_template/ruin/exoplanet/hivebot_burrows_2, - /datum/map_template/ruin/exoplanet/konyang_fireoutpost, /datum/map_template/ruin/exoplanet/konyang_homestead, /datum/map_template/ruin/exoplanet/konyang_tribute, /datum/map_template/ruin/exoplanet/konyang_swamp_1, /datum/map_template/ruin/exoplanet/konyang_swamp_2, /datum/map_template/ruin/exoplanet/konyang_swamp_3, /datum/map_template/ruin/exoplanet/konyang_swamp_4, /datum/map_template/ruin/exoplanet/konyang_zombie_outpost, /datum/map_template/ruin/exoplanet/konyang_zombie_village, - /datum/map_template/ruin/exoplanet/konyang_zombies, /datum/map_template/ruin/exoplanet/konyang_lostcop, /datum/map_template/ruin/exoplanet/rural_clinic, /datum/map_template/ruin/exoplanet/infected_recovery_post) + ruin_type_whitelist = list( + /datum/map_template/ruin/exoplanet/konyang_landing_zone, + /datum/map_template/ruin/exoplanet/konyang_jeweler_nest, + /datum/map_template/ruin/exoplanet/konyang_village, + /datum/map_template/ruin/exoplanet/konyang_telecomms_outpost, + /datum/map_template/ruin/exoplanet/pirate_outpost, + /datum/map_template/ruin/exoplanet/pirate_moonshine, + /datum/map_template/ruin/exoplanet/hivebot_burrows_1, + /datum/map_template/ruin/exoplanet/hivebot_burrows_2, + /datum/map_template/ruin/exoplanet/konyang_fireoutpost, + /datum/map_template/ruin/exoplanet/konyang_homestead, + /datum/map_template/ruin/exoplanet/konyang_tribute, + /datum/map_template/ruin/exoplanet/konyang_swamp_1, + /datum/map_template/ruin/exoplanet/konyang_swamp_2, + /datum/map_template/ruin/exoplanet/konyang_swamp_3, + /datum/map_template/ruin/exoplanet/konyang_swamp_4, + /datum/map_template/ruin/exoplanet/konyang_abandoned_outpost, + /datum/map_template/ruin/exoplanet/konyang_abandoned_village, + /datum/map_template/ruin/exoplanet/konyang_lostcop, + /datum/map_template/ruin/exoplanet/rural_clinic + ) possible_themes = list(/datum/exoplanet_theme/konyang) place_near_main = list(1,0) var/landing_area @@ -69,7 +87,7 @@ switch(landing_area) if("overgrown wilderness within the Yakusoku Jungle.") possible_themes = list(/datum/exoplanet_theme/konyang) - ruin_type_whitelist = list (/datum/map_template/ruin/exoplanet/konyang_landing_zone, /datum/map_template/ruin/exoplanet/konyang_jeweler_nest, /datum/map_template/ruin/exoplanet/konyang_village, /datum/map_template/ruin/exoplanet/konyang_telecomms_outpost, /datum/map_template/ruin/exoplanet/pirate_outpost, /datum/map_template/ruin/exoplanet/pirate_moonshine, /datum/map_template/ruin/exoplanet/hivebot_burrows_1, /datum/map_template/ruin/exoplanet/hivebot_burrows_2, /datum/map_template/ruin/exoplanet/konyang_fireoutpost, /datum/map_template/ruin/exoplanet/konyang_homestead, /datum/map_template/ruin/exoplanet/konyang_tribute, /datum/map_template/ruin/exoplanet/konyang_swamp_1, /datum/map_template/ruin/exoplanet/konyang_swamp_2, /datum/map_template/ruin/exoplanet/konyang_swamp_3, /datum/map_template/ruin/exoplanet/konyang_swamp_4, /datum/map_template/ruin/exoplanet/konyang_zombie_outpost, /datum/map_template/ruin/exoplanet/konyang_zombie_village, /datum/map_template/ruin/exoplanet/konyang_zombies) + ruin_type_whitelist = list (/datum/map_template/ruin/exoplanet/konyang_landing_zone, /datum/map_template/ruin/exoplanet/konyang_jeweler_nest, /datum/map_template/ruin/exoplanet/konyang_village, /datum/map_template/ruin/exoplanet/konyang_telecomms_outpost, /datum/map_template/ruin/exoplanet/pirate_outpost, /datum/map_template/ruin/exoplanet/pirate_moonshine, /datum/map_template/ruin/exoplanet/hivebot_burrows_1, /datum/map_template/ruin/exoplanet/hivebot_burrows_2, /datum/map_template/ruin/exoplanet/konyang_fireoutpost, /datum/map_template/ruin/exoplanet/konyang_homestead, /datum/map_template/ruin/exoplanet/konyang_tribute, /datum/map_template/ruin/exoplanet/konyang_swamp_1, /datum/map_template/ruin/exoplanet/konyang_swamp_2, /datum/map_template/ruin/exoplanet/konyang_swamp_3, /datum/map_template/ruin/exoplanet/konyang_swamp_4, /datum/map_template/ruin/exoplanet/konyang_abandoned_outpost, /datum/map_template/ruin/exoplanet/konyang_abandoned_village) if("abandoned infrastructure in Han'ei Industrial Park, discontinued.") possible_themes = list(/datum/exoplanet_theme/konyang/abandoned) diff --git a/html/changelogs/SleepyGemmy-cured.yml b/html/changelogs/SleepyGemmy-cured.yml new file mode 100644 index 00000000000..5898f55a649 --- /dev/null +++ b/html/changelogs/SleepyGemmy-cured.yml @@ -0,0 +1,6 @@ +author: SleepyGemmy + +delete-after: True + +changes: + - maptweak: "Removed infected IPCs from maps, as per the event's resolution." diff --git a/maps/away/ships/konyang/konyang_wreck/konyang_wreck.dmm b/maps/away/ships/konyang/konyang_wreck/konyang_wreck.dmm index eec6cfa183f..fd00628d5b4 100644 --- a/maps/away/ships/konyang/konyang_wreck/konyang_wreck.dmm +++ b/maps/away/ships/konyang/konyang_wreck/konyang_wreck.dmm @@ -25,14 +25,6 @@ }, /turf/simulated/floor/tiled/dark, /area/konyang_wreck/pod8) -"am" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/fuel, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/mob/living/simple_animal/hostile/ipc_zombie, -/turf/simulated/floor/tiled/dark, -/area/konyang_wreck/atmos) "ao" = ( /obj/machinery/cryopod/robot, /obj/effect/floor_decal/industrial/outline/yellow, @@ -145,13 +137,6 @@ "bi" = ( /turf/simulated/floor/plating, /area/konyang_wreck/portthrust) -"bl" = ( -/obj/effect/floor_decal/corner/brown{ - dir = 6 - }, -/mob/living/simple_animal/hostile/ipc_zombie, -/turf/simulated/floor/tiled/dark, -/area/konyang_wreck) "br" = ( /obj/item/circuitboard/aicore, /turf/simulated/floor/greengrid, @@ -245,11 +230,6 @@ /obj/machinery/door/window/southleft, /turf/simulated/floor/tiled/dark, /area/konyang_wreck/pod4) -"bQ" = ( -/obj/effect/floor_decal/corner/green/diagonal, -/mob/living/simple_animal/hostile/ipc_zombie, -/turf/simulated/floor/tiled/dark, -/area/konyang_wreck/cryo) "bS" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/mech_recharger, @@ -275,7 +255,6 @@ d2 = 8; icon_state = "4-8" }, -/mob/living/simple_animal/hostile/ipc_zombie, /turf/simulated/floor/tiled/dark, /area/konyang_wreck/engineering) "cf" = ( @@ -731,13 +710,6 @@ /obj/effect/overlay/container_logo/zenghu, /turf/simulated/floor/tiled/dark, /area/konyang_wreck/pod7) -"fl" = ( -/obj/machinery/light{ - dir = 1 - }, -/mob/living/simple_animal/hostile/ipc_zombie, -/turf/simulated/floor/tiled/dark, -/area/konyang_wreck) "fm" = ( /obj/effect/floor_decal/industrial/outline/grey, /obj/machinery/vending/cola, @@ -803,10 +775,16 @@ "fY" = ( /turf/simulated/wall/shuttle/dark/cardinal/merc, /area/konyang_wreck/starboarddock) +"gb" = ( +/obj/effect/landmark/corpse/ipc_zombie, +/obj/effect/decal/cleanable/blood/oil, +/turf/simulated/floor/tiled/dark, +/area/konyang_wreck) "gf" = ( /obj/machinery/atmospherics/unary/vent_pump/on, /obj/effect/floor_decal/industrial/hatch/grey, -/mob/living/simple_animal/hostile/ipc_zombie, +/obj/effect/landmark/corpse/ipc_zombie, +/obj/effect/decal/cleanable/blood/oil, /turf/simulated/floor/tiled/dark, /area/konyang_wreck/pod4) "gk" = ( @@ -876,7 +854,8 @@ "gF" = ( /obj/machinery/hologram/holopad/long_range, /obj/effect/overmap/visitable/ship/konyang_wreck, -/mob/living/simple_animal/hostile/ipc_zombie, +/obj/effect/landmark/corpse/ipc_zombie, +/obj/effect/decal/cleanable/blood/oil, /turf/simulated/floor/tiled/dark, /area/konyang_wreck/bridge) "gH" = ( @@ -1029,7 +1008,6 @@ "hR" = ( /obj/effect/floor_decal/industrial/outline/grey, /obj/effect/decal/cleanable/blood/splatter, -/mob/living/simple_animal/hostile/ipc_zombie, /turf/simulated/floor/tiled/dark, /area/konyang_wreck/pod5) "hT" = ( @@ -1077,7 +1055,6 @@ /obj/machinery/alarm/west{ req_one_access = null }, -/mob/living/simple_animal/hostile/ipc_zombie, /turf/simulated/floor/tiled/dark, /area/konyang_wreck/pod5) "ib" = ( @@ -1450,7 +1427,6 @@ /area/konyang_wreck/pod6) "lp" = ( /obj/effect/decal/cleanable/blood/splatter, -/mob/living/simple_animal/hostile/ipc_zombie, /turf/simulated/floor/tiled/dark, /area/konyang_wreck/pod5) "lv" = ( @@ -1498,11 +1474,6 @@ /obj/structure/bed/handrail, /turf/template_noop, /area/space) -"lV" = ( -/obj/effect/floor_decal/industrial/hatch/grey, -/mob/living/simple_animal/hostile/ipc_zombie, -/turf/simulated/floor/tiled/dark, -/area/konyang_wreck/pod2) "mk" = ( /obj/structure/shipping_container{ icon_state = "red1" @@ -1575,6 +1546,11 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/dark, /area/konyang_wreck/atmos) +"mV" = ( +/obj/effect/landmark/corpse/ipc_zombie, +/obj/effect/decal/cleanable/blood/oil, +/turf/simulated/floor/tiled/dark, +/area/konyang_wreck/starboarddock) "mX" = ( /obj/effect/landmark/entry_point/port{ name = "port, pod 2" @@ -1602,27 +1578,16 @@ dir = 1 }, /obj/effect/floor_decal/industrial/hatch/grey, -/mob/living/simple_animal/hostile/ipc_zombie, +/obj/effect/landmark/corpse/ipc_zombie, +/obj/effect/decal/cleanable/blood/oil, /turf/simulated/floor/tiled/dark, /area/konyang_wreck/pod4) -"ne" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, -/mob/living/simple_animal/hostile/ipc_zombie, -/turf/simulated/floor/tiled/dark, -/area/konyang_wreck) "ng" = ( /obj/structure/bed/stool/chair/office/dark{ dir = 8 }, /turf/simulated/floor/tiled/dark, /area/konyang_wreck/pod3) -"nm" = ( -/obj/machinery/atmospherics/pipe/simple/hidden, -/mob/living/simple_animal/hostile/ipc_zombie, -/turf/simulated/floor/tiled/dark, -/area/konyang_wreck/engineering) "no" = ( /obj/machinery/atmospherics/unary/vent_pump/on, /obj/effect/floor_decal/industrial/hatch/grey, @@ -1723,11 +1688,6 @@ }, /turf/simulated/floor/tiled/dark, /area/konyang_wreck/pod7) -"oo" = ( -/obj/effect/floor_decal/industrial/hatch/grey, -/mob/living/simple_animal/hostile/ipc_zombie, -/turf/simulated/floor/tiled/dark, -/area/konyang_wreck/pod4) "op" = ( /turf/simulated/wall/shuttle/dark/cardinal/merc, /area/konyang_wreck/pod8) @@ -1951,22 +1911,6 @@ }, /turf/simulated/floor/plating, /area/konyang_wreck/bridge) -"qr" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/lattice/catwalk/indoor/grate, -/mob/living/simple_animal/hostile/ipc_zombie, -/turf/simulated/floor/plating, -/area/konyang_wreck/pod2) "qw" = ( /obj/structure/shipping_container{ icon_state = "blue2" @@ -2370,6 +2314,12 @@ }, /turf/simulated/floor/plating, /area/konyang_wreck/bridge) +"tH" = ( +/obj/effect/floor_decal/industrial/hatch/grey, +/obj/effect/landmark/corpse/ipc_zombie, +/obj/effect/decal/cleanable/blood/oil, +/turf/simulated/floor/tiled/dark, +/area/konyang_wreck/pod2) "tQ" = ( /obj/structure/cable/green{ d1 = 4; @@ -2502,22 +2452,6 @@ }, /turf/simulated/floor/plating, /area/konyang_wreck/starbthrust) -"uW" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/lattice/catwalk/indoor/grate, -/mob/living/simple_animal/hostile/ipc_zombie, -/turf/simulated/floor/plating, -/area/konyang_wreck/pod8) "uY" = ( /obj/machinery/light{ dir = 8; @@ -3153,6 +3087,12 @@ }, /turf/simulated/floor/plating, /area/konyang_wreck/captain) +"Af" = ( +/obj/effect/floor_decal/industrial/outline/grey, +/obj/effect/landmark/corpse/ipc_zombie, +/obj/effect/decal/cleanable/blood/oil, +/turf/simulated/floor/tiled/dark, +/area/konyang_wreck/pod2) "Ai" = ( /obj/structure/window/reinforced{ dir = 8 @@ -3366,6 +3306,11 @@ /obj/structure/shipping_container, /turf/simulated/floor/tiled/dark, /area/konyang_wreck/pod8) +"BO" = ( +/obj/effect/landmark/corpse/ipc_zombie, +/obj/effect/decal/cleanable/blood/oil, +/turf/simulated/floor/tiled/dark, +/area/konyang_wreck/pod5) "BQ" = ( /obj/machinery/atmospherics/unary/engine, /obj/effect/landmark/entry_point/aft{ @@ -3374,10 +3319,6 @@ /obj/structure/window/borosilicate/reinforced, /turf/simulated/floor/plating, /area/konyang_wreck/starbthrust) -"BU" = ( -/mob/living/simple_animal/hostile/ipc_zombie, -/turf/simulated/floor/tiled/dark, -/area/konyang_wreck) "Cb" = ( /obj/effect/floor_decal/corner/dark_blue{ dir = 6 @@ -3421,6 +3362,10 @@ }, /turf/simulated/floor/tiled/dark, /area/konyang_wreck/bridge) +"Cz" = ( +/obj/effect/landmark/corpse/ipc_zombie, +/turf/simulated/floor/tiled/dark, +/area/konyang_wreck/atmos) "CB" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 @@ -3590,11 +3535,6 @@ "Ea" = ( /turf/simulated/wall/shuttle/dark/cardinal/merc, /area/konyang_wreck/pod6) -"El" = ( -/obj/structure/lattice/catwalk/indoor/grate, -/mob/living/simple_animal/hostile/ipc_zombie, -/turf/simulated/floor/plating, -/area/konyang_wreck/pod2) "Ep" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -4199,6 +4139,14 @@ }, /turf/simulated/floor/plating, /area/konyang_wreck/pod4) +"KB" = ( +/obj/effect/floor_decal/corner/brown{ + dir = 10 + }, +/obj/effect/landmark/corpse/ipc_zombie, +/obj/effect/decal/cleanable/blood/oil, +/turf/simulated/floor/tiled/dark, +/area/konyang_wreck) "KJ" = ( /obj/structure/shipping_container{ icon_state = "grey3" @@ -4361,6 +4309,11 @@ /obj/effect/overlay/container_logo, /turf/simulated/floor/tiled/dark, /area/konyang_wreck/pod6) +"Mo" = ( +/obj/effect/landmark/corpse/ipc_zombie, +/obj/effect/decal/cleanable/blood/oil, +/turf/simulated/floor/tiled/dark, +/area/konyang_wreck/portdock) "Mp" = ( /obj/effect/floor_decal/corner/brown{ dir = 10 @@ -4394,16 +4347,6 @@ /obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, /area/konyang_wreck) -"MC" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/lattice/catwalk/indoor/grate, -/mob/living/simple_animal/hostile/ipc_zombie, -/turf/simulated/floor/plating, -/area/konyang_wreck/pod6) "MI" = ( /obj/structure/shipping_container{ icon_state = "red3" @@ -4571,9 +4514,16 @@ /turf/simulated/floor/tiled/dark, /area/konyang_wreck/pod5) "NU" = ( -/mob/living/simple_animal/hostile/ipc_zombie, -/turf/simulated/floor/tiled/dark, -/area/konyang_wreck/pod5) +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/lattice/catwalk/indoor/grate, +/obj/effect/landmark/corpse/ipc_zombie, +/obj/effect/decal/cleanable/blood/oil, +/turf/simulated/floor/plating, +/area/konyang_wreck/pod4) "NW" = ( /obj/effect/floor_decal/industrial/outline/grey, /obj/machinery/vending/coffee, @@ -4710,7 +4660,6 @@ dir = 1 }, /obj/effect/floor_decal/industrial/hatch/grey, -/mob/living/simple_animal/hostile/ipc_zombie, /turf/simulated/floor/tiled/dark, /area/konyang_wreck/pod2) "OW" = ( @@ -5143,22 +5092,6 @@ "SK" = ( /turf/simulated/floor/tiled/dark, /area/konyang_wreck/bridge) -"SL" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/lattice/catwalk/indoor/grate, -/mob/living/simple_animal/hostile/ipc_zombie, -/turf/simulated/floor/plating, -/area/konyang_wreck/pod6) "SP" = ( /obj/structure/table/steel, /obj/item/modular_computer/laptop/preset/command, @@ -5308,6 +5241,18 @@ /obj/machinery/atmospherics/pipe/manifold4w/hidden/red, /turf/simulated/floor/plating, /area/konyang_wreck/starbthrust) +"Uk" = ( +/obj/machinery/light{ + dir = 4; + icon_state = "tube_empty" + }, +/obj/effect/floor_decal/corner/brown{ + dir = 6 + }, +/obj/effect/landmark/corpse/ipc_zombie, +/obj/effect/decal/cleanable/blood/oil, +/turf/simulated/floor/tiled/dark, +/area/konyang_wreck) "Ul" = ( /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ dir = 1 @@ -5758,6 +5703,12 @@ /obj/effect/floor_decal/industrial/hatch/grey, /turf/simulated/floor/tiled/dark, /area/konyang_wreck/pod3) +"Yu" = ( +/obj/effect/floor_decal/industrial/hatch/grey, +/obj/effect/landmark/corpse/ipc_zombie, +/obj/effect/decal/cleanable/blood/oil, +/turf/simulated/floor/tiled/dark, +/area/konyang_wreck/pod4) "YD" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -31188,7 +31139,7 @@ JO Ij hZ Th -NU +Ij Iz JO JO @@ -34307,7 +34258,7 @@ Xr rr bb bb -bb +mV gJ DS YK @@ -35790,7 +35741,7 @@ cf qI sb qI -am +sb mY Dx jE @@ -36068,7 +36019,7 @@ Dl ks JO JO -Ij +BO te Aq hR @@ -36355,7 +36306,7 @@ kH ks Ye Vv -AE +KB Ye ks uj @@ -36565,7 +36516,7 @@ tj tj tj le -tj +Cz PF TY kH @@ -36818,7 +36769,7 @@ Rj Fx Ur eK -tj +Cz tj tj le @@ -37591,7 +37542,7 @@ vH qC qC dq -fl +Os rg Pj Ye @@ -37640,7 +37591,7 @@ Yk MM MM Vv -BU +Pj rm sg uj @@ -37848,17 +37799,27 @@ vH fK Fn dq -BU +Pj rg Pj Ye dA -Pj +gb Pj Pj CB Pj -BU +Pj +NP +Pj +Pj +dA +Pj +gb +Pj +CB +Pj +Pj NP Pj Pj @@ -37873,19 +37834,9 @@ NP Pj Pj dA -Pj -BU -Pj -CB -Pj -Pj -NP -Pj -BU -dA gA Pj -Pj +gb CB Pj Pj @@ -37895,7 +37846,7 @@ Pj Pj dA Pj -BU +Pj Vv Jd Pj @@ -38362,7 +38313,7 @@ vH br aO dq -BU +Pj HD Pj Ye @@ -38381,7 +38332,7 @@ Pj Pj Pj zq -BU +Pj Pj Xs Pj @@ -38395,9 +38346,9 @@ Pj Pj Xs Pj -Pj +gb ux -BU +gb Pj gA zq @@ -38411,7 +38362,7 @@ ux Pj Pj Vv -ne +zq Pj Tl Ye @@ -38628,7 +38579,7 @@ je zc Cd Cd -je +Uk Cd ef Cd @@ -38654,7 +38605,7 @@ ef Cd Cd je -bl +Cd Cd Cd je @@ -39144,7 +39095,7 @@ ks ks ks KV -uW +rt KV ks ks @@ -39191,7 +39142,7 @@ SJ zQ uZ ZY -bQ +SJ SJ TE YT @@ -39688,7 +39639,7 @@ kH kH kH YU -qr +eg YU kH kH @@ -39696,7 +39647,7 @@ kH ks Ye YD -AE +KB Ye ks dW @@ -39904,7 +39855,7 @@ yv yv yv dN -nm +AZ Vl AZ yI @@ -40461,7 +40412,7 @@ II rA eg QR -QR +Af QR Ks ks @@ -40972,9 +40923,9 @@ ks Ks oa AT -El +AT eg -El +AT AT Re Ks @@ -41229,9 +41180,9 @@ ks Ks Nu Nu -zF +tH eg -zF +tH Nu Nu Ks @@ -41486,9 +41437,9 @@ ks Ks Nu Nu -zF +tH eg -zF +tH Nu Nu Ks @@ -41743,9 +41694,9 @@ ks Ks Nu Nu -lV +tH eg -zF +tH Nu Nu Ks @@ -41981,7 +41932,7 @@ Ea zy ln ln -SL +Vn ln ln pl @@ -42017,7 +41968,7 @@ IG Zl eY en -eY +Mo qU vz tt @@ -42247,9 +42198,9 @@ ks zL CK CK -oo +Yu ff -oo +Yu CK CK zL @@ -42257,7 +42208,7 @@ ks Ks Nu Nu -zF +tH eg zF Nu @@ -42761,9 +42712,9 @@ ks zL CK CK -oo +Yu dE -oo +Yu CK CK zL @@ -42771,9 +42722,9 @@ ks Ks Nu Nu -zF +tH FY -zF +tH Nu Nu Ks @@ -43028,7 +42979,7 @@ ks Ks oa AT -El +AT FY AT AT @@ -43266,7 +43217,7 @@ Ea Oq Oq tR -MC +Hq tR XX xo @@ -43276,7 +43227,7 @@ zL rJ Zv Nb -dE +NU Nb rJ Ng @@ -43285,7 +43236,7 @@ ks Ks kt mk -zF +tH FY zF kt @@ -43532,7 +43483,7 @@ ks zL rJ rI -Nb +Yu dE Nb rJ @@ -43544,7 +43495,7 @@ kt EB zF FY -zF +tH kt EB Ks @@ -44303,7 +44254,7 @@ ks zL CK CK -Nb +Yu dE Nb rJ @@ -44560,7 +44511,7 @@ ks zL CK CK -Nb +Yu dE Nb rJ @@ -44817,7 +44768,7 @@ ks zL CK CK -Nb +Yu dE Nb rJ diff --git a/maps/random_ruins/exoplanets/konyang/zombie_outpost.dm b/maps/random_ruins/exoplanets/konyang/abandoned/abandoned_outpost.dm similarity index 71% rename from maps/random_ruins/exoplanets/konyang/zombie_outpost.dm rename to maps/random_ruins/exoplanets/konyang/abandoned/abandoned_outpost.dm index 9e68b0c12a4..1aa60b31916 100644 --- a/maps/random_ruins/exoplanets/konyang/zombie_outpost.dm +++ b/maps/random_ruins/exoplanets/konyang/abandoned/abandoned_outpost.dm @@ -1,11 +1,11 @@ -/datum/map_template/ruin/exoplanet/konyang_zombie_outpost - name = "Konyang Telecomms Outpost - Zombies" - id = "konyang_zombie_outpost" - description = "A remote telecommunications relay, assaulted by infected IPCs." +/datum/map_template/ruin/exoplanet/konyang_abandoned_outpost + name = "Konyang Telecomms Outpost - Abandoned" + id = "konyang_abandoned_outpost" + description = "A remote telecommunications relay, abandoned for any reason." template_flags = TEMPLATE_FLAG_NO_RUINS|TEMPLATE_FLAG_RUIN_STARTS_DISALLOWED sectors = list(SECTOR_HANEUNIM) - suffixes = list("konyang/zombie_outpost.dmm") + suffixes = list("konyang/abandoned_outpost.dmm") ban_ruins = list(/datum/map_template/ruin/exoplanet/konyang_telecomms_outpost) /obj/effect/landmark/corpse/konyang_army diff --git a/maps/random_ruins/exoplanets/konyang/zombie_outpost.dmm b/maps/random_ruins/exoplanets/konyang/abandoned/abandoned_outpost.dmm similarity index 94% rename from maps/random_ruins/exoplanets/konyang/zombie_outpost.dmm rename to maps/random_ruins/exoplanets/konyang/abandoned/abandoned_outpost.dmm index f66f156b4a2..a86263a8d38 100644 --- a/maps/random_ruins/exoplanets/konyang/zombie_outpost.dmm +++ b/maps/random_ruins/exoplanets/konyang/abandoned/abandoned_outpost.dmm @@ -33,15 +33,6 @@ }, /turf/simulated/floor/exoplanet/asphalt, /area/konyang_telecomms_outpost) -"bm" = ( -/obj/effect/landmark/corpse/konyang_army, -/obj/effect/decal/cleanable/blood/splatter, -/obj/item/ammo_casing/a556/spent, -/obj/item/ammo_casing/a556/spent, -/obj/item/ammo_casing/a556/spent, -/obj/item/ammo_casing/a556/spent, -/turf/simulated/floor/exoplanet/dirt_konyang, -/area/konyang_telecomms_outpost) "bn" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -86,7 +77,6 @@ /obj/structure/bed/stool/chair/office/dark{ dir = 8 }, -/obj/effect/decal/cleanable/blood/splatter, /turf/simulated/floor/exoplanet/tiled, /area/konyang_telecomms_outpost) "dB" = ( @@ -104,11 +94,6 @@ }, /turf/simulated/floor/exoplanet/tiled, /area/konyang_telecomms_outpost) -"er" = ( -/obj/structure/flora/bush/konyang_reeds, -/mob/living/simple_animal/hostile/ipc_zombie, -/turf/simulated/floor/exoplanet/konyang, -/area/konyang_telecomms_outpost) "eE" = ( /obj/structure/sign/flag/konyang/large/south, /turf/simulated/floor/exoplanet/dirt_konyang, @@ -257,10 +242,6 @@ /obj/structure/flora/rock/konyang/water, /turf/simulated/floor/exoplanet/water/shallow/konyang, /area/konyang_telecomms_outpost) -"mb" = ( -/obj/item/gun/projectile/automatic/rifle/konyang/konyang47, -/turf/simulated/floor/exoplanet/dirt_konyang, -/area/konyang_telecomms_outpost) "mh" = ( /turf/simulated/floor/exoplanet/tiled/white, /area/konyang_telecomms_outpost) @@ -279,14 +260,9 @@ }, /turf/simulated/floor/exoplanet/tiled, /area/konyang_telecomms_outpost) -"mY" = ( -/mob/living/simple_animal/hostile/ipc_zombie, -/turf/simulated/floor/exoplanet/tiled, -/area/konyang_telecomms_outpost) "ni" = ( /obj/structure/flora/bush/konyang_reeds, /obj/item/ammo_casing/a556/spent, -/mob/living/simple_animal/hostile/ipc_zombie, /turf/simulated/floor/exoplanet/konyang, /area/konyang_telecomms_outpost) "nj" = ( @@ -319,10 +295,6 @@ }, /turf/simulated/floor/exoplanet/asphalt, /area/konyang_telecomms_outpost) -"nH" = ( -/obj/effect/decal/cleanable/blood/splatter, -/turf/simulated/floor/exoplanet/lino/diamond, -/area/konyang_telecomms_outpost) "ok" = ( /turf/simulated/floor/exoplanet/water/shallow/konyang, /area/konyang_telecomms_outpost) @@ -379,10 +351,6 @@ }, /turf/simulated/floor/exoplanet/tiled, /area/konyang_telecomms_outpost) -"rc" = ( -/mob/living/simple_animal/hostile/ipc_zombie, -/turf/simulated/floor/exoplanet/konyang, -/area/konyang_telecomms_outpost) "rm" = ( /obj/effect/decal/road_marking/thin, /obj/machinery/mech_recharger/automobile, @@ -432,15 +400,6 @@ "tE" = ( /turf/simulated/floor/plating, /area/konyang_telecomms_outpost) -"tR" = ( -/obj/effect/landmark/corpse/konyang_army, -/obj/effect/decal/cleanable/blood/splatter, -/obj/item/gun/projectile/automatic/rifle/konyang/konyang47, -/obj/item/ammo_casing/a556/spent, -/obj/item/ammo_casing/a556/spent, -/obj/item/ammo_casing/a556/spent, -/turf/simulated/floor/exoplanet/dirt_konyang, -/area/konyang_telecomms_outpost) "ui" = ( /obj/structure/closet/secure_closet/guncabinet{ req_access = null @@ -619,7 +578,6 @@ /obj/item/ammo_casing/a556/spent, /obj/item/ammo_casing/a556/spent, /obj/item/ammo_casing/a556/spent, -/mob/living/simple_animal/hostile/ipc_zombie, /turf/simulated/floor/exoplanet/dirt_konyang, /area/konyang_telecomms_outpost) "Ac" = ( @@ -896,7 +854,6 @@ /area/konyang_telecomms_outpost) "Ki" = ( /obj/machinery/door/window/eastright, -/mob/living/simple_animal/hostile/ipc_zombie, /turf/simulated/floor/bluegrid/cooled, /area/konyang_telecomms_outpost) "Ks" = ( @@ -931,11 +888,6 @@ /obj/effect/decal/cleanable/blood/oil, /turf/simulated/floor/exoplanet/konyang, /area/konyang_telecomms_outpost) -"LZ" = ( -/obj/structure/flora/bush/konyang_reeds, -/obj/effect/decal/cleanable/blood/splatter, -/turf/simulated/floor/exoplanet/konyang, -/area/konyang_telecomms_outpost) "MM" = ( /obj/effect/decal/fake_object{ icon_state = "hub"; @@ -948,8 +900,9 @@ /turf/simulated/wall/concrete, /area/konyang_telecomms_outpost) "NO" = ( -/mob/living/simple_animal/hostile/ipc_zombie, -/turf/simulated/floor/exoplanet/wood, +/obj/structure/flora/bush/konyang_reeds, +/obj/effect/landmark/corpse/ipc_zombie, +/turf/simulated/floor/exoplanet/konyang, /area/konyang_telecomms_outpost) "NR" = ( /obj/structure/sink{ @@ -1059,7 +1012,6 @@ "Sm" = ( /obj/item/material/shard, /obj/item/material/shard, -/obj/effect/decal/cleanable/blood/splatter, /obj/item/ammo_casing/a556/spent, /obj/item/ammo_casing/a556/spent, /obj/item/ammo_casing/a556/spent, @@ -1085,10 +1037,6 @@ }, /turf/simulated/floor/exoplanet/tiled, /area/konyang_telecomms_outpost) -"UA" = ( -/mob/living/simple_animal/hostile/ipc_zombie, -/turf/simulated/floor/exoplanet/dirt_konyang, -/area/konyang_telecomms_outpost) "UC" = ( /obj/structure/bed/stool/padded/brown{ dir = 1 @@ -1135,14 +1083,6 @@ /obj/item/material/kitchen/rollingpin, /turf/simulated/floor/exoplanet/lino/diamond, /area/konyang_telecomms_outpost) -"Yp" = ( -/obj/structure/window/reinforced{ - dir = 8; - maxhealth = 140 - }, -/mob/living/simple_animal/hostile/ipc_zombie, -/turf/simulated/floor/bluegrid/cooled, -/area/konyang_telecomms_outpost) "Yx" = ( /obj/item/ammo_casing/a556/spent, /obj/item/ammo_casing/a556/spent, @@ -1155,7 +1095,6 @@ /obj/item/ammo_casing/a556/spent, /obj/item/ammo_casing/a556/spent, /obj/item/ammo_casing/a556/spent, -/mob/living/simple_animal/hostile/ipc_zombie, /turf/simulated/floor/exoplanet/konyang, /area/konyang_telecomms_outpost) "YF" = ( @@ -1674,7 +1613,7 @@ sg sg sg bM -Ze +NO FA FA sg @@ -1718,7 +1657,7 @@ sg sg sg FA -UA +FA bM sg sg @@ -1789,7 +1728,7 @@ bM oJ sg sg -er +sg sg sg sg @@ -1834,7 +1773,7 @@ bM bM ym bM -LZ +sg sg sg bM @@ -1847,7 +1786,7 @@ pT FA bM sg -er +sg sg sg bM @@ -1921,7 +1860,7 @@ FA bM bM bM -LZ +sg sg sg sg @@ -1963,7 +1902,7 @@ bM bM bM bM -rc +bM bM bM bM @@ -2004,8 +1943,8 @@ FA fh FA FA -mb -bm +FA +pT FA FA FA @@ -2018,7 +1957,7 @@ FA Fo FA Qc -tR +zO un lp lp @@ -2036,7 +1975,7 @@ bM (21,1,1) = {" FA FA -UA +FA FA ar FA @@ -2046,7 +1985,7 @@ FA FA FA FA -UA +FA zO FA FA @@ -2109,7 +2048,7 @@ qX zI zv iN -Yp +Sc ts Sc FV @@ -2207,7 +2146,7 @@ sg bM bM Ns -mY +lp lp Ns bM @@ -2308,7 +2247,7 @@ sg sg sg FA -UA +FA sg sg bM @@ -2384,7 +2323,7 @@ fW iT iT iT -nH +iT iT fW sE @@ -2475,7 +2414,7 @@ bM bM sg bM -UA +FA FA sg sg @@ -2553,7 +2492,7 @@ Ks Dv Zj UC -NO +BP uU FA FA @@ -2729,7 +2668,7 @@ sg sg sg sg -rc +bM sg sg ok diff --git a/maps/random_ruins/exoplanets/konyang/zombie_village.dm b/maps/random_ruins/exoplanets/konyang/abandoned/abandoned_village.dm similarity index 70% rename from maps/random_ruins/exoplanets/konyang/zombie_village.dm rename to maps/random_ruins/exoplanets/konyang/abandoned/abandoned_village.dm index 360501a7476..a8118cd2ae8 100644 --- a/maps/random_ruins/exoplanets/konyang/zombie_village.dm +++ b/maps/random_ruins/exoplanets/konyang/abandoned/abandoned_village.dm @@ -1,11 +1,11 @@ -/datum/map_template/ruin/exoplanet/konyang_zombie_village - name = "Konyang Infected Village" - id = "konyang_zombie_village" - description = "A rural village on Konyang, overcome by infected synthetics." +/datum/map_template/ruin/exoplanet/konyang_abandoned_village + name = "Konyang Abandoned Village" + id = "konyang_abandoned_village" + description = "A rural village on Konyang, abandoned for any reason." template_flags = TEMPLATE_FLAG_NO_RUINS|TEMPLATE_FLAG_RUIN_STARTS_DISALLOWED sectors = list(SECTOR_HANEUNIM) - suffixes = list("konyang/zombie_village.dmm") + suffixes = list("konyang/abandoned_village.dmm") ban_ruins = list(/datum/map_template/ruin/exoplanet/konyang_village) /obj/effect/landmark/corpse/konyang_villager @@ -18,6 +18,6 @@ /obj/effect/landmark/corpse/konyang_villager/do_extra_customization(mob/living/carbon/human/M) if(prob(25)) M.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/hooded/wintercoat/konyang(M), slot_wear_suit) - M.adjustBruteLoss(rand(200,400)) + M.adjustBruteLoss(rand(200, 400)) M.change_skin_tone(rand(0, 100)) M.dir = pick(GLOB.cardinal) diff --git a/maps/random_ruins/exoplanets/konyang/zombie_village.dmm b/maps/random_ruins/exoplanets/konyang/abandoned/abandoned_village.dmm similarity index 96% rename from maps/random_ruins/exoplanets/konyang/zombie_village.dmm rename to maps/random_ruins/exoplanets/konyang/abandoned/abandoned_village.dmm index 2aefe49f718..835587fa62d 100644 --- a/maps/random_ruins/exoplanets/konyang/zombie_village.dmm +++ b/maps/random_ruins/exoplanets/konyang/abandoned/abandoned_village.dmm @@ -215,8 +215,8 @@ "hM" = ( /obj/random/dirt_75, /obj/random/dirt_75, -/obj/effect/decal/cleanable/blood/splatter, -/obj/effect/landmark/corpse/konyang_villager, +/obj/effect/landmark/corpse/ipc_zombie, +/obj/effect/decal/cleanable/blood/oil, /turf/simulated/floor/exoplanet/sidewalk, /area/konyang_village) "hP" = ( @@ -575,7 +575,6 @@ pixel_y = -11; pixel_x = -4 }, -/mob/living/simple_animal/hostile/ipc_zombie, /turf/simulated/floor/exoplanet/sidewalk/blocks, /area/konyang_village) "tD" = ( @@ -616,11 +615,6 @@ /obj/item/material/shard, /turf/simulated/floor/exoplanet/lino/diamond, /area/konyang_village) -"uV" = ( -/obj/effect/decal/cleanable/blood/splatter, -/obj/effect/landmark/corpse/konyang_villager, -/turf/simulated/floor/exoplanet/wood, -/area/konyang_village) "vc" = ( /obj/structure/bed/padded, /obj/item/bedsheet/dorms, @@ -672,7 +666,6 @@ "wp" = ( /obj/random/dirt_75, /obj/random/dirt_75, -/mob/living/simple_animal/hostile/ipc_zombie, /turf/simulated/floor/exoplanet/sidewalk/blocks, /area/konyang_village) "xk" = ( @@ -713,8 +706,6 @@ dir = 1 }, /obj/random/dirt_75, -/obj/effect/landmark/corpse/konyang_villager, -/obj/effect/decal/cleanable/blood/splatter, /turf/simulated/floor/exoplanet/dirt_konyang, /area/konyang_village) "xF" = ( @@ -827,18 +818,10 @@ /obj/machinery/light, /turf/simulated/floor/exoplanet/lino/diamond, /area/konyang_village) -"yL" = ( -/obj/machinery/light{ - dir = 4 - }, -/obj/effect/decal/cleanable/blood/splatter, -/obj/effect/landmark/corpse/konyang_villager, -/turf/simulated/floor/exoplanet/wood, -/area/konyang_village) "yM" = ( -/obj/effect/decal/cleanable/blood/splatter, /obj/item/material/hatchet/butch, -/obj/effect/landmark/corpse/konyang_villager, +/obj/effect/landmark/corpse/ipc_zombie, +/obj/effect/decal/cleanable/blood/oil, /turf/simulated/floor/exoplanet/wood, /area/konyang_village) "yQ" = ( @@ -995,7 +978,6 @@ /obj/item/beach_ball/holoball{ pixel_x = -16 }, -/mob/living/simple_animal/hostile/ipc_zombie, /turf/simulated/floor/exoplanet/dirt_konyang, /area/konyang_village) "BM" = ( @@ -1035,12 +1017,6 @@ /obj/machinery/light, /turf/simulated/floor/exoplanet/wood, /area/konyang_village) -"CU" = ( -/obj/random/dirt_75, -/obj/random/dirt_75, -/mob/living/simple_animal/hostile/ipc_zombie, -/turf/simulated/floor/exoplanet/concrete, -/area/konyang_village) "CV" = ( /obj/effect/decal/exterior_stairs/half/center{ dir = 8 @@ -1112,10 +1088,6 @@ /obj/random/dirt_75, /turf/simulated/floor/exoplanet/dirt_konyang, /area/konyang_village) -"Gr" = ( -/mob/living/simple_animal/hostile/ipc_zombie, -/turf/simulated/floor/exoplanet/sidewalk/blocks, -/area/konyang_village) "Gt" = ( /obj/structure/window/urban{ dir = 8; @@ -1138,6 +1110,11 @@ "GM" = ( /turf/simulated/floor/exoplanet/wood, /area/konyang_village) +"GX" = ( +/obj/effect/landmark/corpse/ipc_zombie, +/obj/effect/decal/cleanable/blood/oil, +/turf/simulated/floor/exoplanet/wood, +/area/konyang_village) "Hb" = ( /obj/structure/window/urban{ dir = 8 @@ -1225,12 +1202,6 @@ /obj/structure/railing/fence, /turf/simulated/floor/exoplanet/dirt_konyang, /area/konyang_village) -"IT" = ( -/obj/random/dirt_75, -/obj/effect/decal/cleanable/blood/splatter, -/obj/effect/landmark/corpse/konyang_villager, -/turf/simulated/floor/exoplanet/concrete, -/area/konyang_village) "IY" = ( /obj/random/dirt_75, /obj/machinery/light, @@ -1285,12 +1256,6 @@ /obj/random/dirt_75, /turf/simulated/floor/exoplanet/dirt_konyang, /area/konyang_village) -"KN" = ( -/obj/random/dirt_75, -/obj/random/dirt_75, -/obj/effect/decal/cleanable/blood/splatter, -/turf/simulated/floor/exoplanet/concrete, -/area/konyang_village) "KS" = ( /obj/structure/chainlink_fence{ dir = 8 @@ -1505,8 +1470,6 @@ /obj/effect/decal/road_marking/no_pass, /obj/random/dirt_75, /obj/random/dirt_75, -/obj/effect/decal/cleanable/blood/splatter, -/obj/effect/landmark/corpse/konyang_villager, /turf/simulated/floor/exoplanet/concrete/square, /area/konyang_village) "OS" = ( @@ -1646,6 +1609,8 @@ /area/konyang_village) "SZ" = ( /obj/effect/floor_decal/spline/plain/full, +/obj/effect/landmark/corpse/ipc_zombie, +/obj/effect/decal/cleanable/blood/oil, /turf/simulated/floor/exoplanet/dirt_konyang, /area/konyang_village) "To" = ( @@ -1699,10 +1664,6 @@ /obj/structure/flora/ausbushes/stalkybush, /turf/simulated/floor/exoplanet/konyang, /area/konyang_village) -"UN" = ( -/mob/living/simple_animal/hostile/ipc_zombie, -/turf/simulated/floor/exoplanet/wood, -/area/konyang_village) "Vi" = ( /obj/structure/table/wood, /obj/item/modular_computer/laptop/preset{ @@ -1714,11 +1675,6 @@ }, /turf/simulated/floor/exoplanet/wood/bamboo, /area/konyang_village) -"Vq" = ( -/obj/random/dirt_75, -/mob/living/simple_animal/hostile/ipc_zombie, -/turf/simulated/floor/exoplanet/wood, -/area/konyang_village) "Vx" = ( /obj/structure/flora/bush/konyang_reeds, /obj/structure/railing/fence{ @@ -1726,13 +1682,6 @@ }, /turf/simulated/floor/exoplanet/konyang, /area/konyang_village) -"VH" = ( -/obj/effect/decal/road_marking/no_pass, -/obj/random/dirt_75, -/obj/random/dirt_75, -/mob/living/simple_animal/hostile/ipc_zombie, -/turf/simulated/floor/exoplanet/concrete, -/area/konyang_village) "VY" = ( /obj/item/material/shard, /obj/item/material/shard, @@ -1762,7 +1711,6 @@ dir = 4 }, /obj/random/dirt_75, -/mob/living/simple_animal/hostile/ipc_zombie, /turf/simulated/floor/exoplanet/sidewalk, /area/konyang_village) "Wz" = ( @@ -1828,10 +1776,6 @@ /obj/item/seeds/riceseed, /turf/simulated/floor/exoplanet/konyang, /area/konyang_village) -"Xg" = ( -/mob/living/simple_animal/hostile/ipc_zombie, -/turf/simulated/floor/exoplanet/lino/diamond, -/area/konyang_village) "Xq" = ( /obj/structure/table/wood, /obj/item/device/flashlight/lamp, @@ -2434,7 +2378,7 @@ Ge Ge Ge St -CU +oR Kw dx NX @@ -2597,7 +2541,7 @@ oF qf tT hj -GM +GX GM Kf OA @@ -2606,9 +2550,9 @@ St rG OB cK -uV GM -UN +GX +GM of tT aP @@ -2638,19 +2582,19 @@ MJ oF NY Zy -Vq +hj hj QV oF OA -VH +tD St CY TO tT GM GM -yL +pG GM tT cQ @@ -2681,7 +2625,7 @@ OB zY WX xk -uV +GM dC oF OA @@ -2690,7 +2634,7 @@ St DI cC tT -Xg +tT Tr OB OB @@ -2896,7 +2840,7 @@ OA CY CY zS -KN +oR oR Dt zS @@ -3102,7 +3046,7 @@ ou yw yw yM -UN +GM oT OB OB @@ -3143,7 +3087,7 @@ oF bE yw yw -UN +GM GM kK OB @@ -3261,7 +3205,7 @@ Av NX NX NX -Gr +oM oM GG tT @@ -3319,7 +3263,7 @@ Zw jO Ge oR -IT +St ic OB Wj diff --git a/maps/random_ruins/exoplanets/konyang/abandoned/rural_clinic.dmm b/maps/random_ruins/exoplanets/konyang/abandoned/rural_clinic.dmm index 1d98222b348..1c350de7e52 100644 --- a/maps/random_ruins/exoplanets/konyang/abandoned/rural_clinic.dmm +++ b/maps/random_ruins/exoplanets/konyang/abandoned/rural_clinic.dmm @@ -1,8 +1,4 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"aH" = ( -/obj/effect/decal/cleanable/blood, -/turf/simulated/floor/tiled/white, -/area/konyang/rural_clinic) "bK" = ( /obj/structure/flora/bush/konyang_reeds/water, /turf/simulated/floor/exoplanet/konyang, @@ -16,31 +12,11 @@ }, /turf/simulated/floor/tiled/white, /area/konyang/rural_clinic) -"cj" = ( -/obj/effect/landmark/corpse/konyang_villager, -/turf/simulated/floor/exoplanet/konyang, -/area/exoplanet/grass/konyang) "et" = ( /obj/machinery/optable, /obj/effect/floor_decal/corner/green/diagonal{ dir = 4 }, -/obj/effect/landmark/corpse/konyang_villager, -/turf/simulated/floor/tiled/white, -/area/konyang/rural_clinic) -"eE" = ( -/obj/effect/floor_decal/corner/green/diagonal{ - dir = 4 - }, -/obj/effect/floor_decal/corner/green/diagonal{ - dir = 4 - }, -/obj/effect/decal/cleanable/blood/drip, -/turf/simulated/floor/tiled/white, -/area/konyang/rural_clinic) -"fO" = ( -/mob/living/simple_animal/hostile/ipc_zombie, -/obj/effect/decal/cleanable/blood, /turf/simulated/floor/tiled/white, /area/konyang/rural_clinic) "gj" = ( @@ -66,13 +42,6 @@ /obj/effect/floor_decal/konyang_flowers, /turf/simulated/floor/exoplanet/konyang/pink, /area/exoplanet/grass/konyang) -"gD" = ( -/obj/effect/floor_decal/corner/green/diagonal{ - dir = 4 - }, -/obj/effect/decal/cleanable/blood, -/turf/simulated/floor/tiled/white, -/area/konyang/rural_clinic) "iW" = ( /obj/machinery/door/urban{ dir = 1 @@ -128,11 +97,6 @@ }, /turf/simulated/floor/tiled/white, /area/konyang/rural_clinic) -"oI" = ( -/obj/effect/decal/cleanable/blood/gibs/robot, -/obj/effect/decal/cleanable/blood/oil, -/turf/simulated/floor/tiled/white, -/area/konyang/rural_clinic) "pl" = ( /obj/effect/floor_decal/corner/green/diagonal{ dir = 4 @@ -186,11 +150,6 @@ /obj/structure/curtain/open/medical, /turf/simulated/floor/tiled/white, /area/konyang/rural_clinic) -"qM" = ( -/obj/effect/decal/cleanable/blood, -/obj/effect/landmark/corpse/konyang_cop, -/turf/simulated/floor/tiled/white, -/area/konyang/rural_clinic) "rd" = ( /obj/effect/floor_decal/konyang_flowers, /obj/structure/flora/bush/konyang_reeds/water, @@ -201,9 +160,9 @@ /turf/simulated/floor/exoplanet/konyang, /area/exoplanet/grass/konyang) "rP" = ( -/obj/effect/decal/cleanable/blood/drip, -/turf/simulated/floor/tiled/white, -/area/konyang/rural_clinic) +/obj/effect/landmark/corpse/ipc_zombie, +/turf/simulated/floor/exoplanet/konyang, +/area/exoplanet/grass/konyang) "te" = ( /obj/effect/floor_decal/corner/green/diagonal{ dir = 4 @@ -271,7 +230,6 @@ /turf/simulated/floor/tiled/white, /area/konyang/rural_clinic) "xB" = ( -/mob/living/simple_animal/hostile/ipc_zombie, /obj/item/stack/rods, /turf/simulated/floor/tiled/white, /area/konyang/rural_clinic) @@ -305,10 +263,6 @@ /obj/effect/decal/cleanable/generic/beet_tree_petals, /turf/simulated/floor/exoplanet/konyang/pink, /area/exoplanet/grass/konyang) -"Bf" = ( -/obj/effect/landmark/corpse/konyang_villager, -/turf/simulated/floor/tiled/white, -/area/konyang/rural_clinic) "Cc" = ( /obj/effect/floor_decal/corner/green/diagonal{ dir = 4 @@ -329,7 +283,6 @@ /area/konyang/rural_clinic) "DO" = ( /obj/item/material/shard, -/obj/effect/landmark/corpse/konyang_villager, /turf/simulated/floor/tiled/white, /area/konyang/rural_clinic) "Er" = ( @@ -341,7 +294,6 @@ dir = 4 }, /obj/item/material/shard, -/obj/effect/decal/cleanable/blood, /obj/machinery/iv_drip, /turf/simulated/floor/tiled/white, /area/konyang/rural_clinic) @@ -352,7 +304,6 @@ /obj/effect/floor_decal/corner/green/diagonal{ dir = 4 }, -/obj/effect/decal/cleanable/blood/oil, /obj/machinery/iv_drip, /turf/simulated/floor/tiled/white, /area/konyang/rural_clinic) @@ -399,14 +350,6 @@ "Ka" = ( /turf/simulated/floor/exoplanet/water/shallow/konyang, /area/exoplanet/grass/konyang) -"KC" = ( -/obj/effect/floor_decal/corner/green/diagonal{ - dir = 4 - }, -/mob/living/simple_animal/hostile/ipc_zombie, -/obj/effect/decal/cleanable/blood/drip, -/turf/simulated/floor/tiled/white, -/area/konyang/rural_clinic) "KI" = ( /turf/simulated/floor/exoplanet/konyang/wilting, /area/exoplanet/grass/konyang) @@ -433,28 +376,6 @@ }, /obj/item/material/shard, /obj/item/stack/rods, -/obj/effect/decal/cleanable/blood, -/turf/simulated/floor/tiled/white, -/area/konyang/rural_clinic) -"Pi" = ( -/mob/living/simple_animal/hostile/ipc_zombie, -/turf/simulated/floor/exoplanet/konyang, -/area/exoplanet/grass/konyang) -"Qv" = ( -/obj/effect/floor_decal/corner/green/diagonal{ - dir = 4 - }, -/obj/effect/decal/cleanable/blood, -/obj/effect/landmark/corpse/konyang_clinic_worker, -/turf/simulated/floor/tiled/white, -/area/konyang/rural_clinic) -"Qx" = ( -/obj/effect/floor_decal/corner/green/diagonal{ - dir = 4 - }, -/obj/effect/decal/cleanable/blood/drip, -/obj/effect/decal/cleanable/blood, -/obj/effect/landmark/corpse/konyang_clinic_worker, /turf/simulated/floor/tiled/white, /area/konyang/rural_clinic) "Sg" = ( @@ -528,13 +449,6 @@ /obj/structure/flora/bush/konyang_reeds/water, /turf/simulated/floor/exoplanet/konyang, /area/exoplanet/grass/konyang) -"ZK" = ( -/obj/effect/floor_decal/corner/green/diagonal{ - dir = 4 - }, -/obj/effect/decal/cleanable/blood/splatter, -/turf/simulated/floor/tiled/white, -/area/konyang/rural_clinic) (1,1,1) = {" Xe @@ -767,7 +681,7 @@ Xe Xe Xe Xe -Pi +Xe Xe Xe bK @@ -869,7 +783,7 @@ Xe Xe Xe Xe -cj +Xe Xe Xe Xe @@ -897,17 +811,17 @@ Xe Xe Xe Xe +rP +rP +rP +rP +rP Xe Xe Xe Xe Xe Xe -Pi -Xe -Xe -Xe -Xe Xe Xe bK @@ -963,11 +877,11 @@ zu qH GS zu -rP +Vq Vq xw Vq -fO +Vq Vq GS Xe @@ -991,16 +905,16 @@ Xe Xe GS zu -eE +cd zu DB cd Oz zu xw -rP -Bf -aH +Vq +Vq +Vq GS Xe Xe @@ -1028,14 +942,14 @@ qH GS pl DO -rP +Vq iW Vq -oI +Vq Vq GS Xe -cj +Xe Xe Xe Xe @@ -1092,9 +1006,9 @@ pV GS pl xB -oI -gD -qM +Vq +zu +Vq XG Vq GS @@ -1119,8 +1033,8 @@ Xe Xe GS oE -eE -Qx +cd +zu DB cd zu @@ -1154,16 +1068,16 @@ jS WB TB GS -ZK +zu pn pn zu wn -ZK +zu Vq xw Xe -Pi +Xe Xe Xe Xe @@ -1217,11 +1131,11 @@ Xe Xe Xe GS -gD zu -KC zu -Qv +zu +zu +zu zu GS Xe @@ -1282,9 +1196,9 @@ Xe Xe GS gs -gD +zu Sg -gD +zu Cc te GS diff --git a/maps/random_ruins/exoplanets/konyang/infected_recovery_post.dm b/maps/random_ruins/exoplanets/konyang/infected_recovery_post.dm deleted file mode 100644 index af384539367..00000000000 --- a/maps/random_ruins/exoplanets/konyang/infected_recovery_post.dm +++ /dev/null @@ -1,59 +0,0 @@ -/datum/map_template/ruin/exoplanet/infected_recovery_post - name = "Infected Recovery Post" - id = "infected_recovery_post" - description = "A post established to research and recover infected IPCs." - - template_flags = TEMPLATE_FLAG_NO_RUINS|TEMPLATE_FLAG_RUIN_STARTS_DISALLOWED - sectors = list(SECTOR_HANEUNIM) - suffixes = list("konyang/abandoned/infected_recovery_post.dmm") - -/area/konyang/infected_recovery_post - name = "Konyang Infected Recovery Post" - area_flags = AREA_FLAG_HIDE_FROM_HOLOMAP | AREA_FLAG_RAD_SHIELDED - base_turf = /turf/simulated/floor/exoplanet/dirt_konyang - sound_env = ROOM - requires_power = TRUE - -/datum/ghostspawner/human/konyang_infected_recovery_cop - short_name = "konyang_infected_recovery_cop" - name = "KRC Infected Recovery Police Patrolman" - desc = "Recover any infected IPCs in the area alive (if possible) and assist the researcher in examining them." - welcome_message = "You are a Infected Recovery Police Patrolman." - tags = list("External") - spawnpoints = list("konyang_infected_recovery_cop") - max_count = 2 - - extra_languages = list(LANGUAGE_SOL_COMMON) - outfit = /obj/outfit/admin/konyang/cop - possible_species = list(SPECIES_HUMAN, SPECIES_IPC, SPECIES_IPC_BISHOP, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_SHELL, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU) - allow_appearance_change = APPEARANCE_PLASTICSURGERY - - assigned_role = "Infected Recovery Police Patrolman" - special_role = "Infected Recovery Police Patrolman" - respawn_flag = null - - uses_species_whitelist = FALSE - - culture_restriction = list(/singleton/origin_item/culture/solarian) - origin_restriction = list(/singleton/origin_item/origin/konyang) - -/datum/ghostspawner/human/konyang_infected_recovery_researcher - short_name = "konyang_infected_recovery_researcher" - name = "KRC Infected Recovery Researcher" - desc = "Reserach and cure the infected on behalf of the Konyang Robotics Corporation, help out your police colleagues, help stop the apocalypse." - welcome_message = "You are a Infected Recovery Researcher." - max_count = 1 - tags = list("External") - spawnpoints = list("konyang_infected_recovery_researcher") - extra_languages = list(LANGUAGE_SOL_COMMON) - outfit = /obj/outfit/admin/konyang/clinic - possible_species = list(SPECIES_HUMAN, SPECIES_IPC, SPECIES_IPC_BISHOP, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_SHELL, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU) - allow_appearance_change = APPEARANCE_PLASTICSURGERY - assigned_role = "Konyang Infected Recovery Researcher" - special_role = "Konyang Infected Recovery Researcher" - respawn_flag = null - - uses_species_whitelist = FALSE - - culture_restriction = list(/singleton/origin_item/culture/solarian) - origin_restriction = list(/singleton/origin_item/origin/konyang) diff --git a/maps/random_ruins/exoplanets/konyang/infected_recovery_post.dmm b/maps/random_ruins/exoplanets/konyang/infected_recovery_post.dmm deleted file mode 100644 index 8de47f13b98..00000000000 --- a/maps/random_ruins/exoplanets/konyang/infected_recovery_post.dmm +++ /dev/null @@ -1,1228 +0,0 @@ -//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"a" = ( -/turf/simulated/floor/exoplanet/konyang, -/area/exoplanet/grass/konyang) -"b" = ( -/obj/structure/flora/bush/konyang_reeds, -/turf/simulated/floor/exoplanet/konyang/wilting, -/area/exoplanet/grass/konyang) -"c" = ( -/obj/effect/decal/cleanable/blood/drip, -/turf/simulated/floor/exoplanet/konyang, -/area/exoplanet/grass/konyang) -"d" = ( -/obj/item/trap/animal/large, -/turf/simulated/floor/wood, -/area/konyang/infected_recovery_post) -"f" = ( -/obj/effect/map_effect/window_spawner/full/wood, -/turf/simulated/floor/exoplanet/konyang, -/area/exoplanet/grass/konyang) -"g" = ( -/obj/machinery/door/urban{ - dir = 4 - }, -/turf/simulated/floor/wood, -/area/konyang/infected_recovery_post) -"h" = ( -/obj/structure/cable/green{ - icon_state = "0-4" - }, -/obj/machinery/power/portgen/basic, -/turf/simulated/floor/wood, -/area/konyang/infected_recovery_post) -"i" = ( -/obj/structure/flora/tree/konyang/blossom, -/obj/effect/floor_decal/konyang_flowers, -/obj/effect/decal/cleanable/generic/beet_tree_petals, -/turf/simulated/floor/exoplanet/konyang/pink, -/area/exoplanet/grass/konyang) -"j" = ( -/turf/simulated/floor/exoplanet/konyang/wilting, -/area/exoplanet/grass/konyang) -"k" = ( -/obj/effect/decal/cleanable/blood, -/turf/simulated/floor/exoplanet/konyang, -/area/exoplanet/grass/konyang) -"l" = ( -/obj/effect/decal/cleanable/blood/drip, -/turf/simulated/floor/exoplanet/konyang/wilting, -/area/exoplanet/grass/konyang) -"m" = ( -/obj/structure/window_frame/wood, -/obj/item/material/shard, -/obj/item/material/shard, -/turf/template_noop, -/area/exoplanet/grass/konyang) -"o" = ( -/obj/machinery/light{ - dir = 1; - pixel_y = 4 - }, -/obj/item/trap/animal/large, -/turf/simulated/floor/wood, -/area/konyang/infected_recovery_post) -"q" = ( -/obj/structure/closet{ - name = "KRC Researcher Gear" - }, -/obj/item/stack/nanopaste, -/obj/item/stack/nanopaste, -/obj/item/clothing/suit/storage/toggle/labcoat, -/obj/item/device/taperecorder, -/obj/item/device/camera, -/obj/item/device/camera_film, -/turf/simulated/floor/wood, -/area/konyang/infected_recovery_post) -"r" = ( -/obj/structure/flora/tree/konyang/spring, -/turf/simulated/floor/exoplanet/konyang/wilting, -/area/exoplanet/grass/konyang) -"s" = ( -/obj/structure/flora/bush/konyang_reeds, -/turf/simulated/floor/exoplanet/konyang, -/area/exoplanet/grass/konyang) -"t" = ( -/obj/effect/floor_decal/konyang_flowers, -/turf/simulated/floor/exoplanet/konyang/pink, -/area/exoplanet/grass/konyang) -"u" = ( -/obj/structure/chainlink_fence{ - dir = 1 - }, -/obj/structure/chainlink_fence{ - dir = 4 - }, -/turf/simulated/floor/exoplanet/dirt_konyang, -/area/konyang) -"v" = ( -/obj/item/bedsheet, -/obj/structure/bed/padded, -/obj/effect/ghostspawpoint{ - identifier = "konyang_infected_recovery_researcher"; - name = "igs - infected_recovery_researcher" - }, -/turf/simulated/floor/wood, -/area/konyang/infected_recovery_post) -"w" = ( -/obj/structure/chainlink_fence{ - dir = 2 - }, -/turf/simulated/floor/exoplanet/dirt_konyang, -/area/konyang) -"y" = ( -/turf/simulated/floor/wood, -/area/exoplanet/grass/konyang) -"z" = ( -/obj/machinery/power/apc{ - dir = 4; - pixel_y = 0; - pixel_x = 11 - }, -/obj/structure/cable/green{ - icon_state = "0-8" - }, -/turf/simulated/floor/wood, -/area/konyang/infected_recovery_post) -"A" = ( -/turf/simulated/floor/wood, -/area/konyang/infected_recovery_post) -"B" = ( -/turf/simulated/floor/exoplanet/konyang/pink, -/area/exoplanet/grass/konyang) -"C" = ( -/obj/effect/floor_decal/konyang_flowers, -/obj/effect/decal/cleanable/generic/beet_tree_petals, -/turf/simulated/floor/exoplanet/konyang/pink, -/area/exoplanet/grass/konyang) -"D" = ( -/obj/structure/closet{ - name = "Infected Recovery Policeman Gear" - }, -/obj/item/gun/projectile/revolver/konyang/police, -/obj/item/ammo_magazine/c45/revolver, -/obj/item/ammo_magazine/c45/revolver, -/obj/item/ammo_magazine/c45/revolver, -/obj/item/clothing/head/helmet/riot, -/obj/item/clothing/suit/armor/carrier/riot, -/obj/item/shield/riot, -/obj/item/melee/baton/stunrod, -/obj/item/reagent_containers/spray/pepper, -/obj/item/handcuffs, -/turf/simulated/floor/wood, -/area/konyang/infected_recovery_post) -"E" = ( -/obj/item/bedsheet, -/obj/structure/bed/padded, -/obj/effect/ghostspawpoint{ - name = "igs - infected_recovery_cop"; - identifier = "konyang_infected_recovery_cop" - }, -/turf/simulated/floor/wood, -/area/konyang/infected_recovery_post) -"F" = ( -/obj/machinery/door/urban{ - dir = 1 - }, -/obj/effect/decal/cleanable/blood, -/turf/simulated/floor/wood, -/area/exoplanet/grass/konyang) -"G" = ( -/obj/structure/table/steel, -/obj/item/storage/firstaid/adv{ - pixel_x = 5; - pixel_y = -1 - }, -/obj/item/storage/firstaid/regular{ - pixel_y = 8; - pixel_x = -4 - }, -/turf/simulated/floor/wood, -/area/konyang/infected_recovery_post) -"H" = ( -/obj/machinery/recharger/wallcharger{ - pixel_x = 32; - pixel_y = -3 - }, -/turf/simulated/floor/wood, -/area/konyang/infected_recovery_post) -"I" = ( -/obj/structure/chainlink_fence, -/turf/simulated/floor/exoplanet/dirt_konyang, -/area/konyang) -"J" = ( -/obj/structure/table/steel, -/obj/item/storage/box/bodybags, -/obj/item/storage/box/bodybags, -/obj/item/stack/material/graphite/full{ - pixel_y = 7; - pixel_x = 7 - }, -/turf/simulated/floor/wood, -/area/konyang/infected_recovery_post) -"K" = ( -/obj/structure/flora/tree/konyang/spring, -/turf/simulated/floor/exoplanet/konyang, -/area/exoplanet/grass/konyang) -"L" = ( -/obj/effect/landmark/corpse/konyang_villager, -/obj/effect/decal/cleanable/blood, -/turf/simulated/floor/wood, -/area/exoplanet/grass/konyang) -"M" = ( -/turf/simulated/wall/wood, -/area/exoplanet/grass/konyang) -"N" = ( -/obj/machinery/recharger/wallcharger{ - pixel_x = 33; - pixel_y = 4 - }, -/turf/simulated/floor/wood, -/area/konyang/infected_recovery_post) -"O" = ( -/obj/structure/chainlink_fence{ - dir = 1 - }, -/turf/simulated/floor/exoplanet/dirt_konyang, -/area/konyang) -"P" = ( -/turf/simulated/floor/exoplanet/dirt_konyang, -/area/konyang) -"Q" = ( -/obj/structure/chainlink_fence{ - dir = 4 - }, -/turf/simulated/floor/exoplanet/dirt_konyang, -/area/konyang) -"R" = ( -/obj/effect/floor_decal/konyang_flowers, -/turf/simulated/floor/exoplanet/konyang/wilting, -/area/exoplanet/grass/konyang) -"S" = ( -/obj/effect/decal/cleanable/blood, -/turf/simulated/floor/wood, -/area/exoplanet/grass/konyang) -"T" = ( -/obj/effect/decal/cleanable/generic/beet_tree_petals, -/turf/simulated/floor/exoplanet/konyang, -/area/exoplanet/grass/konyang) -"U" = ( -/obj/structure/automobile/police, -/turf/simulated/floor/exoplanet/dirt_konyang, -/area/konyang) -"V" = ( -/obj/machinery/light, -/turf/simulated/floor/wood, -/area/konyang/infected_recovery_post) -"W" = ( -/turf/simulated/wall/wood, -/area/konyang/infected_recovery_post) -"Y" = ( -/mob/living/simple_animal/hostile/ipc_zombie, -/turf/simulated/floor/wood, -/area/exoplanet/grass/konyang) -"Z" = ( -/obj/effect/floor_decal/konyang_flowers, -/turf/simulated/floor/exoplanet/konyang, -/area/exoplanet/grass/konyang) - -(1,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -"} -(2,1,1) = {" -a -a -a -a -a -a -j -j -j -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -"} -(3,1,1) = {" -a -a -K -a -a -a -j -r -j -a -Z -R -R -R -R -Z -a -a -a -a -a -a -K -a -a -a -a -a -a -a -"} -(4,1,1) = {" -a -a -a -a -a -a -j -j -j -a -Z -R -j -j -j -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -"} -(5,1,1) = {" -a -a -a -s -a -a -Z -a -a -a -a -a -a -a -a -a -a -Z -a -a -a -a -s -a -a -Z -a -j -a -a -"} -(6,1,1) = {" -a -a -s -s -a -a -Z -a -a -a -a -s -s -s -s -a -a -a -a -a -a -a -s -a -a -Z -Z -a -a -a -"} -(7,1,1) = {" -a -j -j -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -t -a -a -s -a -a -a -a -a -a -a -"} -(8,1,1) = {" -a -b -b -a -a -j -a -a -a -W -W -W -W -W -W -W -W -a -a -t -C -a -a -a -a -a -a -a -a -a -"} -(9,1,1) = {" -a -j -j -a -a -a -a -a -a -W -E -D -E -D -v -q -W -a -a -t -t -B -a -a -a -a -K -a -a -a -"} -(10,1,1) = {" -a -a -a -a -a -a -a -s -a -W -A -A -A -A -A -A -W -a -t -t -t -t -a -a -a -a -a -a -a -a -"} -(11,1,1) = {" -a -a -a -a -a -a -a -s -a -W -o -A -A -A -A -V -W -a -a -t -i -t -C -a -a -a -a -a -a -a -"} -(12,1,1) = {" -a -a -a -a -a -a -a -a -a -W -d -A -J -G -A -h -W -a -a -t -t -t -t -a -Z -a -a -a -s -a -"} -(13,1,1) = {" -a -a -a -K -a -R -a -a -a -W -d -A -A -H -N -z -W -a -a -a -t -t -t -a -Z -a -a -a -b -j -"} -(14,1,1) = {" -a -a -a -a -a -Z -a -a -a -W -W -W -g -W -W -W -W -a -a -a -t -t -a -T -a -a -a -a -j -b -"} -(15,1,1) = {" -a -a -a -a -a -a -a -a -a -O -P -P -P -P -P -P -I -a -a -a -a -a -a -a -a -a -a -Z -j -b -"} -(16,1,1) = {" -a -a -a -a -a -a -a -a -a -O -P -P -P -P -P -U -I -a -a -a -a -a -a -a -a -a -Z -Z -j -b -"} -(17,1,1) = {" -a -a -Z -Z -j -a -a -a -a -O -P -P -P -P -P -P -I -a -a -a -a -a -a -a -a -a -a -a -j -b -"} -(18,1,1) = {" -a -a -Z -Z -a -Z -a -a -a -O -P -P -P -P -P -P -I -a -a -a -a -Z -a -a -a -a -a -a -j -b -"} -(19,1,1) = {" -a -a -a -a -a -Z -a -a -a -O -P -P -P -P -P -P -I -a -a -s -a -Z -M -f -f -M -M -a -a -s -"} -(20,1,1) = {" -a -a -a -a -j -R -a -a -a -O -P -P -P -P -P -P -I -a -a -s -a -a -f -y -y -y -M -a -a -a -"} -(21,1,1) = {" -a -a -a -a -j -R -a -a -a -O -P -P -P -P -P -P -I -a -s -s -a -c -F -y -Y -L -M -a -a -a -"} -(22,1,1) = {" -a -a -a -a -a -a -a -a -a -O -P -P -P -P -P -P -I -a -s -a -a -a -m -y -y -S -M -a -a -a -"} -(23,1,1) = {" -Z -a -Z -Z -a -a -a -a -a -u -Q -Q -Q -P -P -P -w -a -s -a -c -a -M -m -m -M -M -a -Z -a -"} -(24,1,1) = {" -Z -a -a -Z -a -a -j -j -a -a -a -a -s -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -Z -a -"} -(25,1,1) = {" -a -a -a -a -K -a -j -j -a -a -a -a -a -s -s -a -a -a -a -a -k -a -a -a -a -a -a -j -j -a -"} -(26,1,1) = {" -a -a -a -a -a -a -a -a -a -K -a -s -s -s -s -s -a -a -Z -a -a -a -a -a -a -a -a -j -j -a -"} -(27,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -Z -a -l -j -a -s -a -a -K -a -a -s -s -"} -(28,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -Z -Z -a -a -a -Z -a -a -j -j -a -s -a -a -a -a -a -a -a -"} -(29,1,1) = {" -a -a -a -a -a -a -a -a -a -Z -Z -a -a -a -a -a -a -a -c -a -a -a -s -a -a -a -Z -Z -Z -a -"} -(30,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -j -j -j -a -a -a -a -a -a -s -s -a -a -Z -Z -a -a -a -"} diff --git a/maps/random_ruins/exoplanets/konyang/stranded_police.dm b/maps/random_ruins/exoplanets/konyang/stranded_police.dm index 90e2db4e749..1244edbcd39 100644 --- a/maps/random_ruins/exoplanets/konyang/stranded_police.dm +++ b/maps/random_ruins/exoplanets/konyang/stranded_police.dm @@ -10,7 +10,7 @@ /datum/ghostspawner/human/konyang_lostcop short_name = "konyang_lostcop" name = "Konyang Lost Police Patrolman" - desc = "Wander the countryside, try to find help, don't die to the infected." + desc = "Wander the countryside and try to find help." tags = list("External") welcome_message = "You are a lost patrolman." diff --git a/maps/random_ruins/exoplanets/konyang/stranded_police.dmm b/maps/random_ruins/exoplanets/konyang/stranded_police.dmm index 7ca825970d2..1d37ea947e2 100644 --- a/maps/random_ruins/exoplanets/konyang/stranded_police.dmm +++ b/maps/random_ruins/exoplanets/konyang/stranded_police.dmm @@ -11,13 +11,6 @@ /obj/item/gun/projectile/revolver/konyang/police, /turf/simulated/floor/exoplanet/dirt_konyang, /area/exoplanet/grass/konyang) -"d" = ( -/obj/effect/decal/cleanable/blood/oil/streak, -/turf/simulated/floor/exoplanet/dirt_konyang, -/area/exoplanet/grass/konyang) -"f" = ( -/turf/simulated/wall/wood, -/area/exoplanet/grass/konyang) "h" = ( /obj/structure/flora/bush/konyang_reeds, /turf/simulated/floor/exoplanet/konyang, @@ -44,11 +37,6 @@ /obj/item/device/flashlight/maglight, /turf/simulated/floor/exoplanet/konyang, /area/exoplanet/grass/konyang) -"v" = ( -/obj/effect/decal/cleanable/blood/splatter, -/mob/living/simple_animal/hostile/ipc_zombie, -/turf/simulated/floor/exoplanet/dirt_konyang, -/area/exoplanet/grass/konyang) "w" = ( /obj/structure/automobile/police{ name = "broken police cruiser"; @@ -56,10 +44,6 @@ }, /turf/simulated/floor/exoplanet/dirt_konyang, /area/exoplanet/grass/konyang) -"x" = ( -/obj/machinery/door/urban, -/turf/simulated/floor/exoplanet/dirt_konyang, -/area/exoplanet/grass/konyang) "A" = ( /obj/structure/flora/bush/konyang_reeds, /turf/simulated/floor/exoplanet/konyang/wilting, @@ -72,24 +56,6 @@ /obj/item/ammo_magazine/c45/revolver, /turf/simulated/floor/exoplanet/dirt_konyang, /area/exoplanet/grass/konyang) -"E" = ( -/obj/effect/decal/cleanable/blood/gibs/robot, -/obj/effect/decal/cleanable/blood/oil, -/turf/simulated/floor/exoplanet/dirt_konyang, -/area/exoplanet/grass/konyang) -"F" = ( -/obj/effect/landmark/corpse/konyang_villager, -/turf/simulated/floor/exoplanet/dirt_konyang, -/area/exoplanet/grass/konyang) -"G" = ( -/obj/effect/decal/cleanable/blood/gibs/robot, -/obj/effect/decal/cleanable/blood/oil, -/turf/simulated/floor/exoplanet/konyang, -/area/exoplanet/grass/konyang) -"I" = ( -/obj/effect/decal/cleanable/blood/splatter, -/turf/simulated/floor/exoplanet/konyang, -/area/exoplanet/grass/konyang) "J" = ( /turf/simulated/floor/exoplanet/konyang, /area/exoplanet/grass/konyang) @@ -280,7 +246,7 @@ J J J J -E +l J J u @@ -302,10 +268,10 @@ J J J R -d +l l w -E +l J J J @@ -369,10 +335,10 @@ s J q b -E +l m l -G +J J J J @@ -393,7 +359,7 @@ J J J c -G +J J J J @@ -427,10 +393,10 @@ J "} (15,1,1) = {" J -f -f -f -f +J +J +J +J J J J @@ -449,11 +415,11 @@ J "} (16,1,1) = {" J -f -F -v -x -I +J +J +J +J +J J a a @@ -471,10 +437,10 @@ J "} (17,1,1) = {" J -f -f -f -f +J +J +J +J J N J diff --git a/maps/random_ruins/exoplanets/konyang/telecomms_outpost.dm b/maps/random_ruins/exoplanets/konyang/telecomms_outpost.dm index f8bb69cbd39..70a6bd0597d 100644 --- a/maps/random_ruins/exoplanets/konyang/telecomms_outpost.dm +++ b/maps/random_ruins/exoplanets/konyang/telecomms_outpost.dm @@ -8,7 +8,7 @@ template_flags = TEMPLATE_FLAG_NO_RUINS|TEMPLATE_FLAG_RUIN_STARTS_DISALLOWED sectors = list(SECTOR_HANEUNIM) suffixes = list("konyang/telecomms_outpost.dmm") - ban_ruins = list(/datum/map_template/ruin/exoplanet/konyang_zombie_outpost) + ban_ruins = list(/datum/map_template/ruin/exoplanet/konyang_abandoned_outpost) /area/konyang_telecomms_outpost name = "Konyang Telecomms Outpost" diff --git a/maps/random_ruins/exoplanets/konyang/village.dm b/maps/random_ruins/exoplanets/konyang/village.dm index 657f9260c4c..318efcf8cb2 100644 --- a/maps/random_ruins/exoplanets/konyang/village.dm +++ b/maps/random_ruins/exoplanets/konyang/village.dm @@ -8,7 +8,7 @@ template_flags = TEMPLATE_FLAG_NO_RUINS|TEMPLATE_FLAG_RUIN_STARTS_DISALLOWED sectors = list(SECTOR_HANEUNIM) suffixes = list("konyang/village.dmm") - ban_ruins = list(/datum/map_template/ruin/exoplanet/konyang_zombie_village) + ban_ruins = list(/datum/map_template/ruin/exoplanet/konyang_abandoned_village) /area/konyang_village name = "Konyang Village" diff --git a/maps/random_ruins/exoplanets/konyang/zombies.dm b/maps/random_ruins/exoplanets/konyang/zombies.dm deleted file mode 100644 index d13d641bb82..00000000000 --- a/maps/random_ruins/exoplanets/konyang/zombies.dm +++ /dev/null @@ -1,19 +0,0 @@ -/datum/map_template/ruin/exoplanet/konyang_zombies - name = "Crashed Hephaestus Shuttle" - id = "konyang_zombies" - description = "A wrecked Hephaestus shuttle in the Konyang jungle, carrying several infected IPCs." - - template_flags = TEMPLATE_FLAG_NO_RUINS|TEMPLATE_FLAG_RUIN_STARTS_DISALLOWED - sectors = list(SECTOR_HANEUNIM) - suffixes = list("konyang/zombies.dmm") - -/obj/effect/landmark/corpse/heph_pilot - name = "Hephaestus Pilot" - corpseuniform = /obj/item/clothing/under/rank/hangar_technician/heph - corpsesuit = /obj/item/clothing/suit/storage/hazardvest/green - corpseshoes = /obj/item/clothing/shoes/workboots - corpsehelmet = /obj/item/clothing/head/helmet/pilot - corpseid = TRUE - corpseidjob = "Shuttle Pilot" - corpseidicon = "heph_card" - species = SPECIES_HUMAN diff --git a/maps/random_ruins/exoplanets/konyang/zombies.dmm b/maps/random_ruins/exoplanets/konyang/zombies.dmm deleted file mode 100644 index c5ab2e5ad72..00000000000 --- a/maps/random_ruins/exoplanets/konyang/zombies.dmm +++ /dev/null @@ -1,1214 +0,0 @@ -//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"a" = ( -/turf/simulated/floor/exoplanet/konyang, -/area/exoplanet/grass/konyang) -"b" = ( -/obj/effect/map_effect/window_spawner/full/reinforced, -/turf/simulated/floor/plating, -/area/exoplanet/grass/konyang) -"c" = ( -/mob/living/simple_animal/hostile/ipc_zombie, -/turf/simulated/floor/tiled, -/area/exoplanet/grass/konyang) -"d" = ( -/mob/living/simple_animal/hostile/ipc_zombie, -/turf/simulated/floor/plating, -/area/exoplanet/grass/konyang) -"e" = ( -/obj/item/material/shard/shrapnel, -/turf/simulated/floor/exoplanet/konyang, -/area/exoplanet/grass/konyang) -"f" = ( -/turf/simulated/floor/plating, -/area/exoplanet/grass/konyang) -"j" = ( -/obj/structure/flora/tree/konyang/spring, -/turf/simulated/floor/exoplanet/konyang, -/area/exoplanet/grass/konyang) -"k" = ( -/turf/simulated/floor/tiled, -/area/exoplanet/grass/konyang) -"l" = ( -/obj/effect/landmark/scorcher, -/obj/effect/gibspawner/robot, -/turf/simulated/floor/exoplanet/dirt_konyang, -/area/exoplanet/grass/konyang) -"n" = ( -/mob/living/simple_animal/hostile/ipc_zombie, -/turf/simulated/floor/exoplanet/konyang, -/area/exoplanet/grass/konyang) -"p" = ( -/obj/item/material/shard, -/turf/simulated/floor/plating, -/area/exoplanet/grass/konyang) -"q" = ( -/obj/item/trash/broken_electronics, -/turf/simulated/floor/tiled, -/area/exoplanet/grass/konyang) -"r" = ( -/obj/effect/overlay/container_logo, -/obj/structure/shipping_container{ - icon_state = "red2" - }, -/turf/simulated/floor/exoplanet/konyang, -/area/exoplanet/grass/konyang) -"s" = ( -/obj/item/trash/broken_electronics, -/turf/simulated/floor/plating, -/area/exoplanet/grass/konyang) -"u" = ( -/obj/effect/gibspawner/robot, -/turf/simulated/floor/plating, -/area/exoplanet/grass/konyang) -"v" = ( -/turf/simulated/wall/shuttle/raider, -/area/exoplanet/grass/konyang) -"w" = ( -/obj/effect/landmark/scorcher, -/obj/item/material/shard/shrapnel, -/turf/simulated/floor/exoplanet/dirt_konyang, -/area/exoplanet/grass/konyang) -"x" = ( -/obj/machinery/light/broken{ - dir = 4 - }, -/obj/item/trash/broken_electronics, -/turf/simulated/floor/plating, -/area/exoplanet/grass/konyang) -"y" = ( -/turf/simulated/floor/exoplanet/dirt_konyang, -/area/exoplanet/grass/konyang) -"z" = ( -/obj/machinery/light/broken{ - dir = 4 - }, -/obj/structure/computerframe, -/turf/simulated/floor/tiled, -/area/exoplanet/grass/konyang) -"B" = ( -/obj/effect/landmark/scorcher, -/turf/simulated/floor/plating, -/area/exoplanet/grass/konyang) -"C" = ( -/obj/structure/grille/broken, -/obj/item/material/shard, -/turf/simulated/floor/plating, -/area/exoplanet/grass/konyang) -"D" = ( -/obj/structure/computerframe, -/obj/item/trash/broken_electronics, -/turf/simulated/floor/tiled, -/area/exoplanet/grass/konyang) -"H" = ( -/obj/structure/shipping_container{ - icon_state = "red2" - }, -/obj/effect/overlay/container_logo{ - icon_state = "heph2" - }, -/obj/effect/overlay/container_logo{ - icon_state = "heph3" - }, -/turf/simulated/floor/exoplanet/konyang, -/area/exoplanet/grass/konyang) -"K" = ( -/obj/structure/shipping_container{ - icon_state = "red2" - }, -/obj/effect/overlay/container_logo, -/turf/simulated/floor/exoplanet/konyang, -/area/exoplanet/grass/konyang) -"L" = ( -/obj/structure/shipping_container{ - icon_state = "red3" - }, -/turf/simulated/floor/exoplanet/konyang, -/area/exoplanet/grass/konyang) -"M" = ( -/obj/effect/landmark/scorcher, -/turf/simulated/floor/exoplanet/dirt_konyang, -/area/exoplanet/grass/konyang) -"N" = ( -/obj/machinery/light/broken{ - dir = 8 - }, -/obj/structure/computerframe, -/turf/simulated/floor/tiled, -/area/exoplanet/grass/konyang) -"P" = ( -/obj/effect/overlay/container_logo{ - icon_state = "heph2" - }, -/obj/effect/overlay/container_logo{ - icon_state = "heph3" - }, -/obj/structure/shipping_container{ - icon_state = "red2" - }, -/turf/simulated/floor/exoplanet/konyang, -/area/exoplanet/grass/konyang) -"Q" = ( -/obj/item/material/shard, -/obj/item/trash/broken_electronics, -/turf/simulated/floor/tiled, -/area/exoplanet/grass/konyang) -"R" = ( -/obj/item/material/shard, -/obj/effect/decal/cleanable/blood, -/obj/effect/landmark/corpse/heph_pilot, -/turf/simulated/floor/tiled, -/area/exoplanet/grass/konyang) -"S" = ( -/obj/structure/shipping_container{ - icon_state = "red1" - }, -/turf/simulated/floor/exoplanet/konyang, -/area/exoplanet/grass/konyang) -"T" = ( -/obj/item/material/shard/shrapnel, -/turf/simulated/floor/plating, -/area/exoplanet/grass/konyang) -"V" = ( -/obj/structure/flora/bush/konyang_reeds, -/turf/simulated/floor/exoplanet/konyang, -/area/exoplanet/grass/konyang) -"W" = ( -/obj/structure/flora/tree/konyang/spring, -/obj/structure/flora/bush/konyang_reeds, -/turf/simulated/floor/exoplanet/konyang, -/area/exoplanet/grass/konyang) -"X" = ( -/obj/structure/window_frame/empty, -/obj/item/material/shard, -/turf/simulated/floor/plating, -/area/exoplanet/grass/konyang) -"Y" = ( -/obj/machinery/light/broken{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/exoplanet/grass/konyang) - -(1,1,1) = {" -a -a -a -a -a -a -a -a -j -a -a -a -a -a -j -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -"} -(2,1,1) = {" -a -a -a -j -a -a -j -a -a -V -W -a -a -a -a -a -a -j -a -a -j -a -a -a -a -j -a -j -a -a -a -"} -(3,1,1) = {" -a -a -a -a -a -a -a -V -V -V -a -a -a -a -a -a -V -V -V -V -V -a -a -j -a -a -a -a -a -a -a -"} -(4,1,1) = {" -a -a -j -a -a -j -a -a -a -j -a -a -a -a -a -a -j -V -V -a -W -a -a -a -a -a -V -V -V -W -a -"} -(5,1,1) = {" -a -a -a -a -a -a -a -a -j -a -a -a -a -j -a -a -a -a -a -a -a -a -a -a -a -a -j -V -V -V -a -"} -(6,1,1) = {" -a -j -a -a -a -j -a -a -a -a -a -a -a -a -a -n -a -a -a -j -n -a -a -j -a -a -a -V -V -j -a -"} -(7,1,1) = {" -a -j -a -a -a -a -a -j -a -a -j -n -a -a -j -a -a -a -a -a -a -a -a -a -a -a -j -a -V -a -a -"} -(8,1,1) = {" -a -a -a -a -a -a -a -V -V -a -a -j -a -a -a -a -j -a -j -a -a -a -j -a -a -a -a -a -a -a -a -"} -(9,1,1) = {" -a -a -a -V -j -a -a -V -a -n -a -a -a -j -a -a -a -a -a -a -j -a -a -n -n -a -a -a -a -j -a -"} -(10,1,1) = {" -a -j -V -W -a -a -a -j -a -a -a -a -j -a -a -a -S -a -a -a -a -a -a -a -a -a -a -a -a -a -a -"} -(11,1,1) = {" -a -a -V -a -a -a -a -a -a -j -a -a -a -e -a -a -K -a -n -a -a -a -j -a -a -a -j -a -a -a -a -"} -(12,1,1) = {" -a -a -V -V -a -a -a -n -a -a -a -a -M -M -M -y -H -a -a -a -j -a -a -a -a -a -a -a -a -a -a -"} -(13,1,1) = {" -a -a -j -a -a -a -j -a -a -a -n -M -M -M -M -y -L -M -M -a -a -a -a -j -a -a -a -a -a -a -a -"} -(14,1,1) = {" -a -a -a -a -j -a -a -a -S -a -a -a -w -M -M -M -M -M -M -M -M -M -n -a -a -a -j -a -a -a -a -"} -(15,1,1) = {" -a -a -a -a -a -a -a -a -r -a -M -M -M -M -M -f -v -v -v -B -M -M -a -a -a -a -a -a -a -j -a -"} -(16,1,1) = {" -a -a -a -a -a -j -a -a -P -a -a -M -M -M -u -T -q -Y -v -v -M -a -a -j -a -a -a -a -a -a -a -"} -(17,1,1) = {" -a -a -j -a -a -a -a -a -L -a -a -M -M -M -f -d -k -p -N -b -M -a -a -a -a -a -a -a -a -a -a -"} -(18,1,1) = {" -a -V -a -a -a -a -j -a -a -n -a -n -M -M -f -f -f -R -D -X -M -n -a -a -j -a -a -a -a -a -a -"} -(19,1,1) = {" -a -V -V -a -a -a -a -a -a -a -a -a -M -M -f -f -c -Q -z -C -M -a -a -a -a -a -a -a -j -a -a -"} -(20,1,1) = {" -a -V -V -a -j -a -a -n -a -j -a -w -M -l -T -s -Q -x -v -v -M -a -j -a -a -a -a -a -a -a -a -"} -(21,1,1) = {" -a -V -a -a -a -a -j -a -a -a -a -M -M -M -M -v -v -v -v -B -M -a -a -a -a -j -a -a -a -W -a -"} -(22,1,1) = {" -a -a -a -a -a -a -a -a -a -a -j -e -a -M -M -M -M -M -M -M -M -n -a -a -a -a -V -V -V -V -a -"} -(23,1,1) = {" -a -a -a -j -V -a -a -j -a -a -a -a -a -j -M -a -a -a -a -a -j -a -a -a -j -a -V -V -V -V -a -"} -(24,1,1) = {" -a -a -a -a -V -V -a -a -a -a -n -a -a -M -M -a -a -j -n -a -a -a -a -a -a -a -V -V -a -a -a -"} -(25,1,1) = {" -a -a -j -a -a -V -V -a -a -j -a -a -a -a -j -a -a -a -a -a -a -a -a -a -a -a -V -a -j -a -a -"} -(26,1,1) = {" -a -a -a -a -j -a -a -a -a -a -a -j -a -a -a -a -a -a -a -a -a -a -j -a -a -j -a -a -a -a -a -"} -(27,1,1) = {" -a -a -a -a -a -a -a -j -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -j -a -"} -(28,1,1) = {" -a -a -j -a -a -a -a -a -a -a -a -a -a -a -a -j -a -a -j -a -a -a -a -a -a -a -a -a -a -a -a -"} -(29,1,1) = {" -a -a -a -a -a -j -a -a -a -j -a -a -j -a -a -a -a -a -a -a -a -a -a -a -a -j -a -a -a -a -a -"} -(30,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -j -a -a -a -j -a -a -a -a -a -a -a -j -a -"} -(31,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -"}