diff --git a/code/game/objects/structures/crates_lockers/closets/secure/service.dm b/code/game/objects/structures/crates_lockers/closets/secure/service.dm index 7c5437a7401e8..526e9503b867f 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/service.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/service.dm @@ -8,6 +8,7 @@ /obj/item/clothing/under/rank/chaplain, /obj/item/clothing/shoes/black, /obj/item/clothing/suit/chaplain_hoodie, + /obj/item/clothing/head/chaplain_hood, /obj/item/storage/candle_box = 2, /obj/item/storage/candle_box/incense, /obj/item/deck/tarot, @@ -15,5 +16,6 @@ /obj/item/nullrod, /obj/item/storage/bible, /obj/item/storage/belt/general, - /obj/item/material/urn + /obj/item/material/urn, + /obj/item/glass_jar ) diff --git a/code/modules/client/preference_setup/loadout/lists/accessories.dm b/code/modules/client/preference_setup/loadout/lists/accessories.dm index d6733f2b31916..e5736bc2c89d6 100644 --- a/code/modules/client/preference_setup/loadout/lists/accessories.dm +++ b/code/modules/client/preference_setup/loadout/lists/accessories.dm @@ -224,3 +224,10 @@ description = "A piece of cloth tied around the neck. A favorite of Sailors and Partisans everywhere." path = /obj/item/clothing/accessory/neckerchief flags = GEAR_HAS_COLOR_SELECTION + + +/datum/gear/accessory/stole + display_name = "stole, colour select" + description = "A long, colourful liturgical vestment used by Christian clergy." + path = /obj/item/clothing/accessory/stole + flags = GEAR_HAS_COLOR_SELECTION diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm index df877f8b8610f..fe999c9796434 100644 --- a/code/modules/clothing/suits/jobs.dm +++ b/code/modules/clothing/suits/jobs.dm @@ -50,6 +50,13 @@ desc = "This suit says to you 'hush'!" icon_state = "chaplain_hoodie" body_parts_covered = UPPER_TORSO|ARMS + allowed = list ( + /obj/item/nullrod, + /obj/item/storage/bible, + /obj/item/reagent_containers/food/drinks/bottle/holywater, + /obj/item/material/cross + ) + valid_accessory_slots = list(ACCESSORY_SLOT_INSIGNIA, ACCESSORY_SLOT_DECOR) //Chaplain /obj/item/clothing/suit/nun diff --git a/code/modules/clothing/under/accessories/chaplain.dm b/code/modules/clothing/under/accessories/chaplain.dm index abc78d33c87dc..36d6c34bf4c08 100644 --- a/code/modules/clothing/under/accessories/chaplain.dm +++ b/code/modules/clothing/under/accessories/chaplain.dm @@ -60,3 +60,10 @@ name = "chaplain insignia (taoism)" desc = "An insignia worn by chaplains. The yin yang represents Taoism." icon_state = "taoinsignia" + + +/obj/item/clothing/accessory/stole + name = "stole" + desc = "A long, colourful liturgical vestment used by Christian clergy." + icon_state = "stole" + w_class = ITEM_SIZE_SMALL diff --git a/icons/mob/onmob/onmob_accessories.dmi b/icons/mob/onmob/onmob_accessories.dmi index 03dd97b6f1edf..90eecb2a663b0 100644 Binary files a/icons/mob/onmob/onmob_accessories.dmi and b/icons/mob/onmob/onmob_accessories.dmi differ diff --git a/icons/obj/clothing/obj_accessories.dmi b/icons/obj/clothing/obj_accessories.dmi index f9b5043c5cede..9948e18d39640 100644 Binary files a/icons/obj/clothing/obj_accessories.dmi and b/icons/obj/clothing/obj_accessories.dmi differ diff --git a/maps/sierra/loadout/loadout_accessories.dm b/maps/sierra/loadout/loadout_accessories.dm index ace4955cc42c2..55d242e41cc8a 100644 --- a/maps/sierra/loadout/loadout_accessories.dm +++ b/maps/sierra/loadout/loadout_accessories.dm @@ -78,6 +78,9 @@ path = /obj/item/clothing/accessory/badge/holo/investigator allowed_roles = list(/datum/job/iaa) +/datum/gear/accessory/stole + allowed_roles = list(/datum/job/chaplain) + /datum/gear/accessory/solgov display_name = "Solgov command insignia" path = /obj/item/clothing/accessory/solgov/department/command @@ -138,3 +141,4 @@ allowed_roles = list(/datum/job/cmo, /datum/job/senior_doctor, /datum/job/doctor, /datum/job/doctor_trainee, /datum/job/explorer_medic, /datum/job/psychiatrist, /datum/job/chemist) flags = GEAR_HAS_NO_CUSTOMIZATION cost = 0 + diff --git a/maps/torch/loadout/loadout_accessories.dm b/maps/torch/loadout/loadout_accessories.dm index 787e72c9762bb..23ac1a5c92e97 100644 --- a/maps/torch/loadout/loadout_accessories.dm +++ b/maps/torch/loadout/loadout_accessories.dm @@ -166,6 +166,9 @@ /datum/gear/accessory/stethoscope allowed_roles = STERILE_ROLES +/datum/gear/accessory/stole + allowed_roles = list(/datum/job/chaplain) + /datum/gear/tactical/holster allowed_roles = ARMED_ROLES diff --git a/maps/torch/torch3_deck3.dmm b/maps/torch/torch3_deck3.dmm index cfe4de7d58b53..83a78bbb0e946 100644 --- a/maps/torch/torch3_deck3.dmm +++ b/maps/torch/torch3_deck3.dmm @@ -9451,10 +9451,10 @@ /obj/machinery/light{ dir = 1 }, -/obj/structure/flora/pottedplant/flower, /obj/machinery/alarm{ pixel_y = 24 }, +/obj/structure/filingcabinet, /turf/simulated/floor/carpet/purple, /area/chapel/office) "wB" = ( @@ -10194,6 +10194,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, +/obj/machinery/hologram/holopad, /turf/simulated/floor/carpet/purple, /area/chapel/office) "yC" = (