Merge branch 'master' into upstream-merge-29940

2017-08-21 23:29:24 -05:00
parent 87b3df3069 b5e7f7f7fe
commit a0cf777040
364 changed files with 4317 additions and 3134 deletions
@@ -85,9 +85,8 @@
 	. = ..()
 	var/obj/machinery/nuclearbomb/existing = locate("syndienuke") in GLOB.nuke_list
 	if(existing)
-		qdel(src)
-		throw EXCEPTION("Attempted to spawn a syndicate nuke while one already exists at [existing.loc.x],[existing.loc.y],[existing.loc.z]")
-		return 0
+		stack_trace("Attempted to spawn a syndicate nuke while one already exists at [existing.loc.x],[existing.loc.y],[existing.loc.z]")
+		return INITIALIZE_HINT_QDEL
 	tag = "syndienuke"

 /obj/machinery/nuclearbomb/attackby(obj/item/I, mob/user, params)