mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-08-30 15:38:02 +01:00
Fixes sharp melee
This commit is contained in:
@@ -1180,6 +1180,7 @@
|
||||
vessel.remove_reagent("blood", vessel.total_volume - species.blood_volume)
|
||||
vessel.maximum_volume = species.blood_volume
|
||||
fixblood()
|
||||
species.update_attack_types //VOREStation edit. Required for any trait that updates unarmed_types in setup.
|
||||
|
||||
// Rebuild the HUD. If they aren't logged in then login() should reinstantiate it for them.
|
||||
if(client && client.screen)
|
||||
|
||||
@@ -15,4 +15,9 @@
|
||||
var/wing_hair
|
||||
var/wing
|
||||
var/wing_animation
|
||||
var/icobase_wing
|
||||
var/icobase_wing
|
||||
|
||||
/datum/species/proc/update_attack_types()
|
||||
unarmed_attacks = list()
|
||||
for(var/u_type in unarmed_types)
|
||||
unarmed_attacks += new u_type()
|
||||
@@ -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>")
|
||||
Reference in New Issue
Block a user