From 19a8875d9d034eada68012731f72f36e729bc361 Mon Sep 17 00:00:00 2001 From: nerocavalier <61446250+nerocavalier@users.noreply.github.com> Date: Tue, 14 Sep 2021 05:58:25 -0500 Subject: [PATCH] Symmetrical Garden (#12488) --- .../nerocavalier-gardensymmetry.yml | 42 +++++++ maps/aurora/aurora-6_surface.dmm | 115 +++++++++--------- 2 files changed, 97 insertions(+), 60 deletions(-) create mode 100644 html/changelogs/nerocavalier-gardensymmetry.yml diff --git a/html/changelogs/nerocavalier-gardensymmetry.yml b/html/changelogs/nerocavalier-gardensymmetry.yml new file mode 100644 index 00000000000..55f2c7c7bd3 --- /dev/null +++ b/html/changelogs/nerocavalier-gardensymmetry.yml @@ -0,0 +1,42 @@ +################################ +# 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 +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: NeroCavalier + +# 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, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Surface garden's doors are now symmetrical. The hydroponics crate is no longer blocking disposals." + diff --git a/maps/aurora/aurora-6_surface.dmm b/maps/aurora/aurora-6_surface.dmm index de20fc069d7..eb090ce5b79 100644 --- a/maps/aurora/aurora-6_surface.dmm +++ b/maps/aurora/aurora-6_surface.dmm @@ -9356,26 +9356,6 @@ /obj/structure/sign/electricshock, /turf/simulated/wall, /area/solar/fore) -"inr" = ( -/obj/structure/closet/crate/hydroponics, -/obj/item/material/minihoe, -/obj/item/material/minihoe, -/obj/item/material/minihoe, -/obj/item/material/hatchet, -/obj/item/material/hatchet, -/obj/item/material/hatchet, -/obj/item/reagent_containers/glass/bucket, -/obj/item/reagent_containers/glass/bucket, -/obj/item/reagent_containers/glass/bucket, -/obj/structure/disposalpipe/segment, -/obj/random/seed, -/obj/random/seed, -/obj/random/seed, -/obj/item/wirecutters/clippers, -/obj/item/wirecutters/clippers, -/obj/item/wirecutters/clippers, -/turf/simulated/floor/wood, -/area/hydroponics/garden) "ioe" = ( /obj/item/device/radio/intercom{ name = "Station Intercom (General)"; @@ -11305,6 +11285,13 @@ }, /turf/simulated/floor/tiled, /area/storage/tools) +"klH" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/glass{ + name = "Garden" + }, +/turf/simulated/floor/plating, +/area/hydroponics/garden) "klU" = ( /obj/machinery/status_display{ pixel_x = 32 @@ -11472,21 +11459,6 @@ }, /turf/simulated/floor/plating, /area/quartermaster/loading) -"krN" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced, -/obj/machinery/door/firedoor, -/turf/simulated/floor/plating, -/area/hydroponics/garden) "ksy" = ( /obj/machinery/door/airlock/hatch{ name = "Telecoms West Wing"; @@ -19553,6 +19525,21 @@ }, /turf/simulated/floor/grass/alt, /area/hydroponics/garden) +"rqJ" = ( +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/grille, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/machinery/door/firedoor, +/obj/structure/window/reinforced, +/turf/simulated/floor/plating, +/area/hydroponics/garden) "rqW" = ( /obj/structure/cable/green{ d1 = 4; @@ -20196,6 +20183,25 @@ /obj/machinery/portable_atmospherics/powered/scrubber, /turf/simulated/floor/plating, /area/storage/tools) +"rRj" = ( +/obj/structure/closet/crate/hydroponics, +/obj/item/material/minihoe, +/obj/item/material/minihoe, +/obj/item/material/minihoe, +/obj/item/material/hatchet, +/obj/item/material/hatchet, +/obj/item/material/hatchet, +/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, +/obj/random/seed, +/obj/random/seed, +/obj/random/seed, +/obj/item/wirecutters/clippers, +/obj/item/wirecutters/clippers, +/obj/item/wirecutters/clippers, +/turf/simulated/floor/grass/alt, +/area/hydroponics/garden) "rRm" = ( /obj/structure/shuttle_part/research{ desc = "The largest commercially available sublight engine, with a shuttle built around it and painted in NanoTrasen research division colors. Looks sleek, and fast."; @@ -20344,13 +20350,17 @@ /turf/simulated/mineral/surface, /area/mine/unexplored) "rZH" = ( -/obj/machinery/door/airlock/glass{ - name = "Garden" - }, /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/grille, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, /turf/simulated/floor/wood, /area/hydroponics/garden) "rZN" = ( @@ -24459,21 +24469,6 @@ temperature = 278 }, /area/tcommsat/chamber) -"vCA" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/simulated/floor/plating, -/area/hydroponics/garden) "vCD" = ( /obj/structure/cable/yellow{ d2 = 8; @@ -54865,7 +54860,7 @@ kvz ras qnH aJP -inr +nIy nIy mqz nIy @@ -55638,7 +55633,7 @@ hyn rqf uDd jxp -uDd +rRj gzB wKb hQl @@ -56663,13 +56658,13 @@ lEd lEd lEd hyn -vCA +iTu rZH -krN +cpi qnH -mIG -rIU -rIU +rqJ +klH +iTu bcb dUm aVE