Merge pull request #11673 from comma/dev-freeze

Impulse directions and zombie vomit
This commit is contained in:
PsiOmegaDelta
2015-12-12 16:38:36 +01:00
2 changed files with 4 additions and 3 deletions

View File

@@ -78,7 +78,7 @@
else if(isobj(hit_atom))
var/obj/O = hit_atom
if(!O.anchored)
step(O, src.dir)
step(O, src.last_move)
O.hitby(src,speed)
else if(isturf(hit_atom))
@@ -86,7 +86,7 @@
var/turf/T = hit_atom
if(T.density)
spawn(2)
step(src, turn(src.dir, 180))
step(src, turn(src.last_move, 180))
if(istype(src,/mob/living))
var/mob/living/M = src
M.turf_collision(T, speed)

View File

@@ -764,7 +764,8 @@
if(!check_has_mouth())
return
if(stat == DEAD)
return
if(!lastpuke)
lastpuke = 1
src << "<span class='warning'>You feel nauseous...</span>"