diff --git a/code/game/gamemodes/cult/cult_items.dm b/code/game/gamemodes/cult/cult_items.dm index f1f3bc1c72c..a68e4c1e9ca 100644 --- a/code/game/gamemodes/cult/cult_items.dm +++ b/code/game/gamemodes/cult/cult_items.dm @@ -177,26 +177,37 @@ /obj/item/clothing/suit/hooded/cultrobes/cult_shield/special_overlays() return mutable_appearance('icons/effects/cult_effects.dmi', shield_state, MOB_LAYER + 0.01) -/obj/item/clothing/suit/hooded/cultrobes/berserker +/obj/item/clothing/suit/hooded/cultrobes/flagellant_robe name = "flagellant's robes" desc = "Blood-soaked robes infused with dark magic; allows the user to move at inhuman speeds, but at the cost of increased damage." - icon_state = "hardsuit-berserker" - item_state = "hardsuit-berserker" + icon_state = "flagellantrobe" + item_state = "flagellantrobe" flags_inv = HIDEJUMPSUIT allowed = list(/obj/item/tome,/obj/item/melee/cultblade) body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS armor = list("melee" = -45, "bullet" = -45, "laser" = -45,"energy" = -45, "bomb" = -45, "bio" = -45, "rad" = -45, "fire" = 0, "acid" = 0) slowdown = -1 - hoodtype = /obj/item/clothing/head/hooded/berserkerhood + sprite_sheets = list( + "Vox" = 'icons/mob/species/vox/suit.dmi', + "Drask" = 'icons/mob/species/drask/suit.dmi', + "Grey" = 'icons/mob/species/grey/suit.dmi' + ) + hoodtype = /obj/item/clothing/head/hooded/flagellant_hood -/obj/item/clothing/head/hooded/berserkerhood +/obj/item/clothing/head/hooded/flagellant_hood name = "flagellant's robes" desc = "Blood-soaked garb infused with dark magic; allows the user to move at inhuman speeds, but at the cost of increased damage." - icon_state = "culthood" + icon_state = "flagellanthood" + item_state = "flagellanthood" flags_inv = HIDEFACE flags_cover = HEADCOVERSEYES armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0) + sprite_sheets = list( + "Vox" = 'icons/mob/species/vox/head.dmi', + "Drask" = 'icons/mob/species/drask/head.dmi', + "Grey" = 'icons/mob/species/grey/head.dmi' + ) /obj/item/whetstone/cult name = "eldritch whetstone" diff --git a/code/game/gamemodes/cult/cult_structures.dm b/code/game/gamemodes/cult/cult_structures.dm index 0e96dd92062..c06913c1abe 100644 --- a/code/game/gamemodes/cult/cult_structures.dm +++ b/code/game/gamemodes/cult/cult_structures.dm @@ -120,7 +120,7 @@ selection_prompt = "You study the schematics etched on the forge..." selection_title = "Forge" creation_message = "You work the forge as dark knowledge guides your hands, creating %ITEM%!" - choosable_items = list("Shielded Robe" = /obj/item/clothing/suit/hooded/cultrobes/cult_shield, "Flagellant's Robe" = /obj/item/clothing/suit/hooded/cultrobes/berserker, \ + choosable_items = list("Shielded Robe" = /obj/item/clothing/suit/hooded/cultrobes/cult_shield, "Flagellant's Robe" = /obj/item/clothing/suit/hooded/cultrobes/flagellant_robe, \ "Cultist Hardsuit" = /obj/item/storage/box/cult) /obj/structure/cult/functional/forge/New() diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index 5200ad72e5a..4244195d43d 100644 Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ diff --git a/icons/mob/species/drask/head.dmi b/icons/mob/species/drask/head.dmi index b9f0604c960..8210b6f466b 100644 Binary files a/icons/mob/species/drask/head.dmi and b/icons/mob/species/drask/head.dmi differ diff --git a/icons/mob/species/drask/suit.dmi b/icons/mob/species/drask/suit.dmi index d75a28f2bee..8a5c581aa58 100644 Binary files a/icons/mob/species/drask/suit.dmi and b/icons/mob/species/drask/suit.dmi differ diff --git a/icons/mob/species/vox/head.dmi b/icons/mob/species/vox/head.dmi index 6c4b2b43f6a..fb5d153d30d 100644 Binary files a/icons/mob/species/vox/head.dmi and b/icons/mob/species/vox/head.dmi differ diff --git a/icons/mob/species/vox/suit.dmi b/icons/mob/species/vox/suit.dmi index 827b67b4332..bc260838440 100644 Binary files a/icons/mob/species/vox/suit.dmi and b/icons/mob/species/vox/suit.dmi differ diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi index 26c2a7ea734..308e8b6e679 100644 Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ diff --git a/icons/mob/temp imports/flag_hood.dmi b/icons/mob/temp imports/flag_hood.dmi new file mode 100644 index 00000000000..54a4eb2892c Binary files /dev/null and b/icons/mob/temp imports/flag_hood.dmi differ diff --git a/icons/mob/temp imports/flag_inhand.dmi b/icons/mob/temp imports/flag_inhand.dmi new file mode 100644 index 00000000000..c1504acadc1 Binary files /dev/null and b/icons/mob/temp imports/flag_inhand.dmi differ diff --git a/icons/mob/temp imports/flagellent.dmi b/icons/mob/temp imports/flagellent.dmi new file mode 100644 index 00000000000..3965f195237 Binary files /dev/null and b/icons/mob/temp imports/flagellent.dmi differ diff --git a/icons/mob/temp imports/flagellent_drask.dmi b/icons/mob/temp imports/flagellent_drask.dmi new file mode 100644 index 00000000000..5eeaf79a9f3 Binary files /dev/null and b/icons/mob/temp imports/flagellent_drask.dmi differ diff --git a/icons/mob/temp imports/flagellent_drask_hood.dmi b/icons/mob/temp imports/flagellent_drask_hood.dmi new file mode 100644 index 00000000000..87f91ae682b Binary files /dev/null and b/icons/mob/temp imports/flagellent_drask_hood.dmi differ diff --git a/icons/mob/temp imports/flagellent_hood.dmi b/icons/mob/temp imports/flagellent_hood.dmi new file mode 100644 index 00000000000..b926d8f62a7 Binary files /dev/null and b/icons/mob/temp imports/flagellent_hood.dmi differ diff --git a/icons/mob/temp imports/flagellent_vox.dmi b/icons/mob/temp imports/flagellent_vox.dmi new file mode 100644 index 00000000000..01ed557b76f Binary files /dev/null and b/icons/mob/temp imports/flagellent_vox.dmi differ diff --git a/icons/mob/temp imports/flagellent_vox_hood.dmi b/icons/mob/temp imports/flagellent_vox_hood.dmi new file mode 100644 index 00000000000..9825b9cae38 Binary files /dev/null and b/icons/mob/temp imports/flagellent_vox_hood.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index c9ebceba369..30f34f01b4f 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 acb6af50d18..62fc0a6120c 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