From 8e4df5607ba5081486eb04ad030d98e5157148de Mon Sep 17 00:00:00 2001
From: Joan Lung <duorabbit2@gmail.com>
Date: Tue, 26 Jul 2016 09:18:41 -0400
Subject: [PATCH] Singularities, but not gods, are now stronger than shuttles

---
 code/modules/shuttle/shuttle.dm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm
index 166a4dd4cd5..cb5999e88cd 100644
--- a/code/modules/shuttle/shuttle.dm
+++ b/code/modules/shuttle/shuttle.dm
@@ -546,6 +546,8 @@
 						M.ex_act(2)
 
 			else //non-living mobs shouldn't be affected by shuttles, which is why this is an else
+				if(istype(AM, /obj/singularity) && !istype(AM, /obj/singularity/narsie)) //it's a singularity but not a god, ignore it.
+					continue
 				if(!AM.anchored)
 					step(AM, dir)
 				else