Merge pull request #6680 from Citadel-Station-13/upstream-merge-37727

[MIRROR] [s] Removes some stationloving-related failure surface
This commit is contained in:
deathride58
2018-05-11 03:44:29 +00:00
committed by GitHub
3 changed files with 20 additions and 8 deletions
+1 -7
View File
@@ -28,13 +28,7 @@
CRASH("Unable to find a blobstart landmark")
var/atom/movable/AM = parent
if(ismob(AM.loc))
var/mob/M = AM.loc
M.transferItemToLoc(AM, targetturf, TRUE) //nodrops disks when?
else if(AM.loc.SendSignal(COMSIG_CONTAINS_STORAGE))
AM.loc.SendSignal(COMSIG_TRY_STORAGE_TAKE, src, targetturf, TRUE)
else
AM.forceMove(targetturf)
AM.forceMove(targetturf)
// move the disc, so ghosts remain orbiting it even if it's "destroyed"
return targetturf