Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265

2019-11-15 00:36:50 +01:00
parent 09860d463f 364e267598
commit 6484eea339
447 changed files with 16075 additions and 3073 deletions
@@ -58,6 +58,9 @@
 /obj/effect/abstract/singularity_act()
 	return

+/obj/effect/abstract/has_gravity(turf/T)
+	return FALSE
+
 /obj/effect/dummy/singularity_pull()
 	return