mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-24 04:27:35 +01:00
Add a LOT of chaplain clothes from various religions. (#30483)
* Add a LOT of chaplain clothes from various religions. * Thanks, linter! * Deploy vendors, box envirosuits, unaccent names * Thanks, linters! * Accommodate ears. * Correct accent oversight. * Merge branch 'master' into chaplain-outfits Conflicts in icons/mob/clothing/species/plasmaman/helmet.dmi icons/obj/clothing/species/plasmaman/hats.dmi resolved by automatic merge and modifying chaplain helmet sprites to match new format.
This commit is contained in:
@@ -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"
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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, "<span class='warning'>These robes are already linked with a staff and cannot support another. Connection refused.</span>")
|
||||
return FALSE
|
||||
|
||||
@@ -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."
|
||||
|
||||
@@ -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"
|
||||
|
||||
Reference in New Issue
Block a user