Moves turf collision handling into living_defense

Conflicts:
	code/modules/mob/living/living_defense.dm
This commit is contained in:
mwerezak
2014-07-14 22:06:14 -04:00
committed by ZomgPonies
parent 5760510183
commit da7ae3c049
2 changed files with 7 additions and 1 deletions
+1 -1
View File
@@ -43,7 +43,7 @@
step(src, turn(src.dir, 180))
if(istype(src,/mob/living))
var/mob/living/M = src
M.take_organ_damage(20)
M.turf_collision(T, speed)
/atom/Del()
// Pass to Destroy().
@@ -78,6 +78,9 @@
dtype = W.damtype
if (W.hitsound && W.throwforce > 0)
playsound(loc, W.hitsound, 30, 1, -1)
//run to-hit check here
src.visible_message("\red [src] has been hit by [O].")
var/armor = run_armor_check(zone, "melee", "Your armor has protected your [zone].", "Your armor has softened hit to your [zone].")
@@ -126,6 +129,9 @@
src.anchored = 1
src.pinned += O
//This is called when the mob is thrown into a dense turf
/mob/living/proc/turf_collision(var/turf/T, var/speed)
src.take_organ_damage(speed*4)
/mob/living/proc/near_wall(var/direction,var/distance=1)
var/turf/T = get_step(get_turf(src),direction)