Cleave changes, attack code cleanup

This commit is contained in:
Anewbe
2018-08-27 01:18:49 -05:00
parent 532012c5bf
commit 9d8a19ab5d
5 changed files with 14 additions and 23 deletions
@@ -8,10 +8,6 @@
if(!effective_force || blocked >= 100)
return 0
//Hulk modifier
if(HULK in user.mutations)
effective_force *= 2
//If the armor soaks all of the damage, it just skips the rest of the checks
if(effective_force <= soaked)
return 0
@@ -221,11 +221,6 @@
/mob/living/proc/standard_weapon_hit_effects(obj/item/I, mob/living/user, var/effective_force, var/blocked, var/soaked, var/hit_zone)
if(!effective_force || blocked >= 100)
return 0
//Hulk modifier
if(HULK in user.mutations)
effective_force *= 2
//Apply weapon damage
var/weapon_sharp = is_sharp(I)
var/weapon_edge = has_edge(I)
@@ -659,7 +659,6 @@
return ..()
/mob/living/simple_animal/hit_with_weapon(obj/item/O, mob/living/user, var/effective_force, var/hit_zone)
effective_force = O.force
//Animals can't be stunned(?)
if(O.damtype == HALLOSS)