diff --git a/ModularTegustation/ego_weapons/melee/teth.dm b/ModularTegustation/ego_weapons/melee/teth.dm index b9716a0a1d02..da6f6f4750f4 100644 --- a/ModularTegustation/ego_weapons/melee/teth.dm +++ b/ModularTegustation/ego_weapons/melee/teth.dm @@ -576,6 +576,17 @@ charge_speed_cap = 2 couch_cooldown_time = 3 SECONDS +/obj/item/ego_weapon/kikimora + name = "kiki mora" + desc = "Many would speak her name." + icon_state = "kikimora" + force = 35 + attack_speed = 1.6 + damtype = RED_DAMAGE + attack_verb_continuous = list("beats", "smacks") + attack_verb_simple = list("beat", "smack") + hitsound = 'sound/weapons/fixer/generic/gen1.ogg' + /obj/item/ego_weapon/denial name = "denial" desc = "Unregulated ingestion of Enkephalin may cause a wide range of unverified psychopathological symptoms." diff --git a/code/datums/abnormality/_ego_datum/teth.dm b/code/datums/abnormality/_ego_datum/teth.dm index 0989aab7cf0d..8c9f7a4c9f3d 100644 --- a/code/datums/abnormality/_ego_datum/teth.dm +++ b/code/datums/abnormality/_ego_datum/teth.dm @@ -326,6 +326,15 @@ item_path = /obj/item/ego_weapon/sanitizer cost = 20 +//Kikimora Kiki_Mora +/datum/ego_datum/weapon/kikimora + item_path = /obj/item/ego_weapon/kikimora + cost = 20 + +/datum/ego_datum/armor/kikimora + item_path = /obj/item/clothing/suit/armor/ego_gear/teth/kikimora + cost = 20 + // Faelantern - Midwinter Nightmare /datum/ego_datum/armor/faelantern item_path = /obj/item/clothing/suit/armor/ego_gear/teth/faelantern diff --git a/code/modules/clothing/suits/ego_gear/teth.dm b/code/modules/clothing/suits/ego_gear/teth.dm index 6c8df2217925..b643fdeb469c 100644 --- a/code/modules/clothing/suits/ego_gear/teth.dm +++ b/code/modules/clothing/suits/ego_gear/teth.dm @@ -245,6 +245,12 @@ Any attempt to code risk class armor will result in a 10 day Github ban.*/ icon_state = "faelantern" armor = list(RED_DAMAGE = 20, WHITE_DAMAGE = 30, BLACK_DAMAGE = -30, PALE_DAMAGE = 0) // 20 +/obj/item/clothing/suit/armor/ego_gear/teth/kikimora + name = "kiki mora" + desc = "A dress spun by unusual hands. Rough but resistant to stains." + icon_state = "kikimora" + armor = list(RED_DAMAGE = 10, WHITE_DAMAGE = -10, BLACK_DAMAGE = 30, PALE_DAMAGE = -10) + /obj/item/clothing/suit/armor/ego_gear/teth/luckdraw name = "luck of the draw" desc = "How many have lost it all to a simple game of chance?" diff --git a/icons/mob/inhands/weapons/ego_lefthand.dmi b/icons/mob/inhands/weapons/ego_lefthand.dmi index 5d331e0d00b8..6e289938bd29 100644 Binary files a/icons/mob/inhands/weapons/ego_lefthand.dmi and b/icons/mob/inhands/weapons/ego_lefthand.dmi differ diff --git a/icons/mob/inhands/weapons/ego_righthand.dmi b/icons/mob/inhands/weapons/ego_righthand.dmi index f6538be472e0..4ea207a98372 100644 Binary files a/icons/mob/inhands/weapons/ego_righthand.dmi and b/icons/mob/inhands/weapons/ego_righthand.dmi differ