Merge pull request #34897 from YPOQ/orbitfix

Fixes orbiting stopping when entering disposals
This commit is contained in:
Jordan Brown
2018-01-25 22:47:09 -05:00
committed by CitadelStationBot
parent 0c86312618
commit d0c648b702
2 changed files with 3 additions and 1 deletions
+1 -1
View File
@@ -190,7 +190,7 @@
sleep(5)
if(QDELETED(src))
return
var/obj/structure/disposalholder/H = new()
var/obj/structure/disposalholder/H = new(src)
newHolderDestination(H)
H.init(src)
air_contents = new()
@@ -45,6 +45,8 @@
// note AM since can contain mobs or objs
for(var/A in D)
var/atom/movable/AM = A
if(AM == src)
continue
AM.forceMove(src)
if(istype(AM, /obj/structure/bigDelivery) && !hasmob)
var/obj/structure/bigDelivery/T = AM