Move throwforce up to atom/movable (#38689)

This commit is contained in:
Tad Hardesty
2018-06-26 13:26:33 -07:00
committed by letterjay
parent 0029919b80
commit 83a4003660
4 changed files with 3 additions and 8 deletions
+1 -7
View File
@@ -48,13 +48,7 @@
/obj/hitby(atom/movable/AM)
..()
var/tforce = 0
if(ismob(AM))
tforce = 10
else if(isobj(AM))
var/obj/O = AM
tforce = O.throwforce
take_damage(tforce, BRUTE, "melee", 1, get_dir(src, AM))
take_damage(AM.throwforce, BRUTE, "melee", 1, get_dir(src, AM))
/obj/ex_act(severity, target)
if(resistance_flags & INDESTRUCTIBLE)
-1
View File
@@ -2,7 +2,6 @@
/obj
var/crit_fail = FALSE
animate_movement = 2
var/throwforce = 0
var/obj_flags = CAN_BE_HIT
var/set_obj_flags // ONLY FOR MAPPING: Sets flags from a string list, handled in Initialize. Usage: set_obj_flags = "EMAGGED;!CAN_BE_HIT" to set EMAGGED and clear CAN_BE_HIT.