[MIRROR] New DCS signals (#2741)

* New DCS signals

* Update atoms.dm

* actually ports comsigs
This commit is contained in:
CitadelStationBot
2017-09-19 07:00:08 -05:00
committed by Poojawa
parent 1352eefa3a
commit ecce4cf138
5 changed files with 44 additions and 9 deletions
+4 -2
View File
@@ -1,4 +1,3 @@
/atom/movable
layer = OBJ_LAYER
var/last_move = null
@@ -117,6 +116,7 @@
//Called after a successful Move(). By this point, we've already moved
/atom/movable/proc/Moved(atom/OldLoc, Dir)
SendSignal(COMSIG_MOVABLE_MOVED, OldLoc, Dir)
if (!inertia_moving)
inertia_next_move = world.time + inertia_move_delay
newtonian_move(Dir)
@@ -215,6 +215,7 @@
//to differentiate it, naturally everyone forgot about this immediately and so some things
//would bump twice, so now it's called Collide
/atom/movable/proc/Collide(atom/A)
SendSignal(COMSIG_MOVABLE_COLLIDE, A)
if(A)
if(throwing)
throwing.hit_atom(A)
@@ -308,6 +309,7 @@
/atom/movable/proc/throw_impact(atom/hit_atom, throwingdatum)
set waitfor = 0
SendSignal(COMSIG_MOVABLE_IMPACT, hit_atom, throwingdatum)
return hit_atom.hitby(src)
/atom/movable/hitby(atom/movable/AM, skipcatch, hitpush = TRUE, blocked)
@@ -692,4 +694,4 @@
return FALSE
if(anchored || throwing)
return FALSE
return TRUE
return TRUE