Everything should be good!

This commit is contained in:
kevinz000
2019-01-07 03:28:02 -08:00
parent a9aa961259
commit ced118076b
5 changed files with 5 additions and 6 deletions

View File

@@ -102,7 +102,7 @@
return
/atom/proc/Bumped(AM as mob|obj)
return
set waitfor = FALSE
// Convenience proc to see if a container is open for chemistry handling
// returns true if open
@@ -493,7 +493,7 @@
if(!istype(drop_destination) || drop_destination == destination)
return forceMove(destination)
destination = drop_destination
return forceMove(null)
return moveToNullspace()
/atom/proc/onDropInto(var/atom/movable/AM)
return // If onDropInto returns null, then dropInto will forceMove AM into us.

View File

@@ -98,6 +98,7 @@
return 1
/obj/machinery/door/Bumped(atom/AM)
. = ..()
if(p_open || operating)
return
if(ismob(AM))

View File

@@ -121,7 +121,7 @@
var/mob/living/carbon/human/dummy/mannequin = new()
client.prefs.dress_preview_mob(mannequin)
var/mob/observer/dead/observer = new(mannequin)
observer.forceMove(null) //Let's not stay in our doomed mannequin
observer.moveToNullspace() //Let's not stay in our doomed mannequin
qdel(mannequin)
spawning = 1

View File

@@ -75,7 +75,6 @@
return
/obj/machinery/power/supermatter/shard/singularity_act()
src.forceMove(null)
qdel(src)
return 5000
@@ -90,7 +89,6 @@
SetUniversalState(/datum/universal_state/supermatter_cascade)
log_admin("New super singularity made by eating a SM crystal [prints]. Last touched by [src.fingerprintslast].")
message_admins("New super singularity made by eating a SM crystal [prints]. Last touched by [src.fingerprintslast].")
src.forceMove(null)
qdel(src)
return 50000

View File

@@ -32,7 +32,7 @@
var/uy = y
var/uz = z
var/udir = dir
forceMove(null)
moveToNullspace()
// These modifiers are used in relation to the origin
// to place the system control panels and doors.