Fixes sharp melee

This commit is contained in:
killer653
2017-09-09 12:34:28 -04:00
parent 73dc1a924b
commit d435213617
3 changed files with 16 additions and 9 deletions
@@ -1353,17 +1353,18 @@ obj/item/weapon/material/hatchet/tacknife/combatknife/fluff/katarina/handle_shie
age = 39
blood_type = "O-"
sex = "Female"
/obj/item/weapon/fluff/kitchi_injector
name = "Kitchi Monkey Injector"
desc = "Allows the user (Kitchi) to transform into a monkey. Single use."
/obj/item/weapon/fluff/injector //Injectors. Custom item used to explain wild changes in a mob's body or chemistry.
name = "Injector"
desc = "Some type of injector."
icon = 'icons/obj/items.dmi'
icon_state = "dnainjector"
/obj/item/weapon/fluff/kitchi_injector/attack(mob/living/M, mob/living/user)
/obj/item/weapon/fluff/injector/monkey
name = "Lesser Form Injector"
desc = "Turn the user into their lesser, more primal form."
if(M.ckey != "Ketrai")
user << "<span class='warning'>Something compels you to <i>not</i> use this injector.</span>"
return
/obj/item/weapon/fluff/injector/monkey/attack(mob/living/M, mob/living/user)
if(usr == M) //Is the person using it on theirself?
if(ishuman(M)) //If so, monkify them.
@@ -1371,4 +1372,4 @@ obj/item/weapon/material/hatchet/tacknife/combatknife/fluff/katarina/handle_shie
H.monkeyize()
qdel(src) //One time use.
else //If not, do nothing.
to_chat(user,"<span class='warning'> You are unable to inject other people.</span>")
to_chat(user,"<span class='warning'>You are unable to inject other people.</span>")