TG sync Sunday (#201)
* stage one * datums and shit * game stuff * modules * tgstation.dme * tools * these things for icons * compiling fixes * merge spree on TG * other updates * updated maps with deepfryers * My helpers were not helping
This commit is contained in:
+18
-10
@@ -130,7 +130,7 @@
|
||||
throwing = 0
|
||||
throw_impact(A)
|
||||
. = 1
|
||||
if(!A || qdeleted(A))
|
||||
if(!A || QDELETED(A))
|
||||
return
|
||||
A.Bumped(src)
|
||||
|
||||
@@ -139,21 +139,29 @@
|
||||
if(destination)
|
||||
if(pulledby)
|
||||
pulledby.stop_pulling()
|
||||
|
||||
var/atom/oldloc = loc
|
||||
var/same_loc = oldloc == destination.loc
|
||||
if(oldloc && !same_loc)
|
||||
oldloc.Exited(src, destination)
|
||||
loc = destination
|
||||
if(!same_loc)
|
||||
destination.Entered(src, oldloc)
|
||||
var/same_loc = oldloc == destination
|
||||
var/area/old_area = get_area(oldloc)
|
||||
var/area/destarea = get_area(destination)
|
||||
if(old_area != destarea)
|
||||
destarea.Entered(src)
|
||||
|
||||
if(oldloc && !same_loc)
|
||||
oldloc.Exited(src, destination)
|
||||
if(old_area)
|
||||
old_area.Exited(src, destination)
|
||||
|
||||
loc = destination
|
||||
|
||||
if(!same_loc)
|
||||
destination.Entered(src, oldloc)
|
||||
if(destarea && old_area != destarea)
|
||||
destarea.Entered(src, oldloc)
|
||||
|
||||
for(var/atom/movable/AM in destination)
|
||||
if(AM == src)
|
||||
continue
|
||||
AM.Crossed(src)
|
||||
|
||||
Moved(oldloc, 0)
|
||||
return 1
|
||||
return 0
|
||||
@@ -408,4 +416,4 @@
|
||||
if(ex_id in acted_explosions)
|
||||
return FALSE
|
||||
acted_explosions += ex_id
|
||||
return TRUE
|
||||
return TRUE
|
||||
|
||||
Reference in New Issue
Block a user