Merge branch 'master' into mapsyncs43293845982

code/game/gamemodes/blob/overmind.dm

@@ -58,12 +58,21 @@ GLOBAL_LIST_EMPTY(blob_nodes)
 
 /mob/camera/blob/proc/validate_location()
 	var/turf/T = get_turf(src)
-	var/area/A = get_area(T)
-	if(((A && !A.blob_allowed) || !T || !is_station_level(T.z)) && LAZYLEN(GLOB.blobstart))
-		T = get_turf(pick(GLOB.blobstart))
+	if(!is_valid_turf(T) && LAZYLEN(GLOB.blobstart))
+		var/list/blobstarts = shuffle(GLOB.blobstart)
+		for(var/_T in blobstarts)
+			if(is_valid_turf(_T))
+				T = _T
+				break
 	if(!T)
 		CRASH("No blobspawnpoints and blob spawned in nullspace.")
 	forceMove(T)
+	
+/mob/camera/blob/proc/is_valid_turf(turf/T)
+	var/area/A = get_area(T)
+	if((A && !A.blob_allowed) || !T || !is_station_level(T.z) || isspaceturf(T))
+		return FALSE
+	return TRUE
 
 /mob/camera/blob/Life()
 	if(!blob_core)
@@ -246,4 +255,4 @@ GLOBAL_LIST_EMPTY(blob_nodes)
 	. = ..()
 	var/datum/antagonist/blob/B = mind.has_antag_datum(/datum/antagonist/blob)
 	if(!B)
-		mind.add_antag_datum(/datum/antagonist/blob)
+		mind.add_antag_datum(/datum/antagonist/blob)

code/game/gamemodes/clock_cult/clock_structures/ark_of_the_clockwork_justicar.dm

@@ -1,5 +1,11 @@
 #define ARK_GRACE_PERIOD 300 //In seconds, how long the crew has before the Ark truly "begins"
 
+/proc/clockwork_ark_active() //A helper proc so the Ark doesn't have to be typecast every time it's checked; returns null if there is no Ark and its active var otherwise
+	var/obj/structure/destructible/clockwork/massive/celestial_gateway/G = GLOB.ark_of_the_clockwork_justiciar
+	if(!G)
+		return
+	return G.active
+
 //The gateway to Reebe, from which Ratvar emerges.
 /obj/structure/destructible/clockwork/massive/celestial_gateway
 	name = "\improper Ark of the Clockwork Justicar"
@@ -63,7 +69,7 @@
 
 /obj/structure/destructible/clockwork/massive/celestial_gateway/proc/cry_havoc()
 	visible_message("<span class='boldwarning'>[src] shudders and roars to life, its parts beginning to whirr and screech!</span>")
-	hierophant_message("<span class='bold large_brass'>The Ark is activating! Get back to the base!</span>")
+	hierophant_message("<span class='bold large_brass'>The Ark is activating! You will be transported there soon!</span>")
 	for(var/mob/M in GLOB.player_list)
 		if(is_servant_of_ratvar(M) || isobserver(M) || M.z == z)
 			M.playsound_local(M, 'sound/magic/clockwork/ark_activation_sequence.ogg', 30, FALSE, pressure_affected = FALSE)
@@ -86,6 +92,8 @@
 		var/datum/stack_recipe/R = V
 		if(R.title == "wall gear")
 			R.time *= 2 //Building walls becomes slower when the Ark activates
+	mass_recall()
+	recalls_remaining++ //So it doesn't use up a charge
 
 /obj/structure/destructible/clockwork/massive/celestial_gateway/proc/open_portal(turf/T)
 	new/obj/effect/clockwork/city_of_cogs_rift(T)
@@ -261,6 +269,12 @@
 			if(!step_away(O, src, 2) || get_dist(O, src) < 2)
 				O.take_damage(50, BURN, "bomb")
 			O.update_icon()
+	for(var/V in GLOB.player_list)
+		var/mob/M = V
+		if(is_servant_of_ratvar(M) && M.z != z)
+			M.forceMove(get_step(src, SOUTH))
+			M.overlay_fullscreen("flash", /obj/screen/fullscreen/flash)
+			M.clear_fullscreen("flash", 5)
 	if(grace_period)
 		grace_period--
 		return

code/game/gamemodes/wizard/soulstone.dm

@@ -11,11 +11,11 @@
 	slot_flags = SLOT_BELT
 	var/usability = 0
 
-	var/reusable = TRUE
+	var/old_shard = FALSE
 	var/spent = FALSE
 
 /obj/item/device/soulstone/proc/was_used()
-	if(!reusable)
+	if(old_shard)
 		spent = TRUE
 		name = "dull [name]"
 		desc = "A fragment of the legendary treasure known simply as \
@@ -27,7 +27,7 @@
 
 /obj/item/device/soulstone/anybody/chaplain
 	name = "mysterious old shard"
-	reusable = FALSE
+	old_shard = TRUE
 
 /obj/item/device/soulstone/pickup(mob/living/user)
 	..()
@@ -38,7 +38,10 @@
 /obj/item/device/soulstone/examine(mob/user)
 	..()
 	if(usability || iscultist(user) || iswizard(user) || isobserver(user))
-		to_chat(user, "<span class='cult'>A soulstone, used to capture souls, either from unconscious or sleeping humans or from freed shades.</span>")
+		if (old_shard)
+			to_chat(user, "<span class='cult'>A soulstone, used to capture a soul, either from dead humans or from freed shades.</span>")
+		else
+			to_chat(user, "<span class='cult'>A soulstone, used to capture souls, either from unconscious or sleeping humans or from freed shades.</span>")
 		to_chat(user, "<span class='cult'>The captured soul can be placed into a construct shell to produce a construct, or released from the stone as a shade.</span>")
 		if(spent)
 			to_chat(user, "<span class='cult'>This shard is spent; it is now just a creepy rock.</span>")
@@ -151,7 +154,7 @@
 			if(contents.len)
 				to_chat(user, "<span class='userdanger'>Capture failed!</span>: The soulstone is full! Free an existing soul to make room.")
 			else
-				if(T.stat != CONSCIOUS)
+				if((!old_shard && T.stat != CONSCIOUS) || (old_shard && T.stat == DEAD))
 					if(T.client == null)
 						to_chat(user, "<span class='userdanger'>Capture failed!</span>: The soul has already fled its mortal frame. You attempt to bring it back...")
 						getCultGhost(T,user)