Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33829

code/game/gamemodes/changeling/powers/headcrab.dm

@@ -8,6 +8,8 @@
 
 /obj/effect/proc_holder/changeling/headcrab/sting_action(mob/user)
 	set waitfor = FALSE
+	if(alert("Are we sure we wish to kill ourself and create a headslug?",,"Yes", "No") == "No")
+		return
 	var/datum/mind/M = user.mind
 	var/list/organs = user.getorganszone("head", 1)
 
@@ -35,4 +37,4 @@
 	if(crab.origin)
 		crab.origin.active = 1
 		crab.origin.transfer_to(crab)
-		to_chat(crab, "<span class='warning'>You burst out of the remains of your former body in a shower of gore!</span>")
+		to_chat(crab, "<span class='warning'>You burst out of the remains of your former body in a shower of gore!</span>")

code/game/gamemodes/clock_cult/clock_effects/clock_sigils.dm

@@ -278,7 +278,7 @@
 	animate(src, alpha = 255, time = 10, flags = ANIMATION_END_NOW) //we may have a previous animation going. finish it first, then do this one without delay.
 	sleep(10)
 //as long as they're still on the sigil and are either not a servant or they're a servant AND it has remaining vitality
-	while(L && (!is_servant_of_ratvar(L) || (is_servant_of_ratvar(L) && (GLOB.ratvar_awakens || GLOB.clockwork_vitality))) && get_turf(L) == get_turf(src))
+	while(L && (!is_servant_of_ratvar(L) || (is_servant_of_ratvar(L) && (GLOB.ratvar_awakens || GLOB.clockwork_vitality))) && get_turf(L) == get_turf(src) && !L.buckled)
 		sigil_active = TRUE
 		if(animation_number >= 4)
 			new /obj/effect/temp_visual/ratvar/sigil/vitality(get_turf(src))
@@ -313,21 +313,28 @@
 					revival_cost = 0
 				var/mob/dead/observer/ghost = L.get_ghost(TRUE)
 				if(GLOB.clockwork_vitality >= revival_cost && (ghost || (L.mind && L.mind.active)))
-					if(ghost)
-						ghost.reenter_corpse()
-					L.revive(1, 1)
-					var/obj/effect/temp_visual/ratvar/sigil/vitality/V = new /obj/effect/temp_visual/ratvar/sigil/vitality(get_turf(src))
-					animate(V, alpha = 0, transform = matrix()*2, time = 8)
-					playsound(L, 'sound/magic/staff_healing.ogg', 50, 1)
-					L.visible_message("<span class='warning'>[L] suddenly gets back up, [L.p_their()] body dripping blue ichor!</span>", "<span class='inathneq'>\"[text2ratvar("You will be okay, child.")]\"</span>")
-					GLOB.clockwork_vitality -= revival_cost
+					if(L.has_status_effect(STATUS_EFFECT_ICHORIAL_STAIN))
+						visible_message("<span class='boldwarning'>[src] strains, but nothing happens...</span>")
+						if(L.pulledby)
+							to_chat(L.pulledby, "<span class='userdanger'>[L] was already revived recently by a vitality matrix! Wait a bit longer!</span>")
+						break
+					else
+						if(ghost)
+							ghost.reenter_corpse()
+						L.revive(1, 1)
+						var/obj/effect/temp_visual/ratvar/sigil/vitality/V = new /obj/effect/temp_visual/ratvar/sigil/vitality(get_turf(src))
+						animate(V, alpha = 0, transform = matrix()*2, time = 8)
+						playsound(L, 'sound/magic/staff_healing.ogg', 50, 1)
+						to_chat(L, "<span class='inathneq'>\"[text2ratvar("You will be okay, child.")]\"</span>")
+						L.apply_status_effect(STATUS_EFFECT_ICHORIAL_STAIN)
+						GLOB.clockwork_vitality -= revival_cost
 				break
 			if(!L.client || L.client.is_afk())
 				set waitfor = FALSE
 				var/list/mob/dead/observer/candidates = pollCandidatesForMob("Do you want to play as a [L.name], an inactive clock cultist?", "[name]", null, "Clock Cultist", 50, L)
 				var/mob/dead/observer/theghost = null
 				if(candidates.len)
