Move throwforce up to atom/movable (#38689)

2018-06-26 15:27:09 -05:00
parent 0029919b80
commit 83a4003660
4 changed files with 3 additions and 8 deletions
@@ -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)