mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-23 03:57:13 +01:00
Merge pull request #3699 from VampyrBytes/forceMove(null)
Allows forceMove to move objects to nullspace
This commit is contained in:
@@ -108,15 +108,14 @@
|
||||
..()
|
||||
|
||||
/atom/movable/proc/forceMove(atom/destination)
|
||||
if(loc)
|
||||
loc.Exited(src)
|
||||
loc = destination
|
||||
if(destination)
|
||||
if(loc)
|
||||
loc.Exited(src)
|
||||
loc = destination
|
||||
loc.Entered(src)
|
||||
for(var/atom/movable/AM in loc)
|
||||
AM.Crossed(src)
|
||||
return 1
|
||||
return 0
|
||||
return 1
|
||||
|
||||
//called when src is thrown into hit_atom
|
||||
/atom/movable/proc/throw_impact(atom/hit_atom, var/speed)
|
||||
|
||||
Reference in New Issue
Block a user