-					to_chat(L, "Your physical form has been taken over by another soul due to your inactivity! Ahelp if you wish to regain your form!")
+					to_chat(L, "<span class='userdanger'>Your physical form has been taken over by another soul due to your inactivity! Ahelp if you wish to regain your form!</span>")
 					message_admins("[key_name_admin(theghost)] has taken control of ([key_name_admin(L)]) to replace an inactive clock cultist.")
 					L.ghostize(0)
 					L.key = theghost.key

code/game/gamemodes/clock_cult/clock_scriptures/scripture_scripts.dm

@@ -70,6 +70,12 @@
 	quickbind = TRUE
 	quickbind_desc = "Creates a Vitality Matrix, which drains non-Servants on it to heal Servants that cross it."
 
+/datum/clockwork_scripture/create_object/vitality_matrix/check_special_requirements()
+	if(locate(object_path) in range(1, invoker))
+		to_chat(invoker, "<span class='danger'>Vitality matrices placed next to each other could interfere and cause a feedback loop! Move away from the other ones!</span>")
+		return FALSE
+	return ..()
+
 
 //Judicial Visor: Creates a judicial visor, which can smite an area.
 /datum/clockwork_scripture/create_object/judicial_visor

code/game/gamemodes/clock_cult/clock_structures/trap_triggers/pressure_sensor.dm

@@ -3,7 +3,7 @@
 	name = "pressure sensor"
 	desc = "A thin plate of brass, barely visible but clearly distinct."
 	clockwork_desc = "A trigger that will activate when a non-servant runs across it."
-	max_integrity = 25
+	max_integrity = 5
 	icon_state = "pressure_sensor"
 	alpha = 80
 	layer = LOW_ITEM_LAYER

code/game/gamemodes/clock_cult/clock_structures/traps/brass_skewer.dm

@@ -21,9 +21,10 @@
 	STOP_PROCESSING(SSfastprocess, src)
 	if(buckled_mobs && buckled_mobs.len)
 		var/mob/living/L = buckled_mobs[1]
-		L.Knockdown(100)
-		L.visible_message("<span class='warning'>[L] is maimed as the skewer shatters while still in their body!</span>")
-		L.adjustBruteLoss(15)
+		if(iscarbon(L))
+			L.Knockdown(100)
+			L.visible_message("<span class='warning'>[L] is maimed as the skewer shatters while still in their body!</span>")
+			L.adjustBruteLoss(15)
 		unbuckle_mob(L)
 	return ..()
 
@@ -48,14 +49,22 @@
 /obj/structure/destructible/clockwork/trap/brass_skewer/activate()
 	if(density)
 		return
-	var/mob/living/carbon/squirrel = locate() in get_turf(src)
+	var/mob/living/squirrel = locate() in get_turf(src)
 	if(squirrel)
-		squirrel.visible_message("<span class='boldwarning'>A massive brass spike erupts from the ground, impaling [squirrel]!</span>", \
-		"<span class='userdanger'>A massive brass spike rams through your chest, hoisting you into the air!</span>")
-		squirrel.emote("scream")
-		playsound(squirrel, 'sound/effects/splat.ogg', 50, TRUE)
-		playsound(squirrel, 'sound/misc/desceration-03.ogg', 50, TRUE)
-		squirrel.apply_damage(20, BRUTE, "chest")
+		if(iscyborg(squirrel))
+			if(!squirrel.stat)
+				squirrel.visible_message("<span class='boldwarning'>A massive brass spike erupts from the ground, rending [squirrel]'s chassis but shattering into pieces!</span>", \
+				"<span class='userdanger'>A massive brass spike rips through your chassis and bursts into shrapnel in your casing!</span>")
+				squirrel.adjustBruteLoss(50)
+				squirrel.Stun(20)
+				addtimer(CALLBACK(src, .proc/take_damage, max_integrity), 1)
+		else
+			squirrel.visible_message("<span class='boldwarning'>A massive brass spike erupts from the ground, impaling [squirrel]!</span>", \
+			"<span class='userdanger'>A massive brass spike rams through your chest, hoisting you into the air!</span>")
+			squirrel.emote("scream")
+			playsound(squirrel, 'sound/effects/splat.ogg', 50, TRUE)
+			playsound(squirrel, 'sound/misc/desceration-03.ogg', 50, TRUE)
+			squirrel.apply_damage(20, BRUTE, "chest")
 		mouse_opacity = MOUSE_OPACITY_OPAQUE //So players can interact with the tile it's on to pull them off
 		buckle_mob(squirrel, TRUE)
 	else

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

