Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Kikimora Ego [DONE] #2572

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions ModularTegustation/ego_weapons/melee/teth.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down
9 changes: 9 additions & 0 deletions code/datums/abnormality/_ego_datum/teth.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 6 additions & 0 deletions code/modules/clothing/suits/ego_gear/teth.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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?"
Expand Down
Binary file modified icons/mob/inhands/weapons/ego_lefthand.dmi
Binary file not shown.
Binary file modified icons/mob/inhands/weapons/ego_righthand.dmi
Binary file not shown.
Loading