From c1820225e3b49db7d2db61329dbfddd022961b04 Mon Sep 17 00:00:00 2001 From: PigeonLord Date: Thu, 31 Aug 2023 02:48:55 +0200 Subject: [PATCH] Gives the Sheperd Chaplain the Holy Trait, fixes a couple things with the Shepherd Adds some fixes for the Sacred Oak Tree Fixed bees being able to open the Shepherd Apiary More fixes --- .../shiptest/independent_shepherd.dmm | 144 ++++++++++++------ code/game/objects/structures/flora.dm | 12 +- code/modules/jobs/job_types/chaplain.dm | 2 +- 3 files changed, 106 insertions(+), 52 deletions(-) diff --git a/_maps/shuttles/shiptest/independent_shepherd.dmm b/_maps/shuttles/shiptest/independent_shepherd.dmm index 611beb40135b..67da3e3b439c 100644 --- a/_maps/shuttles/shiptest/independent_shepherd.dmm +++ b/_maps/shuttles/shiptest/independent_shepherd.dmm @@ -120,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" = ( @@ -146,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" = ( @@ -555,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) @@ -902,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) @@ -1357,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" = ( @@ -1464,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" = ( @@ -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" = ( @@ -1856,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) @@ -1953,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" = ( @@ -1984,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" = ( @@ -2048,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" = ( @@ -2885,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" = ( @@ -2909,6 +2928,7 @@ color = "#332521"; dir = 10 }, +/obj/machinery/hydroponics/soil, /turf/open/floor/grass/fairy, /area/ship/crew/hydroponics) "Aq" = ( @@ -3093,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" = ( @@ -3264,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" = ( @@ -3513,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" = ( @@ -3527,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" = ( @@ -3689,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" = ( @@ -3800,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" = ( @@ -3906,6 +3934,7 @@ color = "#332521"; dir = 6 }, +/obj/machinery/hydroponics/soil, /turf/open/floor/grass/fairy, /area/ship/crew/hydroponics) "Jv" = ( @@ -4081,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) @@ -4093,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" = ( @@ -4410,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" = ( @@ -4433,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" = ( @@ -4738,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) @@ -4990,12 +5017,13 @@ /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" = ( @@ -5371,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" = ( @@ -5503,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) @@ -5744,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) @@ -5767,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{ @@ -5799,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" = ( @@ -5914,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" = ( @@ -5931,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) @@ -6377,7 +6431,7 @@ xj cE ll pU -Ux +XZ Ux Ux rX @@ -6756,7 +6810,7 @@ OS Ts hM Fq -FL +bf mB jw xg @@ -7421,15 +7475,15 @@ oh VR Mm ZG -gI -Lj +ZD +XU DY mU Qi Kc qr Lj -gI +ZD cf pE KF @@ -7462,13 +7516,13 @@ uY QC ZG xj -gI +ZD Lj JO wn wa -Lj -gI +XU +ZD xj cf eo diff --git a/code/game/objects/structures/flora.dm b/code/game/objects/structures/flora.dm index 46abc0a67d7d..3d2aba204d20 100644 --- a/code/game/objects/structures/flora.dm +++ b/code/game/objects/structures/flora.dm @@ -623,9 +623,9 @@ /obj/structure/flora/tree/chapel/proc/apply_reagents(datum/reagents/S, mob/user) var/gainedkarma = 0 - for(var/datum/reagent/R in moralchems) - if(S.has_reagent(R, 1)) - gainedkarma += S.get_reagent_amount(R) * moralchems[R] + for(var/reagent in moralchems) + if(S.has_reagent(reagent, 1)) + gainedkarma += S.get_reagent_amount(reagent) * moralchems[reagent] if(isliving(user)) var/mob/living/M = user if(gainedkarma >= 0) @@ -643,10 +643,10 @@ adjustKarma(gainedkarma) /obj/structure/flora/tree/chapel/proc/update_tree() - if(100 > karma > -100) + if(abs(karma) < 100) name = initial(src.name) - icon_state = initial(src.name) - desc = initial(src.name) + icon_state = initial(src.icon_state) + desc = initial(src.desc) else if (karma >= 100) name = "hallowed oak tree" icon_state = "churchtree_nice" diff --git a/code/modules/jobs/job_types/chaplain.dm b/code/modules/jobs/job_types/chaplain.dm index efb9292353b7..eb6e6291ba21 100644 --- a/code/modules/jobs/job_types/chaplain.dm +++ b/code/modules/jobs/job_types/chaplain.dm @@ -12,7 +12,7 @@ display_order = JOB_DISPLAY_ORDER_CHAPLAIN -/datum/job/chaplain/after_spawn(mob/living/H, mob/M) +/datum/outfit/job/chaplain/post_equip(mob/living/H, mob/M) . = ..() var/obj/item/storage/book/bible/booze/B = new