diff --git a/_maps/virtual_domains/heretic_hunt.dmm b/_maps/virtual_domains/heretic_hunt.dmm index 80ef63e4466..33101a823a7 100644 --- a/_maps/virtual_domains/heretic_hunt.dmm +++ b/_maps/virtual_domains/heretic_hunt.dmm @@ -1179,7 +1179,7 @@ "QP" = ( /obj/item/flashlight/flare/torch, /obj/item/flashlight/flare/torch, -/obj/item/clothing/suit/hooded/cultrobes/eldritch, +/obj/item/clothing/suit/hooded/cultrobes/eldritch/rust, /obj/item/melee/sickly_blade, /obj/structure/rack, /turf/template_noop, diff --git a/code/game/objects/items/storage/boxes/clothes_boxes.dm b/code/game/objects/items/storage/boxes/clothes_boxes.dm index 2ac97ff0313..f692354a689 100644 --- a/code/game/objects/items/storage/boxes/clothes_boxes.dm +++ b/code/game/objects/items/storage/boxes/clothes_boxes.dm @@ -232,6 +232,14 @@ new /obj/item/clothing/gloves/divine_archer(src) new /obj/item/clothing/shoes/divine_archer(src) +/obj/item/storage/box/holy/heretic + name = "Occult Practitioner Kit" + typepath_for_preview = /obj/item/clothing/suit/chaplainsuit/armor/heretic + +/obj/item/storage/box/holy/heretic/PopulateContents() + new /obj/item/clothing/suit/chaplainsuit/armor/heretic(src) + new /obj/item/clothing/head/helmet/chaplain/heretic(src) + /obj/item/storage/box/floor_camo name = "floor tile camo box" desc = "Thank you for shopping from Camo-J's, our uniquely designed \ diff --git a/code/modules/antagonists/heretic/heretic_antag.dm b/code/modules/antagonists/heretic/heretic_antag.dm index 516590757fc..c6858a7ec15 100644 --- a/code/modules/antagonists/heretic/heretic_antag.dm +++ b/code/modules/antagonists/heretic/heretic_antag.dm @@ -1171,6 +1171,6 @@ /datum/outfit/heretic name = "Heretic (Preview only)" - suit = /obj/item/clothing/suit/hooded/cultrobes/eldritch - head = /obj/item/clothing/head/hooded/cult_hoodie/eldritch + suit = /obj/item/clothing/suit/hooded/cultrobes/eldritch/rust + head = /obj/item/clothing/head/hooded/cult_hoodie/eldritch/rust r_hand = /obj/item/melee/touch_attack/mansus_fist diff --git a/code/modules/antagonists/heretic/items/heretic_armor.dm b/code/modules/antagonists/heretic/items/heretic_armor.dm index cc2bf66e4fa..3f598501560 100644 --- a/code/modules/antagonists/heretic/items/heretic_armor.dm +++ b/code/modules/antagonists/heretic/items/heretic_armor.dm @@ -6,7 +6,7 @@ /obj/item/clothing/suit/hooded/cultrobes/eldritch name = "ominous armor" desc = "A ragged, dusty set of robes. Strange eyes line the inside." - icon_state = "eldritch_armor" + icon_state = "armor" inhand_icon_state = null flags_inv = HIDESHOES | HIDEJUMPSUIT | HIDEBELT body_parts_covered = CHEST | GROIN | LEGS | FEET | ARMS @@ -71,7 +71,7 @@ name = "ominous hood" icon = 'icons/obj/clothing/head/helmet.dmi' worn_icon = 'icons/mob/clothing/head/helmet.dmi' - icon_state = "eldritch" + icon_state = "helmet" desc = "A torn, dust-caked hood. Strange eyes line the inside." flags_inv = HIDEMASK | HIDEEARS | HIDEEYES | HIDEFACE | HIDEHAIR | HIDEFACIALHAIR | HIDESNOUT flags_cover = HEADCOVERSEYES | PEPPERPROOF diff --git a/code/modules/clothing/outfits/standard.dm b/code/modules/clothing/outfits/standard.dm index c5497f783a5..9dcb90b0e3d 100644 --- a/code/modules/clothing/outfits/standard.dm +++ b/code/modules/clothing/outfits/standard.dm @@ -117,10 +117,10 @@ name = "Heretic Hallucination" uniform = /obj/item/clothing/under/color/grey - suit = /obj/item/clothing/suit/hooded/cultrobes/eldritch + suit = /obj/item/clothing/suit/hooded/cultrobes/eldritch/rust neck = /obj/item/clothing/neck/heretic_focus r_hand = /obj/item/melee/touch_attack/mansus_fist - head = /obj/item/clothing/head/hooded/cult_hoodie/eldritch + head = /obj/item/clothing/head/hooded/cult_hoodie/eldritch/rust shoes = /obj/item/clothing/shoes/sneakers/black /datum/outfit/rev_cutout diff --git a/code/modules/deathmatch/deathmatch_loadouts.dm b/code/modules/deathmatch/deathmatch_loadouts.dm index 021128b218e..aadd57d792a 100644 --- a/code/modules/deathmatch/deathmatch_loadouts.dm +++ b/code/modules/deathmatch/deathmatch_loadouts.dm @@ -368,10 +368,11 @@ l_hand = /obj/item/gun/ballistic/shotgun/hook r_hand = /obj/item/gun/ballistic/shotgun/hook uniform = /obj/item/clothing/under/costume/skeleton - suit = /obj/item/clothing/suit/hooded/cultrobes/eldritch + suit = /obj/item/clothing/suit/chaplainsuit/armor/heretic mask = /obj/item/clothing/mask/gas/cyborg shoes = /obj/item/clothing/shoes/sandal belt = /obj/item/melee/cleric_mace + head = /obj/item/clothing/head/helmet/chaplain/heretic /datum/outfit/deathmatch_loadout/battler/cowboy name = "Deathmatch: Cowboy" @@ -1016,9 +1017,9 @@ display_name = "Heretic Warrior" desc = "Prove the furious strength of the Mansus!" - head = /obj/item/clothing/head/hooded/cult_hoodie/eldritch + head = /obj/item/clothing/head/hooded/cult_hoodie/eldritch/blade neck = /obj/item/clothing/neck/heretic_focus - suit = /obj/item/clothing/suit/hooded/cultrobes/eldritch + suit = /obj/item/clothing/suit/hooded/cultrobes/eldritch/blade suit_store = /obj/item/melee/sickly_blade/dark uniform = /obj/item/clothing/under/color/darkgreen id_trim = null diff --git a/code/modules/jobs/job_types/chaplain/chaplain_costumes.dm b/code/modules/jobs/job_types/chaplain/chaplain_costumes.dm index fcc754f229b..1b46ade2437 100644 --- a/code/modules/jobs/job_types/chaplain/chaplain_costumes.dm +++ b/code/modules/jobs/job_types/chaplain/chaplain_costumes.dm @@ -247,6 +247,21 @@ /obj/item/clothing/suit/chaplainsuit/armor/crusader/blue icon_state = "crusader-blue" +/obj/item/clothing/head/helmet/chaplain/heretic + name = "occultist's hood" + desc = "Conceals your features from the things that look back at you." + icon_state = "heretichood" + inhand_icon_state = null + flags_cover = HEADCOVERSEYES + flags_inv = HIDEHAIR|HIDEFACE|HIDEEARS + +/obj/item/clothing/suit/chaplainsuit/armor/heretic + name = "occultist's robes" + desc = "Shields your body from the things others fail to notice." + icon_state = "hereticrobe" + inhand_icon_state = null + body_parts_covered = CHEST|GROIN|LEGS + /obj/item/clothing/suit/hooded/chaplain_hoodie name = "follower hoodie" desc = "Hoodie made for acolytes of the chaplain." diff --git a/code/modules/jobs/job_types/chaplain/chaplain_nullrod.dm b/code/modules/jobs/job_types/chaplain/chaplain_nullrod.dm index 549060e62ca..2e5dc99bb01 100644 --- a/code/modules/jobs/job_types/chaplain/chaplain_nullrod.dm +++ b/code/modules/jobs/job_types/chaplain/chaplain_nullrod.dm @@ -248,6 +248,19 @@ GLOBAL_LIST_INIT(nullrod_variants, init_nullrod_variants()) effectiveness = 110, \ ) +/obj/item/nullrod/claymore/heretic + name = "occultist's khopesh" + desc = "Steels your hand to slay foes beyond comprehension." + icon = 'icons/obj/weapons/khopesh.dmi' + icon_state = "eldritch_blade" + lefthand_file = 'icons/mob/inhands/64x64_lefthand.dmi' + righthand_file = 'icons/mob/inhands/64x64_righthand.dmi' + inhand_x_dimension = 64 + inhand_y_dimension = 64 + inhand_icon_state = "eldritch_blade" + worn_icon_state = "eldritch_blade" + menu_description = "A sharp curved blade which provides a low chance of blocking incoming melee attacks. Can be worn on the back or belt." + /// Other Variants /// Not a special category on their own, but usually possess more unique mechanics diff --git a/code/modules/mob_spawn/corpses/mining_corpses.dm b/code/modules/mob_spawn/corpses/mining_corpses.dm index 876283599fa..bece8ddb28b 100644 --- a/code/modules/mob_spawn/corpses/mining_corpses.dm +++ b/code/modules/mob_spawn/corpses/mining_corpses.dm @@ -388,8 +388,8 @@ /datum/outfit/consumed_heremoth name = "Legion-Consumed Tribal Mothman" uniform = /obj/item/clothing/under/costume/loincloth - suit = /obj/item/clothing/suit/hooded/cultrobes/eldritch - head = /obj/item/clothing/head/hooded/cult_hoodie/eldritch + suit = /obj/item/clothing/suit/chaplainsuit/armor/heretic + head = /obj/item/clothing/head/helmet/chaplain/heretic /datum/outfit/consumed_heremoth/pre_equip(mob/living/carbon/human/moth, visuals_only = FALSE) if(!visuals_only) diff --git a/code/modules/unit_tests/screenshots/screenshot_antag_icons_heretic.png b/code/modules/unit_tests/screenshots/screenshot_antag_icons_heretic.png index 73bc5e02dd3..1ebecaccc97 100644 Binary files a/code/modules/unit_tests/screenshots/screenshot_antag_icons_heretic.png and b/code/modules/unit_tests/screenshots/screenshot_antag_icons_heretic.png differ diff --git a/icons/mob/clothing/back.dmi b/icons/mob/clothing/back.dmi index af5a6d9bf8c..ff8e847abf7 100644 Binary files a/icons/mob/clothing/back.dmi and b/icons/mob/clothing/back.dmi differ diff --git a/icons/mob/clothing/head/chaplain.dmi b/icons/mob/clothing/head/chaplain.dmi index 100b7ee922f..2929fdfe89a 100644 Binary files a/icons/mob/clothing/head/chaplain.dmi and b/icons/mob/clothing/head/chaplain.dmi differ diff --git a/icons/mob/clothing/head/helmet.dmi b/icons/mob/clothing/head/helmet.dmi index b2cb68fd2fa..0b5cb437209 100644 Binary files a/icons/mob/clothing/head/helmet.dmi and b/icons/mob/clothing/head/helmet.dmi differ diff --git a/icons/mob/clothing/suits/armor.dmi b/icons/mob/clothing/suits/armor.dmi index be6ab18d646..4a84c7e1281 100644 Binary files a/icons/mob/clothing/suits/armor.dmi and b/icons/mob/clothing/suits/armor.dmi differ diff --git a/icons/mob/clothing/suits/chaplain.dmi b/icons/mob/clothing/suits/chaplain.dmi index 8806bf5f679..76c022071a6 100644 Binary files a/icons/mob/clothing/suits/chaplain.dmi and b/icons/mob/clothing/suits/chaplain.dmi differ diff --git a/icons/obj/clothing/head/chaplain.dmi b/icons/obj/clothing/head/chaplain.dmi index ed6f6248b31..d653fced198 100644 Binary files a/icons/obj/clothing/head/chaplain.dmi and b/icons/obj/clothing/head/chaplain.dmi differ diff --git a/icons/obj/clothing/head/helmet.dmi b/icons/obj/clothing/head/helmet.dmi index 95b0f6deade..804eb6cb52b 100644 Binary files a/icons/obj/clothing/head/helmet.dmi and b/icons/obj/clothing/head/helmet.dmi differ diff --git a/icons/obj/clothing/suits/armor.dmi b/icons/obj/clothing/suits/armor.dmi index 806edaafdb6..2a8594c7b20 100644 Binary files a/icons/obj/clothing/suits/armor.dmi and b/icons/obj/clothing/suits/armor.dmi differ diff --git a/icons/obj/clothing/suits/chaplain.dmi b/icons/obj/clothing/suits/chaplain.dmi index 730e47cd6fa..a33a458ddce 100644 Binary files a/icons/obj/clothing/suits/chaplain.dmi and b/icons/obj/clothing/suits/chaplain.dmi differ