Merge remote-tracking branch 'upstream/master'

code/__HELPERS/unsorted.dm

@@ -1514,3 +1514,33 @@ GLOBAL_DATUM_INIT(dview_mob, /mob/dview, new)
 	animate(A, color = new_color, time = new_time)
 
 #define TURF_FROM_COORDS_LIST(List) (locate(List[1], List[2], List[3]))
+
+// Returns a list of all safe directions based off of the turf given
+// Included in stuff like Blue Sicko's Tempestuous Danza or The Claw weapon's serum W
+/proc/GetSafeDir(turf/target)
+	var/turf/list = list()
+	for(var/dir in GLOB.alldirs)
+		var/turf/T = get_step(target, dir)
+		if(!IsSafeTurf(T))
+			continue
+		list += dir
+	return list
+
+// Checks if the current turf is "Safe"
+// Future notes: Convert to a list and check if T is in that list?
+/proc/IsSafeTurf(turf/T)
+	if(!T)
+		return FALSE
+	if(T.density)
+		return FALSE
+	if(T in typesof(/turf/open/water/deep)) // No water
+		return FALSE
+	if(T in typesof(/turf/open/space)) // No space
+		return FALSE
+	var/obj/structure/window/W = locate() in T // No windows
+	var/obj/machinery/door/D = locate() in T // No doors
+	var/obj/machinery/vending/V = locate() in T // No vending
+	var/obj/structure/table/glass/G = locate() in T // No glass tables
+	if(W || D || V || G)
+		return FALSE
+	return TRUE

code/datums/mind.dm

@@ -228,10 +228,14 @@
 	msg += "</span>"
 	to_chat(user, msg)
 
-/datum/mind/proc/set_death_time()
+/datum/mind/proc/set_death_time(mob/living/L, gibbed)
 	SIGNAL_HANDLER
 
 	last_death = world.time
+	if(ishuman(L))
+		var/mob/living/carbon/human/H = L
+		if(H.sanity_lost)
+			return
 	respawn_cooldown = world.time + CONFIG_GET(number/respawn_delay)
 
 /datum/mind/proc/store_memory(new_text)

code/game/objects/items/ego_weapons/non_abnormality/blue_sicko.dm

@@ -225,23 +225,6 @@
 	active = FALSE
 	vibration_timer = addtimer(CALLBACK(src, .proc/VibrationChange), 10 SECONDS, TIMER_STOPPABLE)
 
-/obj/item/ego_weapon/city/reverberation/proc/GetSafeDir(turf/target)
-	. = list()
-	for(var/dir in GLOB.alldirs)
-		var/turf/T = get_step(target, dir)
-		if(!T)
-			continue
-		if(T.density)
-			continue
-		var/obj/structure/window/W = locate() in T
-		if(W)
-			continue
-		var/obj/machinery/door/D = locate() in T
-		if(D)
-			continue
-		. += dir
-	return
-
 /obj/item/ego_weapon/city/reverberation/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
 	SEND_SIGNAL(src, COMSIG_ITEM_HIT_REACT, args)
 	if(attack_type == PROJECTILE_ATTACK)

code/game/objects/items/ego_weapons/non_abnormality/purple_tear.dm

@@ -506,23 +506,6 @@
 			targets -= L
 		sleep(4)
 
-/obj/item/ego_weapon/city/pt/proc/GetSafeDir(turf/target) //stole this one from blue sicko, doesnt protect me from glass tables tho :(
-	. = list()
-	for(var/dir in GLOB.alldirs)
-		var/turf/T = get_step(target, dir)
-		if(!T)
-			continue
-		if(T.density)
-			continue
-		var/obj/structure/window/W = locate() in T
-		if(W)
-			continue
-		var/obj/machinery/door/D = locate() in T
-		if(D)
-			continue
-		. += dir
-	return
-
 /datum/action/item_action/miragestorm
 	name = "Mirage Storm"
 	desc = "Unleash a flurry of blows upon any enemies around you utilizing the 3 offensive stances."