From 9445c0ef3ec4b5d05a6488aeaa4879ab0600963a Mon Sep 17 00:00:00 2001 From: ToonClyde <49804499+ToonClyde@users.noreply.github.com> Date: Mon, 21 Sep 2020 19:01:46 -0700 Subject: [PATCH 1/2] A defib for Dahl --- .../LavaRuins/lavaland_surface_syndicate_base1.dmm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm index c7d839b3..9d771a40 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm @@ -27,6 +27,7 @@ "aA" = (/obj/effect/decal/cleanable/dirt,/turf/open/floor/mineral/plastitanium,/area/ruin/unpowered/syndicate_lava_base/testlab) "aB" = (/obj/machinery/porta_turret/syndicate{dir = 8},/turf/closed/wall/mineral/plastitanium/nodiagonal,/area/ruin/unpowered/syndicate_lava_base/main) "aC" = (/obj/machinery/porta_turret/syndicate{dir = 4},/turf/closed/wall/mineral/plastitanium/nodiagonal,/area/ruin/unpowered/syndicate_lava_base/main) +"aD" = (/obj/structure/closet/secure_closet/medical1{req_access = null; req_access_txt = "150"},/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/item/defibrillator/compact/combat,/turf/open/floor/plasteel/white/side{dir = 9},/area/ruin/unpowered/syndicate_lava_base/medbay) "aE" = (/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/machinery/light/small{dir = 8},/turf/open/floor/plasteel/dark,/area/ruin/unpowered/syndicate_lava_base/telecomms) "aF" = (/turf/open/floor/mineral/plastitanium,/area/ruin/unpowered/syndicate_lava_base/testlab) "aI" = (/obj/machinery/airalarm/syndicate{dir = 4; pixel_x = -24},/obj/structure/closet/crate/bin,/turf/open/floor/plasteel/dark,/area/ruin/unpowered/syndicate_lava_base/telecomms) @@ -558,7 +559,6 @@ "lj" = (/obj/machinery/door/window/southleft{base_state = "right"; dir = 1; icon_state = "right"; name = "Bar"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,/turf/open/floor/wood,/area/ruin/unpowered/syndicate_lava_base/bar) "lk" = (/obj/structure/table/wood,/obj/machinery/light/small{dir = 4},/obj/machinery/computer/security/telescreen/entertainment{pixel_x = 30},/obj/structure/window/reinforced{dir = 1; pixel_y = 1},/obj/item/book/manual/chef_recipes{pixel_x = 2; pixel_y = 6},/obj/item/book/manual/wiki/barman_recipes,/obj/item/reagent_containers/food/drinks/shaker,/turf/open/floor/wood,/area/ruin/unpowered/syndicate_lava_base/bar) "ll" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,/obj/structure/cable/yellow{icon_state = "1-2"},/obj/structure/reagent_dispensers/beerkeg,/turf/open/floor/plasteel/dark,/area/ruin/unpowered/syndicate_lava_base/bar) -"lm" = (/obj/structure/closet/secure_closet/medical1{req_access = null; req_access_txt = "150"},/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/open/floor/plasteel/white/side{dir = 9},/area/ruin/unpowered/syndicate_lava_base/medbay) "ln" = (/turf/open/floor/plasteel/white/side{dir = 1},/area/ruin/unpowered/syndicate_lava_base/medbay) "lo" = (/obj/machinery/light/small{dir = 1},/obj/structure/table,/obj/item/storage/firstaid/fire,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/open/floor/plasteel/white/side{dir = 5},/area/ruin/unpowered/syndicate_lava_base/medbay) "lp" = (/obj/effect/turf_decal/stripes/line{dir = 10},/obj/machinery/power/terminal{dir = 1},/obj/structure/cable{icon_state = "0-4"},/obj/effect/decal/cleanable/dirt,/turf/open/floor/plating,/area/ruin/unpowered/syndicate_lava_base/engineering) @@ -749,7 +749,7 @@ abababababababababababdGiuivjxccczfJjLcBjNjOjyjyhzhzjQhzhzhzhzjRjSifjTjUjVjWklju ababababababdGdGdGababdGiuivjxgFjZjNjYjNjZjNkajykbkckdkekfkghPiQkikjjujujukkklkmjujujujujuababab ababababababdGaBdGdGdGdGiuivjxgUknjZjNjZkokpkqjyjykrjyjQkskthakukvkwgnkxkykzkAkBkCkDkEkFjuababab ababababababdGdGdGababdGiujkjxkGkHjNkIkJkKkLkMjykNkOjyjQkPkQkQkRkSkTIJkVkWkXkYkZlalblcldjuababab -abababababababababababdGiulejylfjNjZlglhliljlkjyjZlljyjQkQkQlmlnlnloIJlplqlrlsltlujujujuaCababab +abababababababababababdGiulejylfjNjZlglhliljlkjyjZlljyjQkQkQaDlnlnloIJlplqlrlsltlujujujuaCababab abababababababababababdGlvlwjylxjZjNlylzlAlBlCaklElFjyjpkQlGlHlIlJlKIJlLlMlNlOltlPkDlQlRjuababab abababababababababababhalTlTjyjylUjZlVlWlXlYlZmambmcjyjpkQmdmelImfkQkUmgmhmimjmkmllbmmldjuababab ababababmnmnmnmpmpmpmpmnmqmrmsjymtknmumvmwlAmxjymyjyjymzkQmAmBmCmDmEIJmFmGmHmImJmKjujujujuababab From 77e88027ba16b0ed299edf29324bffdc8ea04992 Mon Sep 17 00:00:00 2001 From: ToonClyde <49804499+ToonClyde@users.noreply.github.com> Date: Tue, 22 Sep 2020 12:24:42 -0700 Subject: [PATCH 2/2] Missing wires and areas --- _maps/RandomRuins/LavaRuins/lavaland_surface_hermit.dmm | 3 +-- .../RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm | 2 +- _maps/RandomRuins/SpaceRuins/spacehermit.dmm | 3 +-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_hermit.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_hermit.dmm index 60c6633a..7a3f9048 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_hermit.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_hermit.dmm @@ -35,7 +35,6 @@ "I" = (/obj/structure/chair{dir = 4},/turf/open/floor/mineral/titanium/blue,/area/ruin/powered) "J" = (/obj/effect/spawner/structure/window/shuttle,/turf/open/floor/plating{initial_gas_mix = "o2=14;n2=23;TEMP=300"},/area/ruin/powered) "K" = (/obj/structure/mirror{pixel_x = 28},/turf/open/floor/plating,/area/ruin/powered) -"L" = (/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/space) (1,1,1) = {" aaaaaaaabbcbaaaa @@ -52,6 +51,6 @@ sssatxyztAcaaaaa sssstByCtbbaaaaa ssssttDttaaaaaaa ssssssssssaEFFGa -sLsssssssssHIIJa +sssssssssssHIIJa sssssssssssEFFGa "} diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm index 9d771a40..1a3d28c2 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm @@ -12,7 +12,7 @@ "al" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/machinery/vending/medical/syndicate_access,/turf/open/floor/plasteel/white,/area/ruin/unpowered/syndicate_lava_base/medbay) "am" = (/obj/effect/turf_decal/tile/red{dir = 1},/obj/effect/turf_decal/tile/red{dir = 4},/obj/machinery/atmospherics/components/unary/vent_pump/on,/turf/open/floor/plasteel,/area/ruin/unpowered/syndicate_lava_base/arrivals) "an" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{dir = 4},/obj/structure/cable/yellow{icon_state = "4-8"},/obj/machinery/atmospherics/pipe/manifold/supply/hidden,/turf/open/floor/plasteel,/area/ruin/unpowered/syndicate_lava_base/arrivals) -"ao" = (/obj/structure/cable/yellow{icon_state = "4-8"},/obj/effect/turf_decal/tile/red{dir = 4},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{dir = 1},/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 1},/turf/open/floor/plasteel,/area/ruin/unpowered/syndicate_lava_base/arrivals) +"ao" = (/obj/structure/cable/yellow{icon_state = "4-8"},/obj/effect/turf_decal/tile/red{dir = 4},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{dir = 1},/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 1},/obj/structure/cable/yellow{icon_state = "2-4"},/turf/open/floor/plasteel,/area/ruin/unpowered/syndicate_lava_base/arrivals) "ap" = (/obj/machinery/porta_turret/syndicate{dir = 5},/turf/closed/wall/mineral/plastitanium/nodiagonal,/area/ruin/unpowered/syndicate_lava_base/main) "aq" = (/obj/machinery/porta_turret/syndicate{dir = 6},/turf/closed/wall/mineral/plastitanium/nodiagonal,/area/ruin/unpowered/syndicate_lava_base/main) "ar" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{dir = 4},/obj/machinery/firealarm{dir = 2; pixel_y = 24},/obj/structure/cable/yellow{icon_state = "4-8"},/obj/effect/turf_decal/tile/red{dir = 1},/obj/effect/turf_decal/tile/red{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/open/floor/plasteel,/area/ruin/unpowered/syndicate_lava_base/arrivals) diff --git a/_maps/RandomRuins/SpaceRuins/spacehermit.dmm b/_maps/RandomRuins/SpaceRuins/spacehermit.dmm index 15871e65..84f7a607 100644 --- a/_maps/RandomRuins/SpaceRuins/spacehermit.dmm +++ b/_maps/RandomRuins/SpaceRuins/spacehermit.dmm @@ -70,7 +70,6 @@ "br" = (/obj/item/stack/ore/iron,/obj/item/stack/sheet/mineral/plasma,/obj/item/stack/sheet/mineral/plasma,/turf/open/floor/plating/asteroid,/area/ruin/unpowered) "bs" = (/obj/item/flashlight/lamp/bananalamp,/turf/open/floor/plating/asteroid,/area/ruin/unpowered) "bt" = (/obj/structure/fluff/empty_cryostasis_sleeper,/obj/structure/mirror{pixel_x = 28},/turf/open/floor/mineral/titanium,/area/ruin/powered) -"bu" = (/turf/open/floor/plating/asteroid,/area/space) (1,1,1) = {" aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa @@ -109,7 +108,7 @@ aAababababababababababababababaRaRaTacabaUavbcacacacacacaPababababababaSaAaiaaaa aAababababababababababaeafalafaeagacacacbdbebfacacacacacacacacbgacaSaSaSaSaiaaaaaaaaaaaaaaaaaAaAaaaa aAababababababababaeafaeaYajbtaeagacacacacacacacacacacacacacacacacbiacaSaSaiaiaaaaaaaaaaaaaaaaaaaaaa aAababababababaeafaeanbhaoapaoanafacacacacacacacaRacacacaRacacacbjacacbkaSaiaiaaaaaaaaaaaaaaaaaaaaaa -aAababababababafaqaoananaoanaoanaracacacblacacbuacacacacacacacacacacacbkbkaiaiaaaaaaaaaaaaaaaaaaaaaa +aAababababababafaqaoananaoanaoanaracacacblacacacacacacacacacacacacacacbkbkaiaiaaaaaaaaaaaaaaaaaaaaaa aaaAabababababaeafaeananaoasaoanafacacacbmbnacacacacacacacaPacacacacacaSaSaiaaaaaaaaaaaaaaaaaaaaaMaa aaaAabababababababaeafaeakajbtaeatacacacacboacacacacbpacacacacacacaSaSaSaSaiaiaiaaaaaaaaaaaaaaaaaaaa aaaAabababababababababaZbaaEbaaZbbacacacacboacacacacacacacbgaSaSaSaSaSaSaSaiaaaaaaaaaaaaaaaaaaaaaaaa