Hit things with things with zero force (#10722)

This commit is contained in:
Wowzewow (Wezzy)
2020-12-17 21:37:00 +01:00
committed by GitHub
parent d03a98af53
commit b684c7a224
11 changed files with 73 additions and 16 deletions
@@ -173,7 +173,7 @@
user.visible_message("<span class='danger'>\The [user] cuts [src]'s neck open with \the [W]!</span>")
if(W.hitsound)
playsound(loc, W.hitsound, 50, 1, -1)
playsound(loc, W.hitsound, W.get_clamped_volume(), 1, -1)
if(ishuman(src))
var/mob/living/carbon/human/H = src
@@ -207,4 +207,4 @@
/mob/living/carbon/Resting(amount)
help_up_offer = 0
..()
..()
+1 -1
View File
@@ -159,7 +159,7 @@
var/blocked = run_armor_check(hit_zone, "melee")
standard_weapon_hit_effects(I, user, effective_force, blocked, hit_zone)
if(I.damtype == BRUTE && prob(33)) // Added blood for whacking non-humans too
if(I.damtype == BRUTE && prob(33) && I.force) // Added blood for whacking non-humans too
var/turf/simulated/location = get_turf(src)
if(istype(location)) location.add_blood_floor(src)