diff --git a/code/game/objects/items/holy_weapons.dm b/code/game/objects/items/holy_weapons.dm index cc121ab0a3..0b61bba471 100644 --- a/code/game/objects/items/holy_weapons.dm +++ b/code/game/objects/items/holy_weapons.dm @@ -11,12 +11,45 @@ strip_delay = 80 dog_fashion = null +// CITADEL CHANGES: More variants +/obj/item/clothing/head/helmet/chaplain/bland + icon_state = "knight_generic" + item_state = "knight_generic" + +/obj/item/clothing/head/helmet/chaplain/bland/horned + name = "horned crusader helmet" + desc = "Helfen, Wehren, Heilen." + icon_state = "knight_horned" + item_state = "knight_horned" + +/obj/item/clothing/head/helmet/chaplain/bland/winged + name = "winged crusader helmet" + desc = "Helfen, Wehren, Heilen." + icon_state = "knight_winged" + item_state = "knight_winged" +// CITADEL CHANGES ENDS HERE + /obj/item/clothing/suit/armor/riot/chaplain name = "crusader armour" desc = "God wills it!" icon_state = "knight_templar" item_state = "knight_templar" +// CITADEL CHANGES: More variants +/obj/item/clothing/suit/armor/riot/chaplain/teutonic + desc = "Help, Defend, Heal!" + icon_state = "knight_teutonic" + item_state = "knight_teutonic" + +/obj/item/clothing/suit/armor/riot/chaplain/teutonic/alt + icon_state = "knight_teutonic_alt" + item_state = "knight_teutonic_alt" + +/obj/item/clothing/suit/armor/riot/chaplain/hospitaller + icon_state = "knight_hospitaller" + item_state = "knight_hospitaller" +// CITADEL CHANGES ENDS HERE + /obj/item/holybeacon name = "armaments beacon" desc = "Contains a set of armaments for the chaplain." @@ -60,6 +93,22 @@ new /obj/item/clothing/head/helmet/chaplain(src) new /obj/item/clothing/suit/armor/riot/chaplain(src) +// CITADEL CHANGES: More Variants +/obj/item/storage/box/holy/teutonic + name = "Teutonic Kit" + +/obj/item/storage/box/holy/teutonic/PopulateContents() // It just works + pick(new /obj/item/clothing/head/helmet/chaplain/bland/horned(src), new /obj/item/clothing/head/helmet/chaplain/bland/winged(src)) + pick(new /obj/item/clothing/suit/armor/riot/chaplain/teutonic(src), new /obj/item/clothing/suit/armor/riot/chaplain/teutonic/alt(src)) + +/obj/item/storage/box/holy/hospitaller + name = "Hospitaller Kit" + +/obj/item/storage/box/holy/hospitaller/PopulateContents() + new /obj/item/clothing/head/helmet/chaplain/bland(src) + new /obj/item/clothing/suit/armor/riot/chaplain/hospitaller(src) +// CITADEL CHANGES ENDS HERE + /obj/item/storage/box/holy/student name = "Profane Scholar Kit" @@ -210,7 +259,7 @@ if(QDELETED(src) || !choice || M.stat || !in_range(M, src) || M.restrained() || !M.canmove || reskinned) return - var/A = display_names[choice] // This needs to be on a separate var as list member access is not allowed for new + var/A = display_names[choice] // This needs to be on a separate var as list member access is not allowed for new holy_weapon = new A SSreligion.holy_weapon_type = holy_weapon.type diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index 1d99a415df..03d6190507 100644 Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi index f74ca2092d..904084adb5 100644 Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index 73f3065b4f..34d8374a42 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index c3eb8b995c..51a5a4e358 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ diff --git a/modular_citadel/icons/mob/suit_digi.dmi b/modular_citadel/icons/mob/suit_digi.dmi index 89284dbe52..95d03bb6d0 100644 Binary files a/modular_citadel/icons/mob/suit_digi.dmi and b/modular_citadel/icons/mob/suit_digi.dmi differ