diff --git a/_maps/map_files/stations/boxstation.dmm b/_maps/map_files/stations/boxstation.dmm
index 9a0031255b7..04032f5e4fe 100644
--- a/_maps/map_files/stations/boxstation.dmm
+++ b/_maps/map_files/stations/boxstation.dmm
@@ -15349,16 +15349,7 @@
/turf/simulated/floor/plating,
/area/station/maintenance/fsmaint)
"bcB" = (
-/obj/structure/table/wood,
-/obj/item/paper_bin{
- pixel_x = -2;
- pixel_y = 5
- },
-/obj/item/storage/fancy/crayons,
-/obj/machinery/light_switch{
- name = "north bump";
- pixel_y = 24
- },
+/obj/machinery/economy/vending/chapdrobe,
/turf/simulated/floor/carpet/grimey,
/area/station/service/chapel/office)
"bcC" = (
@@ -85664,6 +85655,20 @@
},
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/central/south)
+"wdw" = (
+/obj/structure/table/wood,
+/obj/item/storage/fancy/crayons,
+/obj/item/paper_bin{
+ pixel_x = -2;
+ pixel_y = 5
+ },
+/obj/machinery/light_switch{
+ name = "north bump";
+ pixel_y = -24;
+ dir = 1
+ },
+/turf/simulated/floor/carpet/grimey,
+/area/station/service/chapel/office)
"wdE" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -138074,7 +138079,7 @@ baz
bcB
bcz
bcz
-bcz
+wdw
baz
bjA
bpM
diff --git a/_maps/map_files/stations/cerestation.dmm b/_maps/map_files/stations/cerestation.dmm
index 4951f0ffc00..4a5f871e8eb 100644
--- a/_maps/map_files/stations/cerestation.dmm
+++ b/_maps/map_files/stations/cerestation.dmm
@@ -46847,6 +46847,10 @@
/area/station/command/vault)
"iCp" = (
/obj/machinery/newscaster/directional/north,
+/obj/item/radio/intercom{
+ name = "west bump";
+ pixel_x = -28
+ },
/turf/simulated/floor/carpet/black,
/area/station/service/chapel/office)
"iCq" = (
@@ -76885,6 +76889,10 @@
icon_state = "whiteblue"
},
/area/station/medical/patients_rooms_secondary)
+"oVB" = (
+/obj/item/kirbyplants/large,
+/turf/simulated/floor/carpet/black,
+/area/station/service/chapel/office)
"oVC" = (
/obj/machinery/atmospherics/pipe/simple/hidden{
dir = 5
@@ -81534,11 +81542,7 @@
},
/area/station/maintenance/disposal/east)
"pVV" = (
-/obj/item/radio/intercom{
- name = "west bump";
- pixel_x = -28
- },
-/obj/item/kirbyplants/large,
+/obj/machinery/economy/vending/chapdrobe,
/turf/simulated/floor/carpet/black,
/area/station/service/chapel/office)
"pWf" = (
@@ -131410,7 +131414,7 @@ mgN
wnL
oUr
oUr
-oUr
+oVB
cfF
grG
orD
diff --git a/_maps/map_files/stations/deltastation.dmm b/_maps/map_files/stations/deltastation.dmm
index e7f89f90ba0..6b22c768a42 100644
--- a/_maps/map_files/stations/deltastation.dmm
+++ b/_maps/map_files/stations/deltastation.dmm
@@ -49169,21 +49169,6 @@
/obj/machinery/firealarm/directional/west,
/turf/simulated/floor/plasteel/grimy,
/area/station/service/chapel/office)
-"dQU" = (
-/obj/machinery/light/small{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/simulated/floor/plasteel/grimy,
-/area/station/service/chapel/office)
"dQV" = (
/obj/machinery/newscaster/directional/north,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -90054,6 +90039,22 @@
},
/turf/simulated/floor/plasteel,
/area/station/maintenance/abandoned_garden)
+"uqj" = (
+/obj/machinery/light/small{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/economy/vending/chapdrobe,
+/turf/simulated/floor/plasteel/grimy,
+/area/station/service/chapel/office)
"uqt" = (
/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
@@ -133656,7 +133657,7 @@ kny
dJx
dPE
dIx
-dQU
+uqj
dRu
dRM
dSe
diff --git a/_maps/map_files/stations/emeraldstation.dmm b/_maps/map_files/stations/emeraldstation.dmm
index 36d8707183e..193ac9de647 100644
--- a/_maps/map_files/stations/emeraldstation.dmm
+++ b/_maps/map_files/stations/emeraldstation.dmm
@@ -114719,6 +114719,7 @@
c_tag = "Chapel Chaplain's Office";
dir = 9
},
+/obj/machinery/economy/vending/chapdrobe,
/turf/simulated/floor/carpet/grimey,
/area/station/service/chapel/office)
"wsQ" = (
diff --git a/_maps/map_files/stations/metastation.dmm b/_maps/map_files/stations/metastation.dmm
index 5a02bf01c98..5338bb7b974 100644
--- a/_maps/map_files/stations/metastation.dmm
+++ b/_maps/map_files/stations/metastation.dmm
@@ -29201,13 +29201,8 @@
/turf/simulated/floor/plating,
/area/station/command/office/blueshield)
"cSL" = (
-/obj/structure/table/wood,
-/obj/item/clothing/under/misc/burial,
/obj/machinery/firealarm/directional/west,
-/obj/item/radio/intercom{
- name = "north bump";
- pixel_y = 28
- },
+/obj/machinery/economy/vending/chapdrobe,
/turf/simulated/floor/carpet/grimey,
/area/station/service/chapel/office)
"cSO" = (
@@ -33526,6 +33521,10 @@
/area/station/supply/lobby)
"dVn" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on,
+/obj/item/radio/intercom{
+ name = "north bump";
+ pixel_y = 28
+ },
/turf/simulated/floor/carpet/grimey,
/area/station/service/chapel/office)
"dVo" = (
@@ -46246,6 +46245,7 @@
/obj/item/food/grown/poppy,
/obj/item/food/grown/poppy,
/obj/item/food/grown/poppy,
+/obj/item/clothing/under/misc/burial,
/turf/simulated/floor/carpet,
/area/station/service/chapel/funeral)
"irz" = (
diff --git a/code/datums/outfits/outfit_admin.dm b/code/datums/outfits/outfit_admin.dm
index ab7e0b92e5c..875466b2a57 100644
--- a/code/datums/outfits/outfit_admin.dm
+++ b/code/datums/outfits/outfit_admin.dm
@@ -372,7 +372,7 @@
name = "Tunnel Clown"
uniform = /obj/item/clothing/under/rank/civilian/clown
- suit = /obj/item/clothing/suit/hooded/chaplain_hoodie
+ suit = /obj/item/clothing/suit/hooded/dark_robes
back = /obj/item/storage/backpack
belt = /obj/item/storage/belt/utility/full/multitool
gloves = /obj/item/clothing/gloves/color/black
@@ -1194,7 +1194,7 @@
name = "Dark Lord"
uniform = /obj/item/clothing/under/color/black
- suit = /obj/item/clothing/suit/hooded/chaplain_hoodie
+ suit = /obj/item/clothing/suit/hooded/dark_robes
back = /obj/item/storage/backpack
gloves = /obj/item/clothing/gloves/combat
shoes = /obj/item/clothing/shoes/chameleon/noslip
@@ -1211,7 +1211,7 @@
if(visualsOnly)
return
- var/obj/item/clothing/suit/hooded/chaplain_hoodie/C = H.wear_suit
+ var/obj/item/clothing/suit/hooded/dark_robes/C = H.wear_suit
if(istype(C))
C.name = "dark lord robes"
C.hood.name = "dark lord hood"
@@ -1242,7 +1242,7 @@
if(visualsOnly)
return
- var/obj/item/clothing/suit/hooded/chaplain_hoodie/C = new(H.loc)
+ var/obj/item/clothing/suit/hooded/dark_robes/C = new(H.loc)
if(istype(C))
C.name = "ancient robes"
C.hood.name = "ancient hood"
@@ -1284,7 +1284,7 @@
if(visualsOnly)
return
- var/obj/item/clothing/suit/hooded/chaplain_hoodie/C = new(H.loc)
+ var/obj/item/clothing/suit/hooded/dark_robes/C = new(H.loc)
if(istype(C))
C.name = "ancient robes"
C.hood.name = "ancient hood"
@@ -1376,9 +1376,9 @@
name = "Dark Priest"
uniform = /obj/item/clothing/under/color/black
- suit = /obj/item/clothing/suit/hooded/chaplain_hoodie
+ suit = /obj/item/clothing/suit/hooded/dark_robes
back = /obj/item/storage/backpack
- head = /obj/item/clothing/head/hooded/chaplain_hood
+ head = /obj/item/clothing/head/hooded/dark_hood
gloves = /obj/item/clothing/gloves/color/black
shoes = /obj/item/clothing/shoes/black
l_ear = /obj/item/radio/headset/syndicate
diff --git a/code/game/machinery/vendors/wardrobe_vendors.dm b/code/game/machinery/vendors/wardrobe_vendors.dm
index e7b34459798..7d5266aef14 100644
--- a/code/game/machinery/vendors/wardrobe_vendors.dm
+++ b/code/game/machinery/vendors/wardrobe_vendors.dm
@@ -1036,3 +1036,85 @@
prices = list()
refill_canister = /obj/item/vending_refill/traindrobe
+
+/obj/machinery/economy/vending/chapdrobe
+ name = "\improper ChapDrobe"
+ desc = "A blessed vending machine dispensing clothes for chaplains."
+ icon_state = "base_drobe"
+ icon_panel = "drobe"
+ icon_addon = "chap_drobe"
+ category = VENDOR_TYPE_CLOTHING
+ ads_list = list("Holy vestments for a small fee.")
+
+ vend_reply = "Thank you for using the ChapDrobe!"
+ products = list(/obj/item/clothing/under/rank/civilian/chaplain = 3,
+ /obj/item/clothing/under/rank/civilian/chaplain/white = 3,
+ /obj/item/clothing/under/rank/civilian/chaplain/bw = 3,
+ /obj/item/clothing/under/rank/civilian/chaplain/orange = 3,
+ /obj/item/clothing/under/rank/civilian/chaplain/green = 3,
+ /obj/item/clothing/under/rank/civilian/chaplain/thobe = 3,
+ /obj/item/clothing/head/turban_orange = 3,
+ /obj/item/clothing/head/turban_green = 3,
+ /obj/item/clothing/head/hijab = 3,
+ /obj/item/clothing/head/eboshi = 3,
+ /obj/item/clothing/head/kippah = 3,
+ /obj/item/clothing/head/shtreimel = 3,
+ /obj/item/clothing/head/witchhunter_hat = 3,
+ /obj/item/clothing/head/helmet/riot/knight/templar = 1,
+ /obj/item/clothing/suit/hooded/abaya = 3,
+ /obj/item/clothing/suit/hooded/chaplain_cassock = 3,
+ /obj/item/clothing/suit/hooded/nun = 3,
+ /obj/item/clothing/suit/hooded/monk = 3,
+ /obj/item/clothing/suit/hooded/dark_robes = 3,
+ /obj/item/clothing/suit/bana = 3,
+ /obj/item/clothing/suit/joue = 3,
+ /obj/item/clothing/suit/miko = 3,
+ /obj/item/clothing/suit/hasidic_coat = 3,
+ /obj/item/clothing/suit/witchhunter = 3,
+ /obj/item/clothing/suit/holidaypriest = 3,
+ /obj/item/clothing/suit/armor/riot/knight/templar = 1,
+ /obj/item/clothing/neck/cloak/tallit = 3,
+ /obj/item/clothing/head/helmet/space/plasmaman/chaplain = 3,
+ /obj/item/clothing/head/helmet/space/plasmaman/chaplain/green = 3,
+ /obj/item/clothing/head/helmet/space/plasmaman/chaplain/orange = 3,
+ /obj/item/clothing/under/plasmaman/chaplain = 3,
+ /obj/item/clothing/under/plasmaman/chaplain/green = 3,
+ /obj/item/clothing/under/plasmaman/chaplain/blue = 3)
+
+ contraband = list(/obj/item/toy/figure/crew/chaplain = 1)
+
+ prices = list(/obj/item/clothing/under/rank/civilian/chaplain = 50,
+ /obj/item/clothing/under/rank/civilian/chaplain/white = 50,
+ /obj/item/clothing/under/rank/civilian/chaplain/bw = 50,
+ /obj/item/clothing/under/rank/civilian/chaplain/orange = 50,
+ /obj/item/clothing/under/rank/civilian/chaplain/green = 50,
+ /obj/item/clothing/under/rank/civilian/chaplain/thobe = 50,
+ /obj/item/clothing/head/turban_orange = 20,
+ /obj/item/clothing/head/turban_green = 20,
+ /obj/item/clothing/head/hijab = 20,
+ /obj/item/clothing/head/eboshi = 20,
+ /obj/item/clothing/head/kippah = 20,
+ /obj/item/clothing/head/shtreimel = 20,
+ /obj/item/clothing/head/witchhunter_hat = 20,
+ /obj/item/clothing/head/helmet/riot/knight/templar = 40,
+ /obj/item/clothing/suit/hooded/abaya = 50,
+ /obj/item/clothing/suit/hooded/chaplain_cassock = 50,
+ /obj/item/clothing/suit/hooded/nun = 50,
+ /obj/item/clothing/suit/hooded/monk = 50,
+ /obj/item/clothing/suit/hooded/dark_robes = 50,
+ /obj/item/clothing/suit/bana = 50,
+ /obj/item/clothing/suit/joue = 50,
+ /obj/item/clothing/suit/miko = 50,
+ /obj/item/clothing/suit/hasidic_coat = 50,
+ /obj/item/clothing/suit/witchhunter = 50,
+ /obj/item/clothing/suit/holidaypriest = 50,
+ /obj/item/clothing/suit/armor/riot/knight/templar = 80,
+ /obj/item/clothing/neck/cloak/tallit = 20,
+ /obj/item/clothing/head/helmet/space/plasmaman/chaplain = 60,
+ /obj/item/clothing/head/helmet/space/plasmaman/chaplain/green = 60,
+ /obj/item/clothing/head/helmet/space/plasmaman/chaplain/orange = 60,
+ /obj/item/clothing/under/plasmaman/chaplain = 60,
+ /obj/item/clothing/under/plasmaman/chaplain/green = 60,
+ /obj/item/clothing/under/plasmaman/chaplain/blue = 60)
+
+ refill_canister = /obj/item/vending_refill/chapdrobe
diff --git a/code/game/objects/items/storage/garment.dm b/code/game/objects/items/storage/garment.dm
index 3be6c2bcfb4..623ac3debaa 100644
--- a/code/game/objects/items/storage/garment.dm
+++ b/code/game/objects/items/storage/garment.dm
@@ -298,20 +298,11 @@
desc = "A bag for storing extra clothes and shoes. This one belongs to the chaplain."
/obj/item/storage/bag/garment/chaplain/populate_contents()
- new /obj/item/clothing/under/rank/civilian/chaplain(src)
- new /obj/item/clothing/shoes/black(src)
- new /obj/item/clothing/suit/hooded/abaya(src)
- new /obj/item/clothing/suit/hooded/nun(src)
- new /obj/item/clothing/suit/hooded/chaplain_hoodie(src)
- new /obj/item/clothing/suit/hooded/monk(src)
- new /obj/item/clothing/suit/witchhunter(src)
- new /obj/item/clothing/head/witchhunter_hat(src)
- new /obj/item/clothing/suit/holidaypriest(src)
+ new /obj/item/clothing/suit/hooded/dark_robes(src)
new /obj/item/clothing/head/helmet/riot/knight/templar(src)
new /obj/item/clothing/suit/armor/riot/knight/templar(src)
- new /obj/item/clothing/suit/storage/labcoat(src)
- new /obj/item/clothing/head/helmet/space/plasmaman/chaplain(src)
- new /obj/item/clothing/under/plasmaman/chaplain(src)
+ new /obj/item/clothing/head/helmet/space/plasmaman/chaplain/green(src)
+ new /obj/item/clothing/under/plasmaman/chaplain/green(src)
/obj/item/storage/bag/garment/librarian
name = "librarian's garment bag"
diff --git a/code/game/objects/items/vending_items.dm b/code/game/objects/items/vending_items.dm
index 5c65a755fe6..e7279def82a 100644
--- a/code/game/objects/items/vending_items.dm
+++ b/code/game/objects/items/vending_items.dm
@@ -230,3 +230,7 @@
/obj/item/vending_refill/minedrobe
machine_name = "MineDrobe"
icon_state = "refill_clothes"
+
+/obj/item/vending_refill/chapdrobe
+ machine_name = "ChapDrobe"
+ icon_state = "refill_clothes"
diff --git a/code/game/objects/items/weapons/holy_weapons.dm b/code/game/objects/items/weapons/holy_weapons.dm
index 05cafd8697b..ce340def535 100644
--- a/code/game/objects/items/weapons/holy_weapons.dm
+++ b/code/game/objects/items/weapons/holy_weapons.dm
@@ -365,7 +365,7 @@
/obj/item/nullrod/hammmer
name = "relic war hammer"
- desc = "This war hammer cost the chaplain fourty thousand space dollars."
+ desc = "This war hammer cost the chaplain fourty thousand credits."
icon_state = "hammeron"
worn_icon_state = null
inhand_icon_state = null
@@ -664,7 +664,7 @@
reskinned = TRUE
reskin_selectable = FALSE
var/team_color = "red"
- var/obj/item/clothing/suit/hooded/chaplain_hoodie/missionary_robe/robes = null //the robes linked with this staff
+ var/obj/item/clothing/suit/hooded/chaplain_cassock/missionary_robe/robes = null //the robes linked with this staff
var/faith = 99 //a conversion requires 100 faith to attempt. faith recharges over time while you are wearing missionary robes that have been linked to the staff.
/obj/item/nullrod/missionary_staff/examine(mob/living/user)
@@ -692,8 +692,8 @@
if(!ishuman(user)) //prevents the horror (runtimes) of missionary xenos and other non-human mobs that might be able to activate the item
return FALSE
var/mob/living/carbon/human/missionary = user
- if(missionary.wear_suit && istype(missionary.wear_suit, /obj/item/clothing/suit/hooded/chaplain_hoodie/missionary_robe))
- var/obj/item/clothing/suit/hooded/chaplain_hoodie/missionary_robe/robe_to_link = missionary.wear_suit
+ if(missionary.wear_suit && istype(missionary.wear_suit, /obj/item/clothing/suit/hooded/chaplain_cassock/missionary_robe))
+ var/obj/item/clothing/suit/hooded/chaplain_cassock/missionary_robe/robe_to_link = missionary.wear_suit
if(robe_to_link.linked_staff)
to_chat(missionary, "These robes are already linked with a staff and cannot support another. Connection refused.")
return FALSE
diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm
index 2e59dfc41a0..b663a09838a 100644
--- a/code/game/objects/items/weapons/storage/boxes.dm
+++ b/code/game/objects/items/weapons/storage/boxes.dm
@@ -1388,6 +1388,33 @@
new /obj/item/clothing/under/plasmaman/tacticool(src)
new /obj/item/clothing/head/helmet/space/plasmaman/tacticool(src)
+/obj/item/storage/box/chapbw_envirosuit
+ name = "chaplain suit box, black and white"
+ desc = "A box with a special envirosuit for pious plasmamen."
+ icon_state = "plasma_box"
+
+/obj/item/storage/box/chapbw_envirosuit/populate_contents()
+ new /obj/item/clothing/under/plasmaman/chaplain(src)
+ new /obj/item/clothing/head/helmet/space/plasmaman/chaplain(src)
+
+/obj/item/storage/box/chapwg_envirosuit
+ name = "chaplain suit box, white and green"
+ desc = "A box with a special envirosuit for pious plasmamen."
+ icon_state = "plasma_box"
+
+/obj/item/storage/box/chapwg_envirosuit/populate_contents()
+ new /obj/item/clothing/under/plasmaman/chaplain/green(src)
+ new /obj/item/clothing/head/helmet/space/plasmaman/chaplain/green(src)
+
+/obj/item/storage/box/chapco_envirosuit
+ name = "chaplain suit box, blue and orange"
+ desc = "A box with a special envirosuit for pious plasmamen."
+ icon_state = "plasma_box"
+
+/obj/item/storage/box/chapco_envirosuit/populate_contents()
+ new /obj/item/clothing/under/plasmaman/chaplain/blue(src)
+ new /obj/item/clothing/head/helmet/space/plasmaman/chaplain/orange(src)
+
/obj/item/storage/box/autochef
name = "autochef starter kit"
desc = "Contains everything you need to build and use an autochef."
diff --git a/code/game/objects/items/weapons/storage/uplink_kits.dm b/code/game/objects/items/weapons/storage/uplink_kits.dm
index 5d146dbb05f..aaef79aab15 100644
--- a/code/game/objects/items/weapons/storage/uplink_kits.dm
+++ b/code/game/objects/items/weapons/storage/uplink_kits.dm
@@ -153,7 +153,7 @@
/obj/item/melee/energy/sword/saber/red, // 40TC
/obj/item/bio_chip_implanter/shock, // 50TC
/obj/item/dnainjector/telemut/darkbundle, // 0TC
- /obj/item/clothing/suit/hooded/chaplain_hoodie, // 0TC
+ /obj/item/clothing/suit/hooded/chaplain_cassock, // 0TC
/obj/item/clothing/glasses/meson/engine/atmos, // 0TC
/obj/item/clothing/mask/chameleon/voice_change, // 10TC
/obj/item/card/id/syndicate, // 10TC
@@ -432,7 +432,7 @@
/obj/item/storage/box/syndie_kit/missionary_set/populate_contents()
new /obj/item/nullrod/missionary_staff(src)
- new /obj/item/clothing/suit/hooded/chaplain_hoodie/missionary_robe(src)
+ new /obj/item/clothing/suit/hooded/chaplain_cassock/missionary_robe(src)
var/obj/item/storage/bible/B = new /obj/item/storage/bible(src)
if(prob(25)) //an omen of success to come?
B.deity_name = "Success"
diff --git a/code/modules/client/preference/loadout/loadout_hat.dm b/code/modules/client/preference/loadout/loadout_hat.dm
index 28127bd5ee7..7f128ca5c87 100644
--- a/code/modules/client/preference/loadout/loadout_hat.dm
+++ b/code/modules/client/preference/loadout/loadout_hat.dm
@@ -322,6 +322,30 @@
display_name = "Kitty ears"
path = /obj/item/clothing/head/kitty
+/datum/gear/hat/chaplain
+ main_typepath = /datum/gear/hat/chaplain
+ allowed_roles = list("Chaplain")
+
+/datum/gear/hat/chaplain/turban_orange
+ display_name = "Turban, orange"
+ path = /obj/item/clothing/head/turban_orange
+
+/datum/gear/hat/chaplain/turban_green
+ display_name = "Turban, green"
+ path = /obj/item/clothing/head/turban_green
+
+/datum/gear/hat/chaplain/hijab
+ display_name = "Hijab"
+ path = /obj/item/clothing/head/hijab
+
+/datum/gear/hat/chaplain/eboshi
+ display_name = "Eboshi"
+ path = /obj/item/clothing/head/eboshi
+
+/datum/gear/hat/chaplain/kippah
+ display_name = "Kippah"
+ path = /obj/item/clothing/head/kippah
+
/datum/gear/hat/wizard
display_name = "Wizard hat"
path = /obj/item/clothing/head/wizard/fake
diff --git a/code/modules/client/preference/loadout/loadout_neck.dm b/code/modules/client/preference/loadout/loadout_neck.dm
index c8879c7201f..bee51f12906 100644
--- a/code/modules/client/preference/loadout/loadout_neck.dm
+++ b/code/modules/client/preference/loadout/loadout_neck.dm
@@ -204,3 +204,8 @@
display_name = "Mantle, quartermaster"
path = /obj/item/clothing/neck/cloak/qm_mantle
allowed_roles = list("Quartermaster")
+
+/datum/gear/neck/tallit
+ display_name = "Chaplain, tallit"
+ path = /obj/item/clothing/neck/cloak/tallit
+ allowed_roles = list("Chaplain")
diff --git a/code/modules/client/preference/loadout/loadout_racial.dm b/code/modules/client/preference/loadout/loadout_racial.dm
index d84f6978c1a..dc0b686fff7 100644
--- a/code/modules/client/preference/loadout/loadout_racial.dm
+++ b/code/modules/client/preference/loadout/loadout_racial.dm
@@ -52,3 +52,21 @@
display_name = "Tactical Suit"
description = "Plasmaman envirosuit supplied by black markets. Forged on Boron. Does not have suit sensors."
path = /obj/item/storage/box/tacticool_envirosuit
+
+/datum/gear/racial/plasmamansuit_chapbw
+ display_name = "Chaplain suit, black and white"
+ description = "Envirosuit for pious plasmamen in black and white."
+ path =/obj/item/storage/box/chapbw_envirosuit
+ allowed_roles = list("Chaplain")
+
+/datum/gear/racial/plasmamansuit_chapwg
+ display_name = "Chaplain suit, white and green"
+ description = "Envirosuit for pious plasmamen in white and green."
+ path = /obj/item/storage/box/chapwg_envirosuit
+ allowed_roles = list("Chaplain")
+
+/datum/gear/racial/plasmamansuit_chapco
+ display_name = "Chaplain suit, blue and orange"
+ description = "Envirosuit for pious plasmamen in blue and orange."
+ path = /obj/item/storage/box/chapco_envirosuit
+ allowed_roles = list("Chaplain")
diff --git a/code/modules/client/preference/loadout/loadout_suit.dm b/code/modules/client/preference/loadout/loadout_suit.dm
index e6477882fc0..f3c6a96159c 100644
--- a/code/modules/client/preference/loadout/loadout_suit.dm
+++ b/code/modules/client/preference/loadout/loadout_suit.dm
@@ -16,6 +16,9 @@
slot = ITEM_SLOT_OUTER_SUIT
sort_category = "External Wear"
+/datum/gear/suit/job
+ main_typepath = /datum/gear/suit/job
+
//WINTER COATS
/datum/gear/suit/coat
main_typepath = /datum/gear/suit/coat
@@ -284,3 +287,47 @@
/datum/gear/suit/tracksuitwhite
display_name = "Tracksuit, white"
path = /obj/item/clothing/suit/tracksuit/white
+
+// Chaplain
+/datum/gear/suit/job/chaplain
+ main_typepath = /datum/gear/suit/job/chaplain
+
+/datum/gear/suit/job/chaplain/dark_robes
+ display_name = "Dark robes"
+ path = /obj/item/clothing/suit/hooded/dark_robes
+ allowed_roles = list("Chaplain")
+
+/datum/gear/suit/job/chaplain/cassock
+ display_name = "Chaplain, cassock"
+ path = /obj/item/clothing/suit/hooded/chaplain_cassock
+ allowed_roles = list("Chaplain")
+
+/datum/gear/suit/job/chaplain/nun
+ display_name = "Chaplain, habit"
+ path = /obj/item/clothing/suit/hooded/nun
+ allowed_roles = list("Chaplain")
+
+/datum/gear/suit/job/chaplain/monk
+ display_name = "Chaplain, monk robes"
+ path = /obj/item/clothing/suit/hooded/monk
+ allowed_roles = list("Chaplain")
+
+/datum/gear/suit/job/chaplain/bana
+ display_name = "Chaplain, bana"
+ path = /obj/item/clothing/suit/bana
+ allowed_roles = list("Chaplain")
+
+/datum/gear/suit/job/chaplain/joue
+ display_name = "Chaplain, joue"
+ path = /obj/item/clothing/suit/joue
+ allowed_roles = list("Chaplain")
+
+/datum/gear/suit/job/chaplain/miko
+ display_name = "Chaplain, miko clothing"
+ path = /obj/item/clothing/suit/miko
+ allowed_roles = list("Chaplain")
+
+/datum/gear/suit/job/chaplain/hasidic_coat
+ display_name = "Chaplain, hasidic coat"
+ path = /obj/item/clothing/suit/hasidic_coat
+ allowed_roles = list("Chaplain")
diff --git a/code/modules/client/preference/loadout/loadout_uniform.dm b/code/modules/client/preference/loadout/loadout_uniform.dm
index 441c3490c40..e7384f9b2fc 100644
--- a/code/modules/client/preference/loadout/loadout_uniform.dm
+++ b/code/modules/client/preference/loadout/loadout_uniform.dm
@@ -397,6 +397,36 @@
path = /obj/item/clothing/under/rank/civilian/hop/turtleneck
allowed_roles = list("Head of Personnel")
+/datum/gear/uniform/suit/job/chaplain/
+ display_name = "Chaplain, black"
+ path = /obj/item/clothing/under/rank/civilian/chaplain
+ allowed_roles = list("Chaplain")
+
+/datum/gear/uniform/suit/job/chaplain/white
+ display_name = "Chaplain, white"
+ path = /obj/item/clothing/under/rank/civilian/chaplain/white
+ allowed_roles = list("Chaplain")
+
+/datum/gear/uniform/suit/job/chaplain/bw
+ display_name = "Chaplain, black and white"
+ path = /obj/item/clothing/under/rank/civilian/chaplain/bw
+ allowed_roles = list("Chaplain")
+
+/datum/gear/uniform/suit/job/chaplain/orange
+ display_name = "Chaplain, kasaya"
+ path = /obj/item/clothing/under/rank/civilian/chaplain/orange
+ allowed_roles = list("Chaplain")
+
+/datum/gear/uniform/suit/job/chaplain/green
+ display_name = "Chaplain, modest"
+ path = /obj/item/clothing/under/rank/civilian/chaplain/green
+ allowed_roles = list("Chaplain")
+
+/datum/gear/uniform/suit/job/chaplain/thobe
+ display_name = "Chaplain, thobe"
+ path = /obj/item/clothing/under/rank/civilian/chaplain/thobe
+ allowed_roles = list("Chaplain")
+
//Command and dignitary
/datum/gear/uniform/skirt/captain
display_name = "Skirt, captain"
diff --git a/code/modules/clothing/head/job_hats.dm b/code/modules/clothing/head/job_hats.dm
index 4cf2e5b88ab..dae8cb805b9 100644
--- a/code/modules/clothing/head/job_hats.dm
+++ b/code/modules/clothing/head/job_hats.dm
@@ -12,7 +12,7 @@
"Drask" = 'icons/mob/clothing/species/drask/head.dmi',
"Grey" = 'icons/mob/clothing/species/grey/head.dmi',
"Kidan" = 'icons/mob/clothing/species/kidan/head.dmi',
- "Vox" = 'icons/mob/clothing/species/vox/head.dmi',
+ "Vox" = 'icons/mob/clothing/species/vox/head.dmi'
)
//Captain
@@ -28,7 +28,7 @@
"Drask" = 'icons/mob/clothing/species/drask/head.dmi',
"Grey" = 'icons/mob/clothing/species/grey/head.dmi',
"Kidan" = 'icons/mob/clothing/species/kidan/head.dmi'
- )
+ )
/obj/item/clothing/head/caphat/parade
name = "captain's parade cap"
@@ -72,7 +72,7 @@
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/head.dmi',
"Drask" = 'icons/mob/clothing/species/drask/head.dmi',
- "Grey" = 'icons/mob/clothing/species/grey/head.dmi',
+ "Grey" = 'icons/mob/clothing/species/grey/head.dmi'
)
@@ -84,6 +84,15 @@
flags = BLOCKHAIR
flags_cover = HEADCOVERSEYES
icon_monitor = 'icons/mob/clothing/species/machine/monitor/hood.dmi'
+ sprite_sheets = list(
+ "Drask" = 'icons/mob/clothing/species/drask/head.dmi',
+ "Grey" = 'icons/mob/clothing/species/grey/head.dmi',
+ "Kidan" = 'icons/mob/clothing/species/kidan/head.dmi',
+ "Skrell" = 'icons/mob/clothing/species/skrell/head.dmi',
+ "Tajaran" = 'icons/mob/clothing/species/tajaran/head.dmi',
+ "Vox" = 'icons/mob/clothing/species/vox/head.dmi',
+ "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/head.dmi'
+ )
//Chaplain
/obj/item/clothing/head/hooded/nun_hood
@@ -93,6 +102,16 @@
flags = BLOCKHAIR
flags_cover = HEADCOVERSEYES
icon_monitor = 'icons/mob/clothing/species/machine/monitor/hood.dmi'
+ sprite_sheets = list(
+ "Drask" = 'icons/mob/clothing/species/drask/head.dmi',
+ "Grey" = 'icons/mob/clothing/species/grey/head.dmi',
+ "Kidan" = 'icons/mob/clothing/species/kidan/head.dmi',
+ "Nian" = 'icons/mob/clothing/species/nian/head.dmi',
+ "Skrell" = 'icons/mob/clothing/species/skrell/head.dmi',
+ "Tajaran" = 'icons/mob/clothing/species/tajaran/head.dmi',
+ "Vox" = 'icons/mob/clothing/species/vox/head.dmi',
+ "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/head.dmi'
+ )
//Chaplain
/obj/item/clothing/head/hooded/monk_hood
@@ -103,6 +122,110 @@
flags_cover = HEADCOVERSEYES
icon_monitor = 'icons/mob/clothing/species/machine/monitor/hood.dmi'
+//Chaplain
+/obj/item/clothing/head/turban_orange
+ name = "dastar"
+ desc = "One of the essential five K's for any Sikh."
+ icon_state = "turban_orange"
+ flags = BLOCKHAIR
+ icon_monitor = 'icons/mob/clothing/species/machine/monitor/hat.dmi'
+ sprite_sheets = list(
+ "Drask" = 'icons/mob/clothing/species/drask/head.dmi',
+ "Grey" = 'icons/mob/clothing/species/grey/head.dmi',
+ "Kidan" = 'icons/mob/clothing/species/kidan/head.dmi',
+ "Nian" = 'icons/mob/clothing/species/nian/head.dmi',
+ "Skrell" = 'icons/mob/clothing/species/skrell/head.dmi',
+ "Tajaran" = 'icons/mob/clothing/species/tajaran/head.dmi',
+ "Vox" = 'icons/mob/clothing/species/vox/head.dmi',
+ "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/head.dmi'
+ )
+
+//Chaplain
+/obj/item/clothing/head/turban_green
+ name = "turban"
+ desc = "A choice color for Islamic leaders."
+ icon_state = "turban_green"
+ flags = BLOCKHAIR
+ icon_monitor = 'icons/mob/clothing/species/machine/monitor/hat.dmi'
+ sprite_sheets = list(
+ "Drask" = 'icons/mob/clothing/species/drask/head.dmi',
+ "Grey" = 'icons/mob/clothing/species/grey/head.dmi',
+ "Kidan" = 'icons/mob/clothing/species/kidan/head.dmi',
+ "Nian" = 'icons/mob/clothing/species/nian/head.dmi',
+ "Skrell" = 'icons/mob/clothing/species/skrell/head.dmi',
+ "Tajaran" = 'icons/mob/clothing/species/tajaran/head.dmi',
+ "Vox" = 'icons/mob/clothing/species/vox/head.dmi',
+ "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/head.dmi'
+ )
+
+//Chaplain
+/obj/item/clothing/head/eboshi
+ name = "eboshi"
+ desc = "Headwear for a Shinto priest."
+ icon_state = "eboshi"
+ flags = BLOCKHAIR
+ icon_monitor = 'icons/mob/clothing/species/machine/monitor/hat.dmi'
+ sprite_sheets = list(
+ "Drask" = 'icons/mob/clothing/species/drask/head.dmi',
+ "Grey" = 'icons/mob/clothing/species/grey/head.dmi',
+ "Kidan" = 'icons/mob/clothing/species/kidan/head.dmi',
+ "Nian" = 'icons/mob/clothing/species/nian/head.dmi',
+ "Skrell" = 'icons/mob/clothing/species/skrell/head.dmi',
+ "Tajaran" = 'icons/mob/clothing/species/tajaran/head.dmi',
+ "Vox" = 'icons/mob/clothing/species/vox/head.dmi',
+ "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/head.dmi'
+ )
+
+//Chaplain
+/obj/item/clothing/head/kippah
+ name = "kippah"
+ desc = "A small, round head covering."
+ icon_state = "kippah"
+ icon_monitor = 'icons/mob/clothing/species/machine/monitor/hat.dmi'
+ sprite_sheets = list(
+ "Drask" = 'icons/mob/clothing/species/drask/head.dmi',
+ "Grey" = 'icons/mob/clothing/species/grey/head.dmi',
+ "Kidan" = 'icons/mob/clothing/species/kidan/head.dmi',
+ "Skrell" = 'icons/mob/clothing/species/skrell/head.dmi',
+ "Tajaran" = 'icons/mob/clothing/species/tajaran/head.dmi',
+ "Vox" = 'icons/mob/clothing/species/vox/head.dmi',
+ "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/head.dmi'
+ )
+
+//Chaplain
+/obj/item/clothing/head/shtreimel
+ name = "shtreimel"
+ desc = "Festive head covering for Jewish men."
+ icon_state = "shtreimel"
+ icon_monitor = 'icons/mob/clothing/species/machine/monitor/hat.dmi'
+ sprite_sheets = list(
+ "Drask" = 'icons/mob/clothing/species/drask/head.dmi',
+ "Grey" = 'icons/mob/clothing/species/grey/head.dmi',
+ "Kidan" = 'icons/mob/clothing/species/kidan/head.dmi',
+ "Skrell" = 'icons/mob/clothing/species/skrell/head.dmi',
+ "Tajaran" = 'icons/mob/clothing/species/tajaran/head.dmi',
+ "Vox" = 'icons/mob/clothing/species/vox/head.dmi',
+ "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/head.dmi'
+ )
+
+//Chaplain
+/obj/item/clothing/head/hijab
+ name = "hijab"
+ desc = "A cloth worn around the head for modesty and dignity."
+ icon_state = "hijab"
+ flags = BLOCKHAIR
+ icon_monitor = 'icons/mob/clothing/species/machine/monitor/hood.dmi'
+ sprite_sheets = list(
+ "Drask" = 'icons/mob/clothing/species/drask/head.dmi',
+ "Grey" = 'icons/mob/clothing/species/grey/head.dmi',
+ "Kidan" = 'icons/mob/clothing/species/kidan/head.dmi',
+ "Nian" = 'icons/mob/clothing/species/nian/head.dmi',
+ "Skrell" = 'icons/mob/clothing/species/skrell/head.dmi',
+ "Tajaran" = 'icons/mob/clothing/species/tajaran/head.dmi',
+ "Vox" = 'icons/mob/clothing/species/vox/head.dmi',
+ "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/head.dmi'
+ )
+
/obj/item/clothing/head/witchhunter_hat
name = "witchhunter hat"
desc = "This hat saw much use back in the day."
diff --git a/code/modules/clothing/head/misc_hats.dm b/code/modules/clothing/head/misc_hats.dm
index adf11d2c86a..6c99fc1135e 100644
--- a/code/modules/clothing/head/misc_hats.dm
+++ b/code/modules/clothing/head/misc_hats.dm
@@ -511,6 +511,7 @@
"Grey" = 'icons/mob/clothing/species/grey/head.dmi',
"Drask" = 'icons/mob/clothing/species/drask/head.dmi'
)
+
/obj/item/clothing/head/cool_bandana
name = "badass bandana"
desc = "You know what time it is."
@@ -522,3 +523,11 @@
"Drask" = 'icons/mob/clothing/species/drask/head.dmi',
"Kidan" = 'icons/mob/clothing/species/kidan/head.dmi'
)
+
+/obj/item/clothing/head/hooded/dark_hood
+ name = "dark hood"
+ desc = "A dark hood for dark times."
+ icon_state = "dark_hood"
+ flags = BLOCKHAIR
+ flags_cover = HEADCOVERSEYES
+
diff --git a/code/modules/clothing/neck/cloaks.dm b/code/modules/clothing/neck/cloaks.dm
index 80fad48b568..9fa69d9fc90 100644
--- a/code/modules/clothing/neck/cloaks.dm
+++ b/code/modules/clothing/neck/cloaks.dm
@@ -109,3 +109,15 @@
name = "research director's mantle"
desc = "A tweed mantle, worn by the Research Director. Smells like science."
icon_state = "rdmantle"
+
+/obj/item/clothing/neck/cloak/tallit
+ name = "tallit"
+ desc = "A Jewish prayer shawl."
+ icon_state = "tallit"
+
+ sprite_sheets = list(
+ "Drask" = 'icons/mob/clothing/species/drask/neck.dmi',
+ "Grey" = 'icons/mob/clothing/species/grey/neck.dmi',
+ "Kidan" = 'icons/mob/clothing/species/kidan/neck.dmi',
+ "Vox" = 'icons/mob/clothing/species/vox/neck.dmi'
+ )
diff --git a/code/modules/clothing/spacesuits/plasmamen.dm b/code/modules/clothing/spacesuits/plasmamen.dm
index da2289106e2..66682382de2 100644
--- a/code/modules/clothing/spacesuits/plasmamen.dm
+++ b/code/modules/clothing/spacesuits/plasmamen.dm
@@ -187,9 +187,18 @@
icon_state = "smith_envirohelm"
/obj/item/clothing/head/helmet/space/plasmaman/chaplain
- name = "chaplain's plasma envirosuit helmet"
+ name = "chaplain's black plasma envirosuit helmet"
desc = "An envirohelmet specially designed for only the most pious of plasmamen."
- icon_state = "chap_envirohelm"
+ icon_state = "chapbw_envirohelm"
+
+/obj/item/clothing/head/helmet/space/plasmaman/chaplain/green
+ name = "chaplain's white plasma envirosuit helmet"
+ icon_state = "chapwg_envirohelm"
+
+/obj/item/clothing/head/helmet/space/plasmaman/chaplain/orange
+ name = "chaplain's orange plasma envirosuit helmet"
+ desc = "An envirohelmet specially designed for only the most pious of plasmamen, molded like a turban."
+ icon_state = "chapco_envirohelm"
/obj/item/clothing/head/helmet/space/plasmaman/white
name = "white plasma envirosuit helmet"
diff --git a/code/modules/clothing/suits/hood.dm b/code/modules/clothing/suits/hood.dm
index cce480b66e1..959dfea67d4 100644
--- a/code/modules/clothing/suits/hood.dm
+++ b/code/modules/clothing/suits/hood.dm
@@ -1,4 +1,4 @@
-//Hoods for winter coats and chaplain hoodie etc
+//Hoods for winter coats and dark robes etc
/obj/item/clothing/suit/hooded
actions_types = list(/datum/action/item_action/toggle)
diff --git a/code/modules/clothing/suits/job_suits.dm b/code/modules/clothing/suits/job_suits.dm
index 158ef05cb51..3eb99d98418 100644
--- a/code/modules/clothing/suits/job_suits.dm
+++ b/code/modules/clothing/suits/job_suits.dm
@@ -29,14 +29,20 @@
)
//Chaplain
-/obj/item/clothing/suit/hooded/chaplain_hoodie
- name = "chaplain hoodie"
+/obj/item/clothing/suit/hooded/chaplain_cassock
+ name = "cassock"
desc = "This suit says to you 'hush'!"
- icon_state = "chaplain_hoodie"
+ icon_state = "chaplain_cassock"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
hoodtype = /obj/item/clothing/head/hooded/chaplain_hood
allowed = list(/obj/item/storage/bible, /obj/item/nullrod, /obj/item/reagent_containers/drinks/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen)
- sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/suit.dmi')
+
+ sprite_sheets = list(
+ "Drask" = 'icons/mob/clothing/species/drask/suit.dmi',
+ "Grey" = 'icons/mob/clothing/species/grey/suit.dmi',
+ "Kidan" = 'icons/mob/clothing/species/kidan/suit.dmi',
+ "Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
+ )
//Chaplain
/obj/item/clothing/suit/hooded/nun
@@ -47,7 +53,13 @@
flags_inv = HIDESHOES|HIDEJUMPSUIT
hoodtype = /obj/item/clothing/head/hooded/nun_hood
allowed = list(/obj/item/storage/bible, /obj/item/nullrod, /obj/item/reagent_containers/drinks/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen)
- sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/suit.dmi')
+
+ sprite_sheets = list(
+ "Drask" = 'icons/mob/clothing/species/drask/suit.dmi',
+ "Grey" = 'icons/mob/clothing/species/grey/suit.dmi',
+ "Kidan" = 'icons/mob/clothing/species/kidan/suit.dmi',
+ "Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
+ )
//Chaplain
/obj/item/clothing/suit/hooded/monk
@@ -58,10 +70,75 @@
flags_inv = HIDEJUMPSUIT
hoodtype = /obj/item/clothing/head/hooded/monk_hood
allowed = list(/obj/item/storage/bible, /obj/item/nullrod, /obj/item/reagent_containers/drinks/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen)
+ sprite_sheets = list(
+ "Drask" = 'icons/mob/clothing/species/drask/suit.dmi',
+ "Grey" = 'icons/mob/clothing/species/grey/suit.dmi',
+ "Kidan" = 'icons/mob/clothing/species/kidan/suit.dmi',
+ "Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
+ )
+
+//Chaplain
+/obj/item/clothing/suit/bana
+ name = "bana"
+ desc = "Sikh spiritual attire."
+ icon_state = "bana"
+ body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
+ flags_inv = HIDEJUMPSUIT
+ allowed = list(/obj/item/storage/bible, /obj/item/nullrod, /obj/item/reagent_containers/drinks/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen)
+ sprite_sheets = list(
+ "Drask" = 'icons/mob/clothing/species/drask/suit.dmi',
+ "Grey" = 'icons/mob/clothing/species/grey/suit.dmi',
+ "Kidan" = 'icons/mob/clothing/species/kidan/suit.dmi',
+ "Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
+ )
+
+//Chaplain
+/obj/item/clothing/suit/joue
+ name = "joue"
+ desc = "Kannushi formal attire."
+ icon_state = "joue"
+ body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS|HANDS
+ flags_inv = HIDEJUMPSUIT
+ allowed = list(/obj/item/storage/bible, /obj/item/nullrod, /obj/item/reagent_containers/drinks/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen)
+ sprite_sheets = list(
+ "Drask" = 'icons/mob/clothing/species/drask/suit.dmi',
+ "Grey" = 'icons/mob/clothing/species/grey/suit.dmi',
+ "Kidan" = 'icons/mob/clothing/species/kidan/suit.dmi',
+ "Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
+ )
+
+//Chaplain
+/obj/item/clothing/suit/miko
+ name = "miko clothing"
+ desc = "Clothes worn by shrine maidens."
+ icon_state = "miko"
+ body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS|HANDS
+ flags_inv = HIDEJUMPSUIT
+ allowed = list(/obj/item/storage/bible, /obj/item/nullrod, /obj/item/reagent_containers/drinks/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen)
+ sprite_sheets = list(
+ "Drask" = 'icons/mob/clothing/species/drask/suit.dmi',
+ "Grey" = 'icons/mob/clothing/species/grey/suit.dmi',
+ "Kidan" = 'icons/mob/clothing/species/kidan/suit.dmi',
+ "Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
+ )
+
+//Chaplain
+/obj/item/clothing/suit/hasidic_coat
+ name = "hasidic suit coat"
+ desc = "Favored by Hasidic Jewish folk."
+ icon_state = "hasidic_coat"
+ body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
+ allowed = list(/obj/item/storage/bible, /obj/item/nullrod, /obj/item/reagent_containers/drinks/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen)
+ sprite_sheets = list(
+ "Drask" = 'icons/mob/clothing/species/drask/suit.dmi',
+ "Grey" = 'icons/mob/clothing/species/grey/suit.dmi',
+ "Kidan" = 'icons/mob/clothing/species/kidan/suit.dmi',
+ "Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
+ )
/obj/item/clothing/suit/witchhunter
name = "witchhunter garb"
- desc = "Dosen't weigh the same a a duck."
+ desc = "Doesn't weigh the same as a duck."
icon_state = "witchhunter"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
allowed = list(/obj/item/storage/bible, /obj/item/nullrod, /obj/item/reagent_containers/drinks/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen)
diff --git a/code/modules/clothing/suits/misc_suits.dm b/code/modules/clothing/suits/misc_suits.dm
index ba52a080cee..54a0d6a7e8f 100644
--- a/code/modules/clothing/suits/misc_suits.dm
+++ b/code/modules/clothing/suits/misc_suits.dm
@@ -1193,7 +1193,7 @@
STOP_PROCESSING(SSobj, src)
//Syndicate Chaplain Robe (WOLOLO!)
-/obj/item/clothing/suit/hooded/chaplain_hoodie/missionary_robe
+/obj/item/clothing/suit/hooded/chaplain_cassock/missionary_robe
armor = list(MELEE = 5, BULLET = 5, LASER = 5, ENERGY = 5, BOMB = 0, RAD = 10, FIRE = 20, ACID = 20)
var/obj/item/nullrod/missionary_staff/linked_staff = null
@@ -1202,21 +1202,21 @@
if(isAntag(user))
. += "This robe is made of totally reinforced fibers, granting it 100% not superficial protection. More importantly the robes also wirelessly generate power for the neurotransmitter in the linked missionary staff while being worn."
-/obj/item/clothing/suit/hooded/chaplain_hoodie/missionary_robe/Destroy()
+/obj/item/clothing/suit/hooded/chaplain_cassock/missionary_robe/Destroy()
if(linked_staff) //delink on destruction
linked_staff.robes = null
linked_staff = null
STOP_PROCESSING(SSobj, src) //probably is cleared in a parent call already, but just in case we're gonna do it here
return ..()
-/obj/item/clothing/suit/hooded/chaplain_hoodie/missionary_robe/equipped(mob/living/carbon/human/H, slot)
+/obj/item/clothing/suit/hooded/chaplain_cassock/missionary_robe/equipped(mob/living/carbon/human/H, slot)
if(!istype(H) || slot != ITEM_SLOT_OUTER_SUIT)
STOP_PROCESSING(SSobj, src)
return
else
START_PROCESSING(SSobj, src)
-/obj/item/clothing/suit/hooded/chaplain_hoodie/missionary_robe/process()
+/obj/item/clothing/suit/hooded/chaplain_cassock/missionary_robe/process()
if(!linked_staff) //if we don't have a linked staff, the rest of this is useless
return
@@ -1362,3 +1362,12 @@
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
"Grey" = 'icons/mob/clothing/species/grey/suit.dmi'
)
+
+/obj/item/clothing/suit/hooded/dark_robes
+ name = "dark robes"
+ desc = "Dark robes for dark times."
+ icon_state = "dark_robes"
+ body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
+ hoodtype = /obj/item/clothing/head/hooded/dark_hood
+ allowed = list(/obj/item/storage/bible, /obj/item/nullrod, /obj/item/reagent_containers/drinks/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen)
+ sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/suit.dmi')
diff --git a/code/modules/clothing/under/jobs/civilian.dm b/code/modules/clothing/under/jobs/civilian.dm
index 56807821562..58a6eea587d 100644
--- a/code/modules/clothing/under/jobs/civilian.dm
+++ b/code/modules/clothing/under/jobs/civilian.dm
@@ -53,8 +53,33 @@
/obj/item/clothing/under/rank/civilian/chaplain
desc = "It's a black jumpsuit, often worn by religious folk."
- name = "chaplain's jumpsuit"
- icon_state = "chaplain"
+ name = "chaplain's black jumpsuit"
+ icon_state = "chapblack"
+
+/obj/item/clothing/under/rank/civilian/chaplain/white
+ desc = "It's a white jumpsuit, often worn by religious folk."
+ name = "chaplain's white jumpsuit"
+ icon_state = "chapwhite"
+
+/obj/item/clothing/under/rank/civilian/chaplain/bw
+ desc = "It's a black and white jumpsuit, often worn by religious folk."
+ name = "chaplain's black and white jumpsuit"
+ icon_state = "chapbw"
+
+/obj/item/clothing/under/rank/civilian/chaplain/orange
+ desc = "Saffron cloth to wrap a Buddhist monk."
+ name = "kasaya"
+ icon_state = "chaporange"
+
+/obj/item/clothing/under/rank/civilian/chaplain/green
+ desc = "A green modest dress."
+ name = "chaplain's dress"
+ icon_state = "chapgreen"
+
+/obj/item/clothing/under/rank/civilian/chaplain/thobe
+ desc = "A modest and dignified robe."
+ name = "chaplain's thobe"
+ icon_state = "chapthobe"
/obj/item/clothing/under/rank/civilian/chaplain/sensor
sensor_mode = SENSOR_COORDS
diff --git a/code/modules/clothing/under/jobs/plasmamen/civilian_service.dm b/code/modules/clothing/under/jobs/plasmamen/civilian_service.dm
index d2151488d91..5cf11a2ec09 100644
--- a/code/modules/clothing/under/jobs/plasmamen/civilian_service.dm
+++ b/code/modules/clothing/under/jobs/plasmamen/civilian_service.dm
@@ -29,9 +29,17 @@
icon_state = "enviroslacks"
/obj/item/clothing/under/plasmaman/chaplain
- name = "chaplain's plasma envirosuit"
+ name = "chaplain's black plasma envirosuit"
desc = "An envirosuit specially designed for only the most pious of plasmamen."
- icon_state = "chap_envirosuit"
+ icon_state = "chapbw_envirosuit"
+
+/obj/item/clothing/under/plasmaman/chaplain/green
+ name = "chaplain's white plasma envirosuit"
+ icon_state = "chapwg_envirosuit"
+
+/obj/item/clothing/under/plasmaman/chaplain/blue
+ name = "chaplain's blue plasma envirosuit"
+ icon_state = "chapco_envirosuit"
/obj/item/clothing/under/plasmaman/librarian
name = "librarian's plasma envirosuit"
diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm
index 498f14760d8..5a88e4c3178 100644
--- a/code/modules/customitems/item_defines.dm
+++ b/code/modules/customitems/item_defines.dm
@@ -1347,7 +1347,7 @@
update_action_buttons()
/// chronx100: Hughe O'Splash
-/obj/item/clothing/suit/chaplain_hoodie/fluff/chronx
+/obj/item/clothing/suit/dark_robes/fluff/chronx
name = "Cthulhu's Robes"
desc = "Robes worn by the worshipers of Cthulhu. You see a name inscribed in blood on the inside: Hughe O'Splash"
icon = 'icons/obj/custom_items.dmi'
diff --git a/code/modules/mob/living/carbon/human/human_update_icons.dm b/code/modules/mob/living/carbon/human/human_update_icons.dm
index 711fa84aae2..a8db6ff9387 100644
--- a/code/modules/mob/living/carbon/human/human_update_icons.dm
+++ b/code/modules/mob/living/carbon/human/human_update_icons.dm
@@ -822,7 +822,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts)
if(istype(head, /obj/item/clothing/head))
var/obj/item/clothing/head/w_hat = head
for(var/obj/item/clothing/head/hat in w_hat.attached_hats)
- var/hat_worn_icon = (robohead && robohead.is_monitor ? hat.icon_monitor : FALSE) ||listgetindex(hat.sprite_sheets, dna.species.sprite_sheet_name) || hat.worn_icon || 'icons/mob/clothing/head.dmi'
+ var/hat_worn_icon = (robohead && robohead.is_monitor ? hat.icon_monitor : FALSE) || listgetindex(hat.sprite_sheets, dna.species.sprite_sheet_name) || hat.worn_icon || 'icons/mob/clothing/head.dmi'
var/hat_worn_icon_state = hat.worn_icon_state || hat.icon_state
standing.overlays += image(icon = hat_worn_icon, icon_state = hat_worn_icon_state)
diff --git a/code/modules/supply/supply_packs/pack_miscellaneous.dm b/code/modules/supply/supply_packs/pack_miscellaneous.dm
index 6872f5a0ecb..f2edce6c012 100644
--- a/code/modules/supply/supply_packs/pack_miscellaneous.dm
+++ b/code/modules/supply/supply_packs/pack_miscellaneous.dm
@@ -51,8 +51,8 @@
/obj/item/reagent_containers/drinks/bottle/holywater,
/obj/item/storage/bible/booze,
/obj/item/storage/bible/booze,
- /obj/item/clothing/suit/hooded/chaplain_hoodie,
- /obj/item/clothing/suit/hooded/chaplain_hoodie,
+ /obj/item/clothing/suit/hooded/dark_robes,
+ /obj/item/clothing/suit/hooded/dark_robes,
/obj/item/clothing/under/misc/burial,
/obj/item/clothing/under/misc/burial)
cost = 250
@@ -522,7 +522,8 @@
/obj/item/vending_refill/chefdrobe,
/obj/item/vending_refill/hydrodrobe,
/obj/item/vending_refill/janidrobe,
- /obj/item/vending_refill/lawdrobe)
+ /obj/item/vending_refill/lawdrobe,
+ /obj/item/vending_refill/chapdrobe)
containername = "service clothing vendor crate"
/datum/supply_packs/misc/vending/clothingvendor/cargo
diff --git a/icons/mob/clothing/head.dmi b/icons/mob/clothing/head.dmi
index c4142443c90..90e21cb400b 100644
Binary files a/icons/mob/clothing/head.dmi and b/icons/mob/clothing/head.dmi differ
diff --git a/icons/mob/clothing/neck.dmi b/icons/mob/clothing/neck.dmi
index 08941942172..779d391e811 100644
Binary files a/icons/mob/clothing/neck.dmi and b/icons/mob/clothing/neck.dmi differ
diff --git a/icons/mob/clothing/species/drask/head.dmi b/icons/mob/clothing/species/drask/head.dmi
index 6e9f1282881..976eaf1c44c 100644
Binary files a/icons/mob/clothing/species/drask/head.dmi and b/icons/mob/clothing/species/drask/head.dmi differ
diff --git a/icons/mob/clothing/species/drask/neck.dmi b/icons/mob/clothing/species/drask/neck.dmi
new file mode 100644
index 00000000000..c5e9355f000
Binary files /dev/null and b/icons/mob/clothing/species/drask/neck.dmi differ
diff --git a/icons/mob/clothing/species/drask/suit.dmi b/icons/mob/clothing/species/drask/suit.dmi
index be999295b8a..0dcdccf3e91 100644
Binary files a/icons/mob/clothing/species/drask/suit.dmi and b/icons/mob/clothing/species/drask/suit.dmi differ
diff --git a/icons/mob/clothing/species/drask/under/civilian.dmi b/icons/mob/clothing/species/drask/under/civilian.dmi
index fc002f5c23f..5161776927c 100644
Binary files a/icons/mob/clothing/species/drask/under/civilian.dmi and b/icons/mob/clothing/species/drask/under/civilian.dmi differ
diff --git a/icons/mob/clothing/species/grey/head.dmi b/icons/mob/clothing/species/grey/head.dmi
index 929ccace905..e1e7bbf2a5a 100644
Binary files a/icons/mob/clothing/species/grey/head.dmi and b/icons/mob/clothing/species/grey/head.dmi differ
diff --git a/icons/mob/clothing/species/grey/neck.dmi b/icons/mob/clothing/species/grey/neck.dmi
index d6c389f2ec4..225a1d1e0d3 100644
Binary files a/icons/mob/clothing/species/grey/neck.dmi and b/icons/mob/clothing/species/grey/neck.dmi differ
diff --git a/icons/mob/clothing/species/grey/suit.dmi b/icons/mob/clothing/species/grey/suit.dmi
index 2bffa8ee173..aaf36e27177 100644
Binary files a/icons/mob/clothing/species/grey/suit.dmi and b/icons/mob/clothing/species/grey/suit.dmi differ
diff --git a/icons/mob/clothing/species/grey/under/civilian.dmi b/icons/mob/clothing/species/grey/under/civilian.dmi
index 7d6ef1015a9..6be4ef422a0 100644
Binary files a/icons/mob/clothing/species/grey/under/civilian.dmi and b/icons/mob/clothing/species/grey/under/civilian.dmi differ
diff --git a/icons/mob/clothing/species/kidan/head.dmi b/icons/mob/clothing/species/kidan/head.dmi
index b9383586f40..ba6d6c50dd1 100644
Binary files a/icons/mob/clothing/species/kidan/head.dmi and b/icons/mob/clothing/species/kidan/head.dmi differ
diff --git a/icons/mob/clothing/species/kidan/neck.dmi b/icons/mob/clothing/species/kidan/neck.dmi
index 723f5c09470..44dc0d1fe77 100644
Binary files a/icons/mob/clothing/species/kidan/neck.dmi and b/icons/mob/clothing/species/kidan/neck.dmi differ
diff --git a/icons/mob/clothing/species/kidan/suit.dmi b/icons/mob/clothing/species/kidan/suit.dmi
index 989b95cd38e..1e8153ff0c5 100644
Binary files a/icons/mob/clothing/species/kidan/suit.dmi and b/icons/mob/clothing/species/kidan/suit.dmi differ
diff --git a/icons/mob/clothing/species/kidan/under/civilian.dmi b/icons/mob/clothing/species/kidan/under/civilian.dmi
index 2a185eacc5f..5a28becf349 100644
Binary files a/icons/mob/clothing/species/kidan/under/civilian.dmi and b/icons/mob/clothing/species/kidan/under/civilian.dmi differ
diff --git a/icons/mob/clothing/species/machine/monitor/hat.dmi b/icons/mob/clothing/species/machine/monitor/hat.dmi
index 102f6c1cbe6..e8b1babebe9 100644
Binary files a/icons/mob/clothing/species/machine/monitor/hat.dmi and b/icons/mob/clothing/species/machine/monitor/hat.dmi differ
diff --git a/icons/mob/clothing/species/machine/monitor/hood.dmi b/icons/mob/clothing/species/machine/monitor/hood.dmi
index af2284cda21..c6a6546fb78 100644
Binary files a/icons/mob/clothing/species/machine/monitor/hood.dmi and b/icons/mob/clothing/species/machine/monitor/hood.dmi differ
diff --git a/icons/mob/clothing/species/nian/head.dmi b/icons/mob/clothing/species/nian/head.dmi
new file mode 100644
index 00000000000..8ebe9f59bd4
Binary files /dev/null and b/icons/mob/clothing/species/nian/head.dmi differ
diff --git a/icons/mob/clothing/species/plasmaman/helmet.dmi b/icons/mob/clothing/species/plasmaman/helmet.dmi
index ca375086a79..e5f07349aab 100644
Binary files a/icons/mob/clothing/species/plasmaman/helmet.dmi and b/icons/mob/clothing/species/plasmaman/helmet.dmi differ
diff --git a/icons/mob/clothing/species/plasmaman/uniform.dmi b/icons/mob/clothing/species/plasmaman/uniform.dmi
index b7ef6bf1627..6d0d63e5b73 100644
Binary files a/icons/mob/clothing/species/plasmaman/uniform.dmi and b/icons/mob/clothing/species/plasmaman/uniform.dmi differ
diff --git a/icons/mob/clothing/species/skrell/head.dmi b/icons/mob/clothing/species/skrell/head.dmi
index 79b7c2237f4..0a8d8b4a5d0 100644
Binary files a/icons/mob/clothing/species/skrell/head.dmi and b/icons/mob/clothing/species/skrell/head.dmi differ
diff --git a/icons/mob/clothing/species/tajaran/head.dmi b/icons/mob/clothing/species/tajaran/head.dmi
index 4df9354ed7f..b871419d1f2 100644
Binary files a/icons/mob/clothing/species/tajaran/head.dmi and b/icons/mob/clothing/species/tajaran/head.dmi differ
diff --git a/icons/mob/clothing/species/vox/head.dmi b/icons/mob/clothing/species/vox/head.dmi
index fe9660ef720..f584687fc44 100644
Binary files a/icons/mob/clothing/species/vox/head.dmi and b/icons/mob/clothing/species/vox/head.dmi differ
diff --git a/icons/mob/clothing/species/vox/neck.dmi b/icons/mob/clothing/species/vox/neck.dmi
index caa503331c7..0f69b98d914 100644
Binary files a/icons/mob/clothing/species/vox/neck.dmi and b/icons/mob/clothing/species/vox/neck.dmi differ
diff --git a/icons/mob/clothing/species/vox/suit.dmi b/icons/mob/clothing/species/vox/suit.dmi
index adc7103cc2b..9f7f6a01053 100644
Binary files a/icons/mob/clothing/species/vox/suit.dmi and b/icons/mob/clothing/species/vox/suit.dmi differ
diff --git a/icons/mob/clothing/species/vox/under/civilian.dmi b/icons/mob/clothing/species/vox/under/civilian.dmi
index 82a1aa69bbf..52dd7b2b6c1 100644
Binary files a/icons/mob/clothing/species/vox/under/civilian.dmi and b/icons/mob/clothing/species/vox/under/civilian.dmi differ
diff --git a/icons/mob/clothing/species/vulpkanin/head.dmi b/icons/mob/clothing/species/vulpkanin/head.dmi
index 2d9f674171b..7df78b4d2b0 100644
Binary files a/icons/mob/clothing/species/vulpkanin/head.dmi and b/icons/mob/clothing/species/vulpkanin/head.dmi differ
diff --git a/icons/mob/clothing/suit.dmi b/icons/mob/clothing/suit.dmi
index 0ff9227ac24..119816299f9 100644
Binary files a/icons/mob/clothing/suit.dmi and b/icons/mob/clothing/suit.dmi differ
diff --git a/icons/mob/clothing/under/civilian.dmi b/icons/mob/clothing/under/civilian.dmi
index 53ddbb2cb4f..02d480e5f7a 100644
Binary files a/icons/mob/clothing/under/civilian.dmi and b/icons/mob/clothing/under/civilian.dmi differ
diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi
index 9024214e667..119efe8492a 100644
Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ
diff --git a/icons/obj/clothing/neck.dmi b/icons/obj/clothing/neck.dmi
index 0c83fe1a6fb..7a612c89816 100644
Binary files a/icons/obj/clothing/neck.dmi and b/icons/obj/clothing/neck.dmi differ
diff --git a/icons/obj/clothing/species/plasmaman/hats.dmi b/icons/obj/clothing/species/plasmaman/hats.dmi
index 3069551ab41..0360a9a5ff5 100644
Binary files a/icons/obj/clothing/species/plasmaman/hats.dmi and b/icons/obj/clothing/species/plasmaman/hats.dmi differ
diff --git a/icons/obj/clothing/species/plasmaman/uniform.dmi b/icons/obj/clothing/species/plasmaman/uniform.dmi
index 8e5d91f8f83..fcb34ee49b4 100644
Binary files a/icons/obj/clothing/species/plasmaman/uniform.dmi and b/icons/obj/clothing/species/plasmaman/uniform.dmi differ
diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi
index a1a8e29982b..cd20a8c1c04 100644
Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ
diff --git a/icons/obj/clothing/under/civilian.dmi b/icons/obj/clothing/under/civilian.dmi
index dc90a9528b7..080d36bec64 100644
Binary files a/icons/obj/clothing/under/civilian.dmi and b/icons/obj/clothing/under/civilian.dmi differ
diff --git a/icons/obj/vending.dmi b/icons/obj/vending.dmi
index f4cd6d35322..80d15e6fafc 100755
Binary files a/icons/obj/vending.dmi and b/icons/obj/vending.dmi differ