diff --git a/ModularTegustation/ego_weapons/melee/teth.dm b/ModularTegustation/ego_weapons/melee/teth.dm index e90b0450c804..56c3aff56658 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 ac93cd9de46f..2d089e46833b 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 798d53132523..49bfa2f8c9ca 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/code/modules/paperwork/records/info/teth.dm b/code/modules/paperwork/records/info/teth.dm index e5bbb6be7982..3070c8246e9a 100644 --- a/code/modules/paperwork/records/info/teth.dm +++ b/code/modules/paperwork/records/info/teth.dm @@ -371,6 +371,19 @@ "When the Qliphoth Counter reached zero, the physical condition of the abnormality improved significantly.", "After its condition improves beyond a certain point, the abnormality will breach containment and travel through the facility on a horizontal path, dealing massive WHITE damage to everything it impacts.") +//Kikimora +/obj/item/paper/fluff/info/teth/kikimora + abno_type = /mob/living/simple_animal/hostile/abnormality/kikimora + abno_code = "F-02-" + abno_info = list( + "Do not closely examine the entity.", + "When F-02- breached cognitohazardous graffiti appeared in a random appartment.", + "F-02--02 is a phenomenon that replaces spoken word until the subject is unintelligible.", + "Each time a cursed employee speaks there is a chance a word will be taken by F-02--02.", + "Intances of F-02--02 will share taken words and curing themselves of F-02--02 will not refresh the words taken.", + "Curing the F-02--02 requires the host to fall asleep with a offering of food ontop of them.", + "It is considered bad luck if F-02- does not accept the offering.",) + //Dealer of the Damned /obj/item/paper/fluff/info/teth/dealerdamned abno_type = /mob/living/simple_animal/hostile/abnormality/dealerdamned diff --git a/icons/mob/clothing/ego_gear/abnormality/teth.dmi b/icons/mob/clothing/ego_gear/abnormality/teth.dmi index aea302291b6b..91795cb4ec95 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/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 diff --git a/icons/obj/clothing/ego_gear/abnormality/teth.dmi b/icons/obj/clothing/ego_gear/abnormality/teth.dmi index 579ee7ca20c9..736631e45dbd 100644 Binary files a/icons/obj/clothing/ego_gear/abnormality/teth.dmi and b/icons/obj/clothing/ego_gear/abnormality/teth.dmi differ diff --git a/icons/obj/ego_weapons.dmi b/icons/obj/ego_weapons.dmi index eb84b13b48f0..dfbd4168202e 100644 Binary files a/icons/obj/ego_weapons.dmi and b/icons/obj/ego_weapons.dmi differ