diff --git a/code/datums/abnormality/_ego_datum/he.dm b/code/datums/abnormality/_ego_datum/he.dm index a0a36ea50c54..f758cf0b96f5 100644 --- a/code/datums/abnormality/_ego_datum/he.dm +++ b/code/datums/abnormality/_ego_datum/he.dm @@ -398,10 +398,6 @@ cost = 35 //Faelantern - Midwinter Nightmare -/datum/ego_datum/armor/faelantern - item_path = /obj/item/clothing/suit/armor/ego_gear/he/faelantern - cost = 35 - /datum/ego_datum/weapon/faelantern item_path = /obj/item/ego_weapon/faelantern cost = 35 diff --git a/code/datums/abnormality/_ego_datum/teth.dm b/code/datums/abnormality/_ego_datum/teth.dm index 50638963a074..9c2ea7848c0c 100644 --- a/code/datums/abnormality/_ego_datum/teth.dm +++ b/code/datums/abnormality/_ego_datum/teth.dm @@ -326,3 +326,7 @@ item_path = /obj/item/ego_weapon/sanitizer cost = 20 +//Faelantern - Midwinter Nightmare +/datum/ego_datum/armor/faelantern + item_path = /obj/item/clothing/suit/armor/ego_gear/teth/faelantern + cost = 20 diff --git a/code/game/objects/items/ego_weapons/he.dm b/code/game/objects/items/ego_weapons/he.dm index 2b960bc4dca5..dba3f2d73616 100644 --- a/code/game/objects/items/ego_weapons/he.dm +++ b/code/game/objects/items/ego_weapons/he.dm @@ -1498,7 +1498,7 @@ attack_verb_simple = list("poke", "slash") hitsound = 'sound/weapons/fixer/generic/sword1.ogg' attribute_requirements = list( - FORTITUDE_ATTRIBUTE = 40 + PRUDENCE_ATTRIBUTE = 40 ) var/firing_cooldown = 0 var/hit_cooldown_time = 10 SECONDS diff --git a/code/game/objects/items/ego_weapons/teth.dm b/code/game/objects/items/ego_weapons/teth.dm index 39d5cde65be9..36c45e02383a 100644 --- a/code/game/objects/items/ego_weapons/teth.dm +++ b/code/game/objects/items/ego_weapons/teth.dm @@ -500,8 +500,6 @@ damage = 20 damage_type = BLACK_DAMAGE - - /obj/item/ego_weapon/sanitizer name = "sanitizer" desc = "It's very shocking." diff --git a/code/modules/clothing/suits/ego_gear/he.dm b/code/modules/clothing/suits/ego_gear/he.dm index b67cd794646d..3f00877df75c 100644 --- a/code/modules/clothing/suits/ego_gear/he.dm +++ b/code/modules/clothing/suits/ego_gear/he.dm @@ -410,16 +410,6 @@ Any attempt to code risk class armor will result in a 10 day Github ban.*/ TEMPERANCE_ATTRIBUTE = 40 ) -/obj/item/clothing/suit/armor/ego_gear/he/faelantern - name = "midwinter nightmare" - desc = "Some things are too good to be true." - icon_state = "faelantern" - armor = list(RED_DAMAGE = 60, WHITE_DAMAGE = 20, BLACK_DAMAGE = -20, PALE_DAMAGE = -20) // 40 - attribute_requirements = list( - FORTITUDE_ATTRIBUTE = 40 - ) - - /obj/item/clothing/suit/armor/ego_gear/he/coiling name = "coiling" desc = "It's beautiful snake leather." diff --git a/code/modules/clothing/suits/ego_gear/teth.dm b/code/modules/clothing/suits/ego_gear/teth.dm index 80731e376086..f018bbf27cfd 100644 --- a/code/modules/clothing/suits/ego_gear/teth.dm +++ b/code/modules/clothing/suits/ego_gear/teth.dm @@ -226,7 +226,7 @@ Any attempt to code risk class armor will result in a 10 day Github ban.*/ She threatens to kill the princess if she doesn't swear never to say a word about this reversal of roles to any living being. Sadly, the princess takes the oath." icon_state = "zauberhorn" armor = list(RED_DAMAGE = -30, WHITE_DAMAGE = 20, BLACK_DAMAGE = 30, PALE_DAMAGE = 0) // 20 - + /obj/item/clothing/suit/armor/ego_gear/teth/visions name = "visions of future past" desc = "It's looking right at you." @@ -238,3 +238,9 @@ Any attempt to code risk class armor will result in a 10 day Github ban.*/ desc = "It's very clean, freshly washed." icon_state = "sanitizer" //Just like a bobot armor = list(RED_DAMAGE = 40, WHITE_DAMAGE = 0, BLACK_DAMAGE = -40, PALE_DAMAGE = 0) // 0 + +/obj/item/clothing/suit/armor/ego_gear/teth/faelantern + name = "midwinter nightmare" + desc = "Some things are too good to be true." + icon_state = "faelantern" + armor = list(RED_DAMAGE = 20, WHITE_DAMAGE = 30, BLACK_DAMAGE = -30, PALE_DAMAGE = 0) // 20 diff --git a/icons/mob/clothing/ego_gear/abnormality/he.dmi b/icons/mob/clothing/ego_gear/abnormality/he.dmi index 9f6c108b9dc8..9f778ef68f5c 100644 Binary files a/icons/mob/clothing/ego_gear/abnormality/he.dmi and b/icons/mob/clothing/ego_gear/abnormality/he.dmi differ diff --git a/icons/mob/clothing/ego_gear/abnormality/teth.dmi b/icons/mob/clothing/ego_gear/abnormality/teth.dmi index a70836d7ca24..b3afad04a3df 100644 Binary files a/icons/mob/clothing/ego_gear/abnormality/teth.dmi and b/icons/mob/clothing/ego_gear/abnormality/teth.dmi differ diff --git a/icons/obj/clothing/ego_gear/abnormality/he.dmi b/icons/obj/clothing/ego_gear/abnormality/he.dmi index 30a1ca72ca24..780827618eec 100644 Binary files a/icons/obj/clothing/ego_gear/abnormality/he.dmi and b/icons/obj/clothing/ego_gear/abnormality/he.dmi differ diff --git a/icons/obj/clothing/ego_gear/abnormality/teth.dmi b/icons/obj/clothing/ego_gear/abnormality/teth.dmi index f668db95b477..cff163369ab4 100644 Binary files a/icons/obj/clothing/ego_gear/abnormality/teth.dmi and b/icons/obj/clothing/ego_gear/abnormality/teth.dmi differ