From 53aa296cf4d62436d2cb147f051559be527df192 Mon Sep 17 00:00:00 2001 From: beepbopbeepbop <98155621+beepbopbeepbop@users.noreply.github.com> Date: Thu, 18 Jul 2024 07:14:45 +1000 Subject: [PATCH] Moghes/Ouerea pen fixes (#19613) Fixes the animal pen situation on Moghes and Ouerea. Refer to changelog for more info. --- html/changelogs/pen changelog.yml | 58 ++++++ .../moghes/moghes_diona_traders.dmm | 18 +- .../moghes/moghes_kataphract_wasteland.dmm | 141 ++++++++++++--- .../exoplanets/moghes/moghes_siakh.dmm | 151 +++++++++++++--- .../moghes/moghes_wasteland_dorviza.dmm | 165 +++++++++++++++--- .../moghes/moghes_wasteland_mikuetz.dmm | 31 +++- .../moghes/moghes_wasteland_priests.dmm | 142 ++++++++++++--- .../moghes/moghes_wasteland_queendom.dmm | 11 +- .../exoplanets/ouerea/ouerea_freewater.dmm | 10 +- .../ouerea/ouerea_hegemony_base.dmm | 11 +- 10 files changed, 639 insertions(+), 99 deletions(-) create mode 100644 html/changelogs/pen changelog.yml diff --git a/html/changelogs/pen changelog.yml b/html/changelogs/pen changelog.yml new file mode 100644 index 00000000000..830c1db1113 --- /dev/null +++ b/html/changelogs/pen changelog.yml @@ -0,0 +1,58 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# Your name. +author: not-a-gonk + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - qol: "Gives the existing animal pens on Moghes and Ouerea gates, and adds some new pens to Moghes ghostspawns that were missing them." diff --git a/maps/random_ruins/exoplanets/moghes/moghes_diona_traders.dmm b/maps/random_ruins/exoplanets/moghes/moghes_diona_traders.dmm index 84d0a617b23..2576d56cd4c 100644 --- a/maps/random_ruins/exoplanets/moghes/moghes_diona_traders.dmm +++ b/maps/random_ruins/exoplanets/moghes/moghes_diona_traders.dmm @@ -332,9 +332,23 @@ temperature = 303.15 }, /area/moghes_diona_traders) +"At" = ( +/obj/machinery/door/urban{ + dir = 4; + pixel_x = -3 + }, +/turf/simulated/floor/exoplanet/grass/moghes/dirt, +/area/exoplanet/moghes) "AQ" = ( /turf/simulated/floor/exoplanet/grass/moghes/dirt, /area/exoplanet/moghes) +"Bd" = ( +/obj/machinery/door/urban{ + dir = 4; + pixel_x = -29 + }, +/turf/simulated/floor/exoplanet/grass/moghes, +/area/exoplanet/moghes) "BA" = ( /obj/structure/table/wood, /obj/item/paper/fluff/moghes_diona_ad, @@ -1013,7 +1027,7 @@ tm tm JF TP -AQ +At TP hD tm @@ -1357,7 +1371,7 @@ tm QP Xb Xb -tm +Bd Xb Xb eS diff --git a/maps/random_ruins/exoplanets/moghes/moghes_kataphract_wasteland.dmm b/maps/random_ruins/exoplanets/moghes/moghes_kataphract_wasteland.dmm index 366eda1604c..f9e2b0721f3 100644 --- a/maps/random_ruins/exoplanets/moghes/moghes_kataphract_wasteland.dmm +++ b/maps/random_ruins/exoplanets/moghes/moghes_kataphract_wasteland.dmm @@ -10,6 +10,14 @@ temperature = 315.15 }, /area/moghes/kataphract_wasteland) +"c" = ( +/obj/structure/railing/fence{ + dir = 1 + }, +/turf/simulated/floor/exoplanet/desert{ + temperature = 315.15 + }, +/area/moghes/kataphract_wasteland) "d" = ( /obj/structure/closet/crate/freezer, /obj/item/storage/box/fancy/mre/menu10, @@ -109,6 +117,20 @@ /obj/item/clothing/shoes/sandals/caligae, /turf/simulated/floor/exoplanet/carpet/orange, /area/moghes/kataphract_wasteland/tent) +"t" = ( +/obj/structure/railing/fence, +/mob/living/simple_animal/hostile/retaliate/hegeranzi, +/turf/simulated/floor/exoplanet/desert{ + temperature = 315.15 + }, +/area/moghes/kataphract_wasteland) +"u" = ( +/obj/structure/railing/fence, +/obj/structure/sink/puddle, +/turf/simulated/floor/exoplanet/desert{ + temperature = 315.15 + }, +/area/moghes/kataphract_wasteland) "v" = ( /obj/structure/reagent_dispensers/watertank, /turf/simulated/floor/exoplanet/carpet/lightblue, @@ -118,31 +140,97 @@ /obj/random/dirt_75, /turf/simulated/floor/exoplanet/carpet/orange, /area/moghes/kataphract_wasteland/tent) +"x" = ( +/mob/living/simple_animal/hostile/retaliate/hegeranzi, +/turf/simulated/floor/exoplanet/desert{ + temperature = 315.15 + }, +/area/moghes/kataphract_wasteland) "y" = ( /obj/effect/floor_decal/spline/plain/blue{ dir = 8 }, /turf/simulated/floor/exoplanet/carpet/lightblue, /area/moghes/kataphract_wasteland/tent) +"z" = ( +/obj/structure/railing/fence{ + dir = 8 + }, +/turf/simulated/floor/exoplanet/desert{ + temperature = 315.15 + }, +/area/moghes/kataphract_wasteland) +"A" = ( +/obj/structure/railing/fence, +/obj/structure/railing/fence{ + dir = 8 + }, +/turf/simulated/floor/exoplanet/desert{ + temperature = 315.15 + }, +/area/moghes/kataphract_wasteland) "D" = ( /obj/random/dirt_75, /turf/simulated/floor/exoplanet/carpet/orange, /area/moghes/kataphract_wasteland/tent) +"E" = ( +/obj/machinery/door/urban{ + dir = 4; + pixel_x = -3 + }, +/turf/simulated/floor/exoplanet/desert{ + temperature = 315.15 + }, +/area/moghes/kataphract_wasteland) "F" = ( /obj/effect/floor_decal/spline/plain/blue{ dir = 10 }, /turf/simulated/floor/exoplanet/carpet/lightblue, /area/moghes/kataphract_wasteland/tent) +"G" = ( +/obj/structure/railing/fence, +/obj/structure/railing/fence{ + dir = 4 + }, +/turf/simulated/floor/exoplanet/desert{ + temperature = 315.15 + }, +/area/moghes/kataphract_wasteland) "H" = ( /turf/simulated/floor/exoplanet/carpet/orange, /area/moghes/kataphract_wasteland/tent) +"I" = ( +/obj/structure/railing/fence{ + dir = 1 + }, +/obj/structure/railing/fence{ + dir = 8 + }, +/turf/simulated/floor/exoplanet/desert{ + temperature = 315.15 + }, +/area/moghes/kataphract_wasteland) "J" = ( /obj/random/dirt_75, /turf/simulated/floor/exoplanet/tiled{ temperature = 315.15 }, /area/moghes/kataphract_wasteland) +"K" = ( +/obj/structure/railing/fence{ + dir = 4 + }, +/turf/simulated/floor/exoplanet/desert{ + temperature = 315.15 + }, +/area/moghes/kataphract_wasteland) +"L" = ( +/obj/structure/railing/fence, +/turf/simulated/floor/exoplanet/desert{ + temperature = 315.15 + }, +/area/moghes/kataphract_wasteland) "M" = ( /obj/item/bedsheet/red, /obj/effect/ghostspawpoint{ @@ -161,6 +249,17 @@ /obj/item/device/flashlight/lantern, /turf/simulated/floor/exoplanet/carpet/orange, /area/moghes/kataphract_wasteland/tent) +"Q" = ( +/obj/structure/railing/fence{ + dir = 4 + }, +/obj/structure/railing/fence{ + dir = 1 + }, +/turf/simulated/floor/exoplanet/desert{ + temperature = 315.15 + }, +/area/moghes/kataphract_wasteland) "R" = ( /turf/simulated/wall/cloth, /area/moghes/kataphract_wasteland/tent) @@ -390,11 +489,11 @@ h h a a -a -a -a -a -a +I +z +z +z +A a a a @@ -422,11 +521,11 @@ h k a a +c +x a a -a -a -a +L a a a @@ -454,11 +553,11 @@ a a a a +c a a -a -a -a +x +L a a a @@ -486,11 +585,11 @@ a a a a -J -a +c a a a +u J a a @@ -518,11 +617,11 @@ a a a a +c a +x a -a -a -a +t a a a @@ -550,11 +649,11 @@ J J a a -a -a -a -a -a +Q +K +E +K +G a a a diff --git a/maps/random_ruins/exoplanets/moghes/moghes_siakh.dmm b/maps/random_ruins/exoplanets/moghes/moghes_siakh.dmm index 1b782ac1d98..18efda8b940 100644 --- a/maps/random_ruins/exoplanets/moghes/moghes_siakh.dmm +++ b/maps/random_ruins/exoplanets/moghes/moghes_siakh.dmm @@ -6,7 +6,7 @@ /area/exoplanet/moghes) "b" = ( /mob/living/simple_animal/threshbeast, -/turf/simulated/floor/exoplanet/foundation{ +/turf/simulated/floor/exoplanet/desert{ temperature = 315.15 }, /area/exoplanet/moghes) @@ -20,14 +20,82 @@ temperature = 315.15 }, /area/exoplanet/moghes) +"i" = ( +/obj/structure/railing/fence{ + dir = 8 + }, +/turf/simulated/floor/exoplanet/desert{ + temperature = 315.15 + }, +/area/exoplanet/moghes) +"l" = ( +/obj/structure/railing/fence{ + dir = 8 + }, +/mob/living/simple_animal/threshbeast, +/turf/simulated/floor/exoplanet/desert{ + temperature = 315.15 + }, +/area/exoplanet/moghes) +"q" = ( +/obj/structure/railing/fence, +/obj/structure/railing/fence{ + dir = 4 + }, +/turf/simulated/floor/exoplanet/desert{ + temperature = 315.15 + }, +/area/exoplanet/moghes) +"s" = ( +/obj/structure/railing/fence{ + dir = 4 + }, +/turf/simulated/floor/exoplanet/desert{ + temperature = 315.15 + }, +/area/exoplanet/moghes) +"t" = ( +/mob/living/simple_animal/hostile/retaliate/hegeranzi, +/turf/simulated/floor/exoplanet/desert{ + temperature = 315.15 + }, +/area/exoplanet/moghes) "v" = ( /turf/simulated/floor/exoplanet/foundation{ temperature = 315.15 }, /area/exoplanet/moghes) +"x" = ( +/obj/structure/railing/fence{ + dir = 4 + }, +/obj/structure/railing/fence{ + dir = 1 + }, +/turf/simulated/floor/exoplanet/desert{ + temperature = 315.15 + }, +/area/exoplanet/moghes) +"y" = ( +/obj/structure/railing/fence{ + dir = 4 + }, +/obj/structure/sink/puddle, +/turf/simulated/floor/exoplanet/desert{ + temperature = 315.15 + }, +/area/exoplanet/moghes) "z" = ( /turf/simulated/wall/rusty, /area/exoplanet/moghes) +"B" = ( +/obj/structure/railing/fence{ + dir = 1 + }, +/turf/simulated/floor/exoplanet/desert{ + temperature = 315.15 + }, +/area/exoplanet/moghes) "H" = ( /obj/structure/closet/crate, /obj/item/reagent_containers/food/snacks/meat, @@ -53,6 +121,21 @@ temperature = 315.15 }, /area/exoplanet/moghes) +"J" = ( +/obj/structure/railing/fence, +/turf/simulated/floor/exoplanet/desert{ + temperature = 315.15 + }, +/area/exoplanet/moghes) +"L" = ( +/obj/structure/railing/fence, +/obj/structure/railing/fence{ + dir = 8 + }, +/turf/simulated/floor/exoplanet/desert{ + temperature = 315.15 + }, +/area/exoplanet/moghes) "N" = ( /obj/structure/closet/crate, /obj/item/clothing/suit/unathi/robe/beige, @@ -82,6 +165,15 @@ temperature = 315.15 }, /area/exoplanet/moghes) +"Q" = ( +/obj/machinery/door/urban{ + dir = 4; + pixel_x = -29 + }, +/turf/simulated/floor/exoplanet/desert{ + temperature = 315.15 + }, +/area/exoplanet/moghes) "R" = ( /obj/structure/closet/crate, /obj/item/material/sword/axe, @@ -99,6 +191,17 @@ temperature = 315.15 }, /area/exoplanet/moghes) +"V" = ( +/obj/structure/railing/fence{ + dir = 1 + }, +/obj/structure/railing/fence{ + dir = 8 + }, +/turf/simulated/floor/exoplanet/desert{ + temperature = 315.15 + }, +/area/exoplanet/moghes) "Y" = ( /obj/effect/ghostspawpoint{ name = "igs - moghes_siakh_knight"; @@ -256,9 +359,9 @@ z z v v -b v -b +v +v z z a @@ -394,11 +497,11 @@ H v a a -a -a -a -a -a +V +i +Q +l +L a a "} @@ -416,11 +519,11 @@ z z a a +B a a a -a -a +J a a "} @@ -438,11 +541,11 @@ a a a a +B +b a -a -a -a -a +t +J a a "} @@ -460,11 +563,11 @@ a a a a +B a a a -a -a +J a a "} @@ -482,11 +585,11 @@ a a a a +B a +b a -a -a -a +J a a "} @@ -504,11 +607,11 @@ a a a a -a -a -a -a -a +x +y +s +s +q a a "} diff --git a/maps/random_ruins/exoplanets/moghes/moghes_wasteland_dorviza.dmm b/maps/random_ruins/exoplanets/moghes/moghes_wasteland_dorviza.dmm index d0d9deea1c6..cad4f84c1dd 100644 --- a/maps/random_ruins/exoplanets/moghes/moghes_wasteland_dorviza.dmm +++ b/maps/random_ruins/exoplanets/moghes/moghes_wasteland_dorviza.dmm @@ -20,6 +20,16 @@ /obj/random/dirt_75, /turf/simulated/floor/exoplanet/carpet/orange, /area/moghes_dorviza/tent) +"fQ" = ( +/obj/structure/railing/fence{ + dir = 4 + }, +/obj/structure/sink/puddle, +/mob/living/simple_animal/threshbeast, +/turf/simulated/floor/exoplanet/desert{ + temperature = 315.15 + }, +/area/moghes_dorviza) "gE" = ( /obj/structure/sink/puddle, /turf/simulated/floor/exoplanet/desert{ @@ -67,6 +77,14 @@ /obj/effect/floor_decal/spline/plain/brown, /turf/simulated/floor/exoplanet/carpet/orange, /area/moghes_dorviza/tent) +"mM" = ( +/obj/structure/railing/fence{ + dir = 4 + }, +/turf/simulated/floor/exoplanet/desert{ + temperature = 315.15 + }, +/area/moghes_dorviza) "mN" = ( /obj/structure/curtain/open, /obj/random/dirt_75, @@ -87,6 +105,20 @@ temperature = 315.15 }, /area/moghes_dorviza) +"oF" = ( +/obj/structure/railing/fence{ + dir = 1 + }, +/turf/simulated/floor/exoplanet/desert{ + temperature = 315.15 + }, +/area/moghes_dorviza) +"pB" = ( +/obj/structure/railing/fence, +/turf/simulated/floor/exoplanet/desert{ + temperature = 315.15 + }, +/area/moghes_dorviza) "qJ" = ( /obj/structure/flora/grass/desert/bush, /turf/simulated/floor/exoplanet/desert{ @@ -107,6 +139,15 @@ temperature = 315.15 }, /area/moghes_dorviza) +"tD" = ( +/obj/machinery/door/urban{ + dir = 4; + pixel_x = -29 + }, +/turf/simulated/floor/exoplanet/desert{ + temperature = 315.15 + }, +/area/moghes_dorviza) "uG" = ( /obj/random/dirt_75, /obj/effect/floor_decal/spline/plain/blue{ @@ -123,6 +164,17 @@ /obj/item/roller, /turf/simulated/floor/exoplanet/carpet/orange, /area/moghes_dorviza/tent) +"wK" = ( +/obj/structure/railing/fence{ + dir = 4 + }, +/obj/structure/railing/fence{ + dir = 1 + }, +/turf/simulated/floor/exoplanet/desert{ + temperature = 315.15 + }, +/area/moghes_dorviza) "ym" = ( /obj/structure/closet/crate, /obj/item/clothing/suit/unathi/robe/beige, @@ -184,6 +236,13 @@ }, /turf/simulated/floor/exoplanet/carpet/orange, /area/moghes_dorviza/tent) +"Ch" = ( +/obj/structure/railing/fence, +/obj/structure/flora/grass/desert, +/turf/simulated/floor/exoplanet/desert{ + temperature = 315.15 + }, +/area/moghes_dorviza) "DH" = ( /obj/structure/bed, /turf/simulated/floor/exoplanet/carpet/orange, @@ -281,6 +340,14 @@ temperature = 315.15 }, /area/moghes_dorviza) +"La" = ( +/obj/structure/railing/fence{ + dir = 8 + }, +/turf/simulated/floor/exoplanet/desert{ + temperature = 315.15 + }, +/area/moghes_dorviza) "LW" = ( /turf/simulated/floor/exoplanet/desert{ temperature = 315.15 @@ -292,6 +359,16 @@ temperature = 315.15 }, /area/moghes_dorviza) +"Me" = ( +/obj/structure/railing/fence, +/obj/structure/railing/fence{ + dir = 8 + }, +/obj/structure/flora/grass/desert, +/turf/simulated/floor/exoplanet/desert{ + temperature = 315.15 + }, +/area/moghes_dorviza) "MJ" = ( /obj/item/nullrod/shaman, /obj/structure/closet/crate, @@ -364,6 +441,13 @@ /obj/random/dirt_75, /turf/simulated/floor/exoplanet/carpet/red, /area/moghes_dorviza/tent) +"Qv" = ( +/obj/structure/flora/grass/desert, +/mob/living/simple_animal/threshbeast, +/turf/simulated/floor/exoplanet/desert{ + temperature = 315.15 + }, +/area/moghes_dorviza) "QF" = ( /turf/simulated/floor/exoplanet/carpet/red, /area/moghes_dorviza/tent) @@ -393,6 +477,23 @@ /obj/item/tank/anesthetic, /turf/simulated/floor/exoplanet/carpet/orange, /area/moghes_dorviza/tent) +"Ty" = ( +/obj/structure/railing/fence{ + dir = 1 + }, +/obj/structure/railing/fence{ + dir = 8 + }, +/turf/simulated/floor/exoplanet/desert{ + temperature = 315.15 + }, +/area/moghes_dorviza) +"TX" = ( +/mob/living/simple_animal/threshbeast, +/turf/simulated/floor/exoplanet/desert{ + temperature = 315.15 + }, +/area/moghes_dorviza) "UD" = ( /obj/random/dirt_75, /turf/simulated/floor/exoplanet/carpet/red, @@ -417,6 +518,15 @@ /obj/item/reagent_containers/glass/bucket/wood, /turf/simulated/floor/exoplanet/carpet/red, /area/moghes_dorviza/tent) +"Wq" = ( +/obj/structure/railing/fence, +/obj/structure/railing/fence{ + dir = 4 + }, +/turf/simulated/floor/exoplanet/desert{ + temperature = 315.15 + }, +/area/moghes_dorviza) "WZ" = ( /obj/random/dirt_75, /turf/simulated/floor/exoplanet/carpet/darkblue, @@ -441,6 +551,15 @@ }, /turf/simulated/floor/exoplanet/carpet/orange, /area/moghes_dorviza/tent) +"YU" = ( +/obj/structure/railing/fence{ + dir = 4 + }, +/obj/structure/flora/grass/desert, +/turf/simulated/floor/exoplanet/desert{ + temperature = 315.15 + }, +/area/moghes_dorviza) "ZJ" = ( /obj/structure/closet/crate/freezer, /obj/item/reagent_containers/food/snacks/fish/fishfillet, @@ -1369,11 +1488,11 @@ RC RC Nk Nk -Nk -Nk -Nk -Nk -Nk +Ty +La +tD +La +Me Nk Nk Nk @@ -1406,11 +1525,11 @@ Oj RC RC Nk +oF +Qv Nk Nk -Nk -Nk -Nk +pB Nk Nk Nk @@ -1443,11 +1562,11 @@ LW MJ RC Nk +oF Nk -Nk -Nk -Nk -Nk +ko +Qv +pB Nk Nk Nk @@ -1480,11 +1599,11 @@ Td LW RC Nk +oF +ko Nk Nk -Nk -Nk -Nk +pB Nk Nk Nk @@ -1517,11 +1636,11 @@ LW Oj RC Nk +oF Nk Nk -Nk -Nk -Nk +TX +Ch Nk Nk Nk @@ -1554,11 +1673,11 @@ LW RC RC Nk -Nk -Nk -Nk -Nk -Nk +wK +fQ +mM +YU +Wq Nk Nk Nk diff --git a/maps/random_ruins/exoplanets/moghes/moghes_wasteland_mikuetz.dmm b/maps/random_ruins/exoplanets/moghes/moghes_wasteland_mikuetz.dmm index 3f029d358b4..594c3a6f68e 100644 --- a/maps/random_ruins/exoplanets/moghes/moghes_wasteland_mikuetz.dmm +++ b/maps/random_ruins/exoplanets/moghes/moghes_wasteland_mikuetz.dmm @@ -29,6 +29,7 @@ dir = 4 }, /obj/structure/sink/puddle, +/mob/living/simple_animal/threshbeast, /turf/simulated/floor/exoplanet/desert{ temperature = 315.15 }, @@ -56,6 +57,13 @@ temperature = 315.15 }, /area/moghes_mikuetz) +"k" = ( +/obj/structure/flora/grass/desert, +/mob/living/simple_animal/threshbeast, +/turf/simulated/floor/exoplanet/desert{ + temperature = 315.15 + }, +/area/moghes_mikuetz) "o" = ( /obj/structure/railing/fence{ dir = 4 @@ -95,6 +103,15 @@ temperature = 303.15 }, /area/moghes_mikuetz) +"u" = ( +/obj/machinery/door/urban{ + dir = 4; + pixel_x = -29 + }, +/turf/simulated/floor/exoplanet/desert{ + temperature = 315.15 + }, +/area/moghes_mikuetz) "w" = ( /obj/structure/railing/fence, /obj/structure/flora/grass/desert, @@ -276,6 +293,12 @@ temperature = 315.15 }, /area/moghes_mikuetz) +"X" = ( +/mob/living/simple_animal/threshbeast, +/turf/simulated/floor/exoplanet/desert{ + temperature = 315.15 + }, +/area/moghes_mikuetz) "Y" = ( /obj/structure/closet/crate/freezer, /obj/item/reagent_containers/food/snacks/grown/kois, @@ -722,7 +745,7 @@ a a q W -a +u W L a @@ -748,7 +771,7 @@ a a a j -M +k a a F @@ -777,7 +800,7 @@ a j a M -M +k F a a @@ -831,7 +854,7 @@ a j a a -a +X w a a diff --git a/maps/random_ruins/exoplanets/moghes/moghes_wasteland_priests.dmm b/maps/random_ruins/exoplanets/moghes/moghes_wasteland_priests.dmm index 88e1b51dbe0..98123b1ecef 100644 --- a/maps/random_ruins/exoplanets/moghes/moghes_wasteland_priests.dmm +++ b/maps/random_ruins/exoplanets/moghes/moghes_wasteland_priests.dmm @@ -4,6 +4,14 @@ temperature = 315.15 }, /area/exoplanet/moghes) +"b" = ( +/obj/structure/railing/fence{ + dir = 4 + }, +/turf/simulated/floor/exoplanet/desert{ + temperature = 315.15 + }, +/area/exoplanet/moghes) "c" = ( /obj/item/reagent_containers/blood/OMinus, /obj/item/reagent_containers/blood/OMinus, @@ -26,6 +34,25 @@ temperature = 315.15 }, /area/exoplanet/moghes) +"g" = ( +/obj/structure/railing/fence{ + dir = 8 + }, +/turf/simulated/floor/exoplanet/desert{ + temperature = 315.15 + }, +/area/exoplanet/moghes) +"i" = ( +/obj/structure/railing/fence{ + dir = 4 + }, +/obj/structure/railing/fence{ + dir = 1 + }, +/turf/simulated/floor/exoplanet/desert{ + temperature = 315.15 + }, +/area/exoplanet/moghes) "j" = ( /obj/item/bedsheet/black, /obj/effect/ghostspawpoint{ @@ -75,12 +102,30 @@ temperature = 315.15 }, /area/moghes_wasteland_priests) +"r" = ( +/obj/structure/railing/fence, +/obj/structure/railing/fence{ + dir = 4 + }, +/turf/simulated/floor/exoplanet/desert{ + temperature = 315.15 + }, +/area/exoplanet/moghes) "s" = ( /obj/random/medical, /turf/simulated/floor/exoplanet/foundation{ temperature = 315.15 }, /area/moghes_wasteland_priests) +"t" = ( +/obj/machinery/door/urban{ + dir = 4; + pixel_x = -3 + }, +/turf/simulated/floor/exoplanet/desert{ + temperature = 315.15 + }, +/area/exoplanet/moghes) "u" = ( /obj/structure/table/steel, /obj/item/storage/firstaid/surgery, @@ -109,6 +154,15 @@ temperature = 315.15 }, /area/moghes_wasteland_priests) +"w" = ( +/obj/structure/railing/fence, +/obj/structure/railing/fence{ + dir = 8 + }, +/turf/simulated/floor/exoplanet/desert{ + temperature = 315.15 + }, +/area/exoplanet/moghes) "x" = ( /obj/machinery/recharger, /obj/structure/table/steel, @@ -118,12 +172,29 @@ temperature = 315.15 }, /area/moghes_wasteland_priests) +"y" = ( +/obj/structure/railing/fence, +/turf/simulated/floor/exoplanet/desert{ + temperature = 315.15 + }, +/area/exoplanet/moghes) "z" = ( /obj/structure/bed/roller, /turf/simulated/floor/exoplanet/carpet/rubber{ temperature = 315.15 }, /area/moghes_wasteland_priests) +"A" = ( +/obj/structure/railing/fence{ + dir = 1 + }, +/obj/structure/railing/fence{ + dir = 8 + }, +/turf/simulated/floor/exoplanet/desert{ + temperature = 315.15 + }, +/area/exoplanet/moghes) "C" = ( /obj/item/bedsheet/black, /obj/effect/ghostspawpoint{ @@ -134,9 +205,30 @@ temperature = 315.15 }, /area/moghes_wasteland_priests) +"D" = ( +/mob/living/simple_animal/threshbeast, +/turf/simulated/floor/exoplanet/desert{ + temperature = 315.15 + }, +/area/exoplanet/moghes) +"E" = ( +/obj/structure/railing/fence{ + dir = 1 + }, +/turf/simulated/floor/exoplanet/desert{ + temperature = 315.15 + }, +/area/exoplanet/moghes) "F" = ( /turf/simulated/wall/rusty, /area/moghes_wasteland_priests) +"G" = ( +/obj/structure/railing/fence, +/obj/structure/sink/puddle, +/turf/simulated/floor/exoplanet/desert{ + temperature = 315.15 + }, +/area/exoplanet/moghes) "H" = ( /turf/simulated/floor/exoplanet/carpet/rubber{ temperature = 315.15 @@ -196,6 +288,12 @@ temperature = 315.15 }, /area/moghes_wasteland_priests) +"Q" = ( +/mob/living/simple_animal/hostile/retaliate/hegeranzi, +/turf/simulated/floor/exoplanet/desert{ + temperature = 315.15 + }, +/area/exoplanet/moghes) "R" = ( /obj/item/shovel, /turf/simulated/floor/exoplanet/foundation{ @@ -452,11 +550,11 @@ c L p a -a -a -a -a -a +A +g +g +g +w "} (7,1,1) = {" a @@ -479,11 +577,11 @@ H H p a +E +D a a -a -a -a +y "} (8,1,1) = {" a @@ -506,11 +604,11 @@ H H p a +E a a -a -a -a +Q +y "} (9,1,1) = {" a @@ -533,11 +631,11 @@ H C p a +E +D a a -a -a -a +G "} (10,1,1) = {" a @@ -560,11 +658,11 @@ H C p a +E a +D a -a -a -a +y "} (11,1,1) = {" a @@ -587,11 +685,11 @@ j j p a -a -a -a -a -a +i +b +t +b +r "} (12,1,1) = {" a diff --git a/maps/random_ruins/exoplanets/moghes/moghes_wasteland_queendom.dmm b/maps/random_ruins/exoplanets/moghes/moghes_wasteland_queendom.dmm index f59097a0c30..00be871df89 100644 --- a/maps/random_ruins/exoplanets/moghes/moghes_wasteland_queendom.dmm +++ b/maps/random_ruins/exoplanets/moghes/moghes_wasteland_queendom.dmm @@ -199,6 +199,15 @@ }, /turf/simulated/floor/exoplanet/carpet/lightblue, /area/moghes_queendom) +"G" = ( +/obj/machinery/door/urban{ + dir = 4; + pixel_x = -29 + }, +/turf/simulated/floor/exoplanet/desert{ + temperature = 315.15 + }, +/area/exoplanet/moghes) "H" = ( /obj/effect/floor_decal/spline/plain/yellow{ dir = 8 @@ -892,7 +901,7 @@ w w X c -w +G c R w diff --git a/maps/random_ruins/exoplanets/ouerea/ouerea_freewater.dmm b/maps/random_ruins/exoplanets/ouerea/ouerea_freewater.dmm index 5da7eef0fc4..608ae82c964 100644 --- a/maps/random_ruins/exoplanets/ouerea/ouerea_freewater.dmm +++ b/maps/random_ruins/exoplanets/ouerea/ouerea_freewater.dmm @@ -63,6 +63,14 @@ temperature = 298.15 }, /area/ouerea_freewater) +"cF" = ( +/obj/machinery/door/urban{ + pixel_y = -5 + }, +/turf/simulated/floor/exoplanet/grass{ + temperature = 298.15 + }, +/area/ouerea_freewater) "cS" = ( /obj/structure/sink/puddle, /turf/simulated/floor/exoplanet/grass{ @@ -1831,7 +1839,7 @@ Uc Uc Uc Uc -sv +cF EE EE EE diff --git a/maps/random_ruins/exoplanets/ouerea/ouerea_hegemony_base.dmm b/maps/random_ruins/exoplanets/ouerea/ouerea_hegemony_base.dmm index 82bfe58f754..48040f418d4 100644 --- a/maps/random_ruins/exoplanets/ouerea/ouerea_hegemony_base.dmm +++ b/maps/random_ruins/exoplanets/ouerea/ouerea_hegemony_base.dmm @@ -421,6 +421,15 @@ temperature = 298.15 }, /area/ouerea_hegemony_base) +"qG" = ( +/obj/machinery/door/urban{ + dir = 4; + pixel_x = -29 + }, +/turf/simulated/floor/exoplanet/grass{ + temperature = 298.15 + }, +/area/ouerea_hegemony_base) "qQ" = ( /obj/structure/bed, /obj/item/bedsheet/black, @@ -2377,7 +2386,7 @@ BC qg Kc Fw -qg +qG jO qg BC