Merge pull request #12869 from timothyteakettle/zombies-rework
the very much needed zombie buffs
This commit is contained in:
@@ -11,7 +11,8 @@
|
||||
var/icon_left = "bloodhand_left"
|
||||
var/icon_right = "bloodhand_right"
|
||||
hitsound = 'sound/hallucinations/growl1.ogg'
|
||||
force = 21 // Just enough to break airlocks with melee attacks
|
||||
force = 18
|
||||
sharpness = IS_SHARP_ACCURATE //it's a claw, they're sharp.
|
||||
damtype = "brute"
|
||||
total_mass = TOTAL_MASS_HAND_REPLACEMENT
|
||||
sharpness = IS_SHARP
|
||||
@@ -35,11 +36,15 @@
|
||||
. = ..()
|
||||
if(!proximity_flag)
|
||||
return
|
||||
else if(isliving(target))
|
||||
if(ishuman(target))
|
||||
try_to_zombie_infect(target)
|
||||
else
|
||||
if(istype(target, /obj/)) //do far more damage to non mobs so we can get through airlocks
|
||||
var/obj/target_object = target
|
||||
target_object.take_damage(force * 3, BRUTE, "melee", 0)
|
||||
else
|
||||
check_feast(target, user)
|
||||
if(isliving(target) && ishuman(target))
|
||||
try_to_zombie_infect(target)
|
||||
else
|
||||
check_feast(target, user)
|
||||
|
||||
/proc/try_to_zombie_infect(mob/living/carbon/human/target)
|
||||
CHECK_DNA_AND_SPECIES(target)
|
||||
@@ -55,8 +60,6 @@
|
||||
infection = new()
|
||||
infection.Insert(target)
|
||||
|
||||
|
||||
|
||||
/obj/item/zombie_hand/suicide_act(mob/user)
|
||||
user.visible_message("<span class='suicide'>[user] is ripping [user.p_their()] brains out! It looks like [user.p_theyre()] trying to commit suicide!</span>")
|
||||
if(isliving(user))
|
||||
|
||||
Reference in New Issue
Block a user