From 110a7df97fd02b67d993aefd13963172974da466 Mon Sep 17 00:00:00 2001 From: PigeonLord Date: Sun, 31 Dec 2023 18:43:31 +0100 Subject: [PATCH] Shepherd Map Fixes --- .../independent/independent_shepherd.dmm | 185 ++++++++++++------ 1 file changed, 120 insertions(+), 65 deletions(-) diff --git a/_maps/shuttles/independent/independent_shepherd.dmm b/_maps/shuttles/independent/independent_shepherd.dmm index f9c1fd853ecd..67da3e3b439c 100644 --- a/_maps/shuttles/independent/independent_shepherd.dmm +++ b/_maps/shuttles/independent/independent_shepherd.dmm @@ -48,6 +48,16 @@ /obj/machinery/newscaster/directional/south, /turf/open/floor/wood, /area/ship/crew/library) +"at" = ( +/obj/item/paper/natural{ + icon_state = "paper_words"; + default_raw_text = "

Trappist Recipe


By Pater Noster

Servings: 2 Prep Time: 10 mins Cook Time: 1-2 hrs Difficulty: Easy
Trappist beer is a rich and pleasant beer traditionally brewed by monks.

Ingredients


Ale:
Ale! The core of any good drink. Easily obtainable by fermenting oats in a barrel for a while. This will be the basis of our brew, giving it it's fruity taste and color!
Holy water:
This is what a makes a trappist a trappist and not a trapisst, the religion! Real easy to get if you are reading this where you are supposed to be reading this! If the chaplain can't bothered it's also easily harvestable from holymelons as long as you bother to separate it.
Sugar:
Sugar is what's gonna make it all come together sweetening the brew and mixing well with the ale from earlier. It's easy to obtain from grinding sugarcanes. Feel free to add liberally.

Preparation


1. Mix the ale and holy water together.
2. Add some sugar to the mix as you keep stirring it for 1 minute.
3. At this point you're free to just use it as is! But feel free to experiment by adding new flavours and really making it your own!

Closing statement


And that's it! Hopefully this guide has been somewhat helpful. A final tip I have is to drink it with bread and cheese, really finishes of the package."; + name = "paper - Trappist Recipe"; + pixel_x = 2; + pixel_y = 4 + }, +/turf/open/floor/wood/ebony, +/area/ship/crew/canteen) "av" = ( /obj/structure/table/wood, /obj/item/flashlight/lantern, @@ -110,13 +120,23 @@ }, /turf/open/floor/carpet/red_gold, /area/ship/bridge) +"bf" = ( +/obj/effect/turf_decal/siding/wood, +/obj/machinery/light_switch{ + dir = 1; + pixel_x = -6; + pixel_y = -25 + }, +/turf/open/floor/wood, +/area/ship/hallway/starboard) "bh" = ( -/obj/effect/spawner/structure/window/reinforced, +/obj/structure/grille, /obj/machinery/door/poddoor/shutters/preopen{ id = "chapel_window"; name = "Window Shutters"; dir = 8 }, +/obj/structure/window/reinforced/fulltile, /turf/open/floor/plating, /area/ship/bridge) "bi" = ( @@ -136,11 +156,12 @@ /turf/open/floor/plating, /area/ship/engineering/atmospherics) "bt" = ( -/obj/effect/spawner/structure/window/reinforced, +/obj/structure/grille, /obj/machinery/door/poddoor/shutters/preopen{ id = "chapel_window"; name = "Window Shutters" }, +/obj/structure/window/reinforced/fulltile, /turf/open/floor/plating, /area/ship/crew/chapel) "bx" = ( @@ -545,8 +566,7 @@ /obj/item/honey_frame, /obj/item/queen_bee/bought, /obj/effect/turf_decal/siding/wood{ - color = "#332521"; - layer = 70 + color = "#332521" }, /turf/open/floor/grass/fairy, /area/ship/crew/hydroponics) @@ -892,7 +912,8 @@ /obj/structure/window/reinforced/spawner/east, /obj/effect/decal/cleanable/dirt, /obj/machinery/door/window/northleft{ - req_one_access_txt = list("12","22","37") + req_one_access_txt = null; + req_one_access = list(12,22,37) }, /turf/open/floor/wood/ebony, /area/ship/crew/hydroponics) @@ -1347,12 +1368,13 @@ /turf/open/floor/plating, /area/ship/engineering/atmospherics) "lO" = ( -/obj/effect/spawner/structure/window/reinforced, +/obj/structure/grille, /obj/machinery/door/poddoor/shutters/preopen{ id = "chapel_window"; name = "Window Shutters"; dir = 4 }, +/obj/structure/window/reinforced/fulltile, /turf/open/floor/plating, /area/ship/crew/chapel/office) "lS" = ( @@ -1454,12 +1476,13 @@ /turf/closed/wall, /area/ship/crew/dorm) "mH" = ( -/obj/effect/spawner/structure/window/reinforced, +/obj/structure/grille, /obj/machinery/door/poddoor/shutters/preopen{ id = "chapel_window"; name = "Window Shutters" }, /obj/machinery/atmospherics/pipe/simple/orange/visible, +/obj/structure/window/reinforced/fulltile, /turf/open/floor/plating, /area/ship/engineering/atmospherics) "mP" = ( @@ -1602,16 +1625,6 @@ /obj/item/reagent_containers/glass/bucket/wooden, /turf/open/floor/wood/ebony, /area/ship/crew/canteen) -"ok" = ( -/obj/item/paper/natural{ - icon_state = "paper_words"; - default_raw_text = "

Trappist Recipe


By Pater Noster

Servings: 2 Prep Time: 10 mins Cook Time: 1-2 hrs Difficulty: Easy
Trappist beer is a rich and pleasant beer traditionally brewed by monks.

Ingredients


Ale:
Ale! The core of any good drink. Easily obtainable by fermenting oats in a barrel for a while. This will be the basis of our brew, giving it it's fruity taste and color!
Holy water:
This is what a makes a trappist a trappist and not a trapisst, the religion! Real easy to get if you are reading this where you are supposed to be reading this! If the chaplain can't bothered it's also easily harvestable from holymelons as long as you bother to separate it.
Sugar:
Sugar is what's gonna make it all come together sweetening the brew and mixing well with the ale from earlier. It's easy to obtain from grinding sugarcanes. Feel free to add liberally.

Preparation


1. Mix the ale and holy water together.
2. Add some sugar to the mix as you keep stirring it for 1 minute.
3. At this point you're free to just use it as is! But feel free to experiment by adding new flavours and really making it your own!

Closing statement


And that's it! Hopefully this guide has been somewhat helpful. A final tip I have is to drink it with bread and cheese, really finishes of the package."; - name = "paper - Trappist Recipe"; - pixel_x = 2; - pixel_y = 4 - }, -/turf/open/floor/wood/ebony, -/area/ship/crew/canteen) "on" = ( /turf/open/floor/plasteel/stairs/right{ dir = 4 @@ -1685,13 +1698,14 @@ /turf/open/floor/plating, /area/ship/crew/hydroponics) "oO" = ( -/obj/effect/spawner/structure/window/reinforced, +/obj/structure/grille, /obj/machinery/door/poddoor/shutters/preopen{ id = "chapel_window"; name = "Window Shutters"; dir = 4 }, /obj/structure/curtain/cloth/fancy, +/obj/structure/window/reinforced/fulltile, /turf/open/floor/plating, /area/ship/crew/canteen) "oP" = ( @@ -1807,14 +1821,6 @@ }, /turf/open/floor/wood, /area/ship/hallway/starboard) -"pN" = ( -/obj/structure/window/reinforced/spawner/west, -/obj/effect/turf_decal/corner/opaque/lightgrey/mono, -/obj/machinery/atmospherics/components/unary/vent_pump/high_volume/siphon/atmos/air_output{ - dir = 8 - }, -/turf/open/floor/engine/air, -/area/ship/engineering/atmospherics) "pO" = ( /turf/closed/wall, /area/ship/crew/canteen) @@ -1864,7 +1870,8 @@ "qj" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/door/window/northleft{ - req_one_access_txt = list("12","22","37") + req_one_access_txt = null; + req_one_access = list(12,22,37) }, /turf/open/floor/ship/dirt/dark, /area/ship/crew/hydroponics) @@ -1961,6 +1968,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 5 }, +/obj/machinery/light/directional/north, /turf/open/floor/wood, /area/ship/hallway/port) "qV" = ( @@ -1992,12 +2000,13 @@ /turf/open/floor/wood, /area/ship/crew/chapel) "rm" = ( -/obj/effect/spawner/structure/window/reinforced, +/obj/structure/grille, /obj/machinery/door/poddoor/shutters/preopen{ id = "chapel_window"; name = "Window Shutters"; dir = 4 }, +/obj/structure/window/reinforced/fulltile, /turf/open/floor/plating, /area/ship/crew/dorm/dormtwo) "rn" = ( @@ -2056,6 +2065,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 10 }, +/obj/machinery/light/directional/west, /turf/open/floor/wood, /area/ship/hallway/port) "sa" = ( @@ -2893,12 +2903,13 @@ /turf/open/floor/plating, /area/ship/engineering/electrical) "zX" = ( -/obj/effect/spawner/structure/window/reinforced, +/obj/structure/grille, /obj/machinery/door/poddoor/shutters/preopen{ id = "chapel_window"; name = "Window Shutters"; dir = 8 }, +/obj/structure/window/reinforced/fulltile, /turf/open/floor/plating, /area/ship/crew/dorm/dormtwo) "Ae" = ( @@ -2917,6 +2928,7 @@ color = "#332521"; dir = 10 }, +/obj/machinery/hydroponics/soil, /turf/open/floor/grass/fairy, /area/ship/crew/hydroponics) "Aq" = ( @@ -3101,13 +3113,14 @@ /turf/open/floor/carpet/nanoweave/blue, /area/ship/crew/chapel/office) "Cq" = ( -/obj/effect/spawner/structure/window/reinforced, +/obj/structure/grille, /obj/machinery/door/poddoor/shutters/preopen{ id = "chapel_window"; name = "Window Shutters"; dir = 4 }, /obj/structure/curtain/cloth/fancy, +/obj/structure/window/reinforced/fulltile, /turf/open/floor/plating, /area/ship/crew/library) "Cs" = ( @@ -3272,11 +3285,12 @@ /turf/closed/wall/r_wall, /area/ship/crew/dorm) "DC" = ( -/obj/effect/spawner/structure/window/reinforced, +/obj/structure/grille, /obj/machinery/door/poddoor/shutters/preopen{ id = "chapel_window"; name = "Window Shutters" }, +/obj/structure/window/reinforced/fulltile, /turf/open/floor/plating, /area/ship/engineering/atmospherics) "DI" = ( @@ -3521,6 +3535,10 @@ /obj/structure/cable{ icon_state = "0-2" }, +/obj/machinery/light_switch{ + pixel_y = 23; + pixel_x = 11 + }, /turf/open/floor/wood, /area/ship/hallway/port) "FW" = ( @@ -3535,9 +3553,9 @@ dir = 8 }, /obj/effect/turf_decal/siding/wood{ - color = "#332521"; - layer = 70 + color = "#332521" }, +/obj/machinery/hydroponics/soil, /turf/open/floor/grass/fairy, /area/ship/crew/hydroponics) "Ga" = ( @@ -3697,12 +3715,13 @@ /turf/open/floor/plating, /area/ship/crew/canteen) "HI" = ( -/obj/effect/spawner/structure/window/reinforced, +/obj/structure/grille, /obj/machinery/door/poddoor/shutters/preopen{ id = "chapel_window"; name = "Window Shutters"; dir = 4 }, +/obj/structure/window/reinforced/fulltile, /turf/open/floor/plating, /area/ship/crew/chapel) "HN" = ( @@ -3808,6 +3827,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, +/obj/machinery/light/directional/north, /turf/open/floor/wood, /area/ship/hallway/port) "IK" = ( @@ -3914,6 +3934,7 @@ color = "#332521"; dir = 6 }, +/obj/machinery/hydroponics/soil, /turf/open/floor/grass/fairy, /area/ship/crew/hydroponics) "Jv" = ( @@ -4089,8 +4110,7 @@ /obj/item/honey_frame, /obj/item/queen_bee/bought, /obj/effect/turf_decal/siding/wood{ - color = "#332521"; - layer = 70 + color = "#332521" }, /turf/open/floor/grass/fairy, /area/ship/crew/hydroponics) @@ -4101,12 +4121,13 @@ /turf/open/floor/wood, /area/ship/crew/chapel) "KS" = ( -/obj/effect/spawner/structure/window/reinforced, +/obj/structure/grille, /obj/machinery/door/poddoor/shutters/preopen{ id = "chapel_window"; name = "Window Shutters" }, /obj/machinery/atmospherics/pipe/simple/purple/visible, +/obj/structure/window/reinforced/fulltile, /turf/open/floor/plating, /area/ship/engineering/atmospherics) "KT" = ( @@ -4418,9 +4439,9 @@ }, /obj/structure/flora/ausbushes/brflowers, /obj/effect/turf_decal/siding/wood{ - color = "#332521"; - layer = 70 + color = "#332521" }, +/obj/machinery/hydroponics/soil, /turf/open/floor/grass/fairy, /area/ship/crew/hydroponics) "NN" = ( @@ -4441,16 +4462,15 @@ /obj/item/honey_frame, /obj/item/queen_bee/bought, /obj/effect/turf_decal/siding/wood{ - color = "#332521"; - layer = 70 + color = "#332521" }, /turf/open/floor/grass/fairy, /area/ship/crew/hydroponics) "NX" = ( /obj/effect/turf_decal/siding/wood{ - color = "#332521"; - layer = 70 + color = "#332521" }, +/obj/machinery/hydroponics/soil, /turf/open/floor/grass/fairy, /area/ship/crew/hydroponics) "NZ" = ( @@ -4746,8 +4766,7 @@ /obj/item/honey_frame, /obj/item/queen_bee/bought, /obj/effect/turf_decal/siding/wood{ - color = "#332521"; - layer = 70 + color = "#332521" }, /turf/open/floor/grass/fairy, /area/ship/crew/hydroponics) @@ -4998,14 +5017,24 @@ /turf/open/floor/wood, /area/ship/bridge) "RT" = ( -/obj/effect/spawner/structure/window/reinforced, +/obj/structure/grille, /obj/machinery/door/poddoor/shutters/preopen{ id = "chapel_window"; name = "Window Shutters"; dir = 8 }, +/obj/structure/window/reinforced/fulltile, /turf/open/floor/plating, /area/ship/crew/chapel) +"Sa" = ( +/obj/structure/window/reinforced/spawner/west, +/obj/machinery/atmospherics/components/unary/vent_pump/high_volume/siphon/atmos/air_output{ + dir = 8; + piping_layer = 2 + }, +/obj/effect/turf_decal/corner/opaque/lightgrey/mono, +/turf/open/floor/engine/air, +/area/ship/engineering/atmospherics) "Sb" = ( /obj/effect/turf_decal/siding/wood{ color = "#332521"; @@ -5370,13 +5399,14 @@ /turf/open/floor/wood/ebony, /area/ship/crew/chapel) "UO" = ( -/obj/effect/spawner/structure/window/reinforced, +/obj/structure/grille, /obj/structure/curtain/cloth/fancy, /obj/machinery/door/poddoor/shutters/preopen{ id = "chapel_window"; name = "Window Shutters"; dir = 4 }, +/obj/structure/window/reinforced/fulltile, /turf/open/floor/plating, /area/ship/crew/library) "UP" = ( @@ -5502,8 +5532,7 @@ dir = 1 }, /obj/effect/turf_decal/siding/wood{ - color = "#332521"; - layer = 70 + color = "#332521" }, /turf/open/floor/grass/fairy, /area/ship/crew/hydroponics) @@ -5743,8 +5772,7 @@ "XH" = ( /obj/structure/flora/ausbushes/ppflowers, /obj/effect/turf_decal/siding/wood{ - color = "#332521"; - layer = 70 + color = "#332521" }, /turf/open/floor/grass/fairy, /area/ship/crew/hydroponics) @@ -5766,14 +5794,29 @@ }, /turf/open/floor/wood/ebony, /area/ship/crew/hydroponics) +"XU" = ( +/obj/structure/grille, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "chapel_window"; + name = "Window Shutters" + }, +/obj/structure/window/reinforced/fulltile, +/turf/open/floor/plating, +/area/ship/bridge) "XY" = ( /obj/machinery/light/floor, /obj/effect/turf_decal/siding/wood{ - color = "#332521"; - layer = 70 + color = "#332521" }, /turf/open/floor/grass/fairy, /area/ship/crew/hydroponics) +"XZ" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/machinery/light/directional/west, +/turf/open/floor/wood, +/area/ship/hallway/port) "Yg" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/turf_decal/siding/wood{ @@ -5798,11 +5841,12 @@ /turf/open/floor/wood, /area/ship/crew/canteen) "YA" = ( -/obj/effect/spawner/structure/window/reinforced, +/obj/structure/grille, /obj/machinery/door/poddoor/shutters/preopen{ id = "chapel_window"; name = "Window Shutters" }, +/obj/structure/window/reinforced/fulltile, /turf/open/floor/plating, /area/ship/crew/chapel/office) "YB" = ( @@ -5913,11 +5957,12 @@ /turf/open/floor/grass/ship/jungle, /area/ship/crew/hydroponics) "Zs" = ( -/obj/effect/spawner/structure/window/reinforced, +/obj/structure/grille, /obj/machinery/door/poddoor/shutters/preopen{ id = "chapel_window"; name = "Window Shutters" }, +/obj/structure/window/reinforced/fulltile, /turf/open/floor/plating, /area/ship/crew/dorm/dormtwo) "Zx" = ( @@ -5930,6 +5975,16 @@ /obj/structure/flora/junglebush/large, /turf/open/floor/grass/ship/jungle, /area/ship/crew/hydroponics) +"ZD" = ( +/obj/structure/grille, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "chapel_window"; + name = "Window Shutters"; + dir = 4 + }, +/obj/structure/window/reinforced/fulltile, +/turf/open/floor/plating, +/area/ship/bridge) "ZG" = ( /turf/closed/wall/r_wall, /area/ship/crew/canteen) @@ -6376,7 +6431,7 @@ xj cE ll pU -Ux +XZ Ux Ux rX @@ -6755,7 +6810,7 @@ OS Ts hM Fq -FL +bf mB jw xg @@ -6809,7 +6864,7 @@ xj xj Uf Gi -pN +Sa uq ti dM @@ -7420,15 +7475,15 @@ oh VR Mm ZG -gI -Lj +ZD +XU DY mU Qi Kc qr Lj -gI +ZD cf pE KF @@ -7456,18 +7511,18 @@ ZG ZG pO OO -ok +at uY QC ZG xj -gI +ZD Lj JO wn wa -Lj -gI +XU +ZD xj cf eo