@@ -59,9 +59,9 @@
 				brass_floor = TRUE
 			if(W.use(2 - brass_floor))
 				if(anchored)
-					T.ChangeTurf(/turf/closed/wall/clockwork)
+					T.PlaceOnTop(/turf/closed/wall/clockwork)
 				else
-					T.ChangeTurf(/turf/open/floor/clockwork)
+					T.PlaceOnTop(/turf/open/floor/clockwork)
 					new /obj/structure/falsewall/brass(T)
 				qdel(src)
 			else

code/game/gamemodes/devil/true_devil/_true_devil.dm

@@ -67,10 +67,7 @@
 	//Left hand items
 	for(var/obj/item/I in held_items)
 		if(!(I.flags_1 & ABSTRACT_1))
-			if(I.blood_DNA)
-				msg += "<span class='warning'>It is holding [icon2html(I, user)] [I.gender==PLURAL?"some":"a"] blood-stained [I.name] in its [get_held_index_name(get_held_index_of_item(I))]!</span>\n"
-			else
-				msg += "It is holding [icon2html(I, user)] \a [I] in its [get_held_index_name(get_held_index_of_item(I))].\n"
+			msg += "It is holding [I.get_examine_string(user)] in its [get_held_index_name(get_held_index_of_item(I))].\n"
 
 	//Braindead
 	if(!client && stat != DEAD)

code/game/gamemodes/wizard/artefact.dm

@@ -213,7 +213,7 @@
 	righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi'
 	var/mob/living/carbon/human/target = null
 	var/list/mob/living/carbon/human/possible = list()
-	var/obj/item/linked_item = null
+	var/obj/item/voodoo_link = null
 	var/cooldown_time = 30 //3s
 	var/cooldown = 0
 	max_integrity = 10
@@ -237,10 +237,10 @@
 		cooldown = world.time +cooldown_time
 		return
 
-	if(!linked_item)
+	if(!voodoo_link)
 		if(I.loc == user && istype(I) && I.w_class <= WEIGHT_CLASS_SMALL)
 			if (user.transferItemToLoc(I,src))
-				linked_item = I
+				voodoo_link = I
 				to_chat(user, "You attach [I] to the doll.")
 				update_targets()
 
@@ -255,11 +255,11 @@
 		return
 
 	if(user.zone_selected == "chest")
-		if(linked_item)
+		if(voodoo_link)
 			target = null
-			linked_item.forceMove(drop_location())
-			to_chat(user, "<span class='notice'>You remove the [linked_item] from the doll.</span>")
-			linked_item = null
+			voodoo_link.forceMove(drop_location())
+			to_chat(user, "<span class='notice'>You remove the [voodoo_link] from the doll.</span>")
+			voodoo_link = null
 			update_targets()
 			return
 
@@ -291,10 +291,13 @@
 
 /obj/item/voodoo/proc/update_targets()
 	possible = list()
-	if(!linked_item)
+	if(!voodoo_link)
 		return
+	var/list/prints = voodoo_link.return_fingerprints()
+	if(!length(prints))
+		return FALSE
 	for(var/mob/living/carbon/human/H in GLOB.alive_mob_list)
-		if(md5(H.dna.uni_identity) in linked_item.fingerprints)
+		if(prints[md5(H.dna.uni_identity)])
 			possible |= H
 
 /obj/item/voodoo/proc/GiveHint(mob/victim,force=0)