Merge pull request #13669 from Arturlang/sacrifice_tweaks

Makes cult sacrifice not permakill people anymore.

code/modules/mob/living/carbon/carbon.dm

@@ -611,7 +611,7 @@
 		update_mobility()
 	UpdateStaminaBuffer()
 	update_health_hud()
-	
+
 /mob/living/carbon/update_sight()
 	if(!client)
 		return

code/modules/mob/living/simple_animal/constructs.dm

@@ -44,6 +44,7 @@
 	var/can_repair_constructs = FALSE
 	var/can_repair_self = FALSE
 	var/runetype
+	var/original_mind
 
 /mob/living/simple_animal/hostile/construct/Initialize()
 	. = ..()
@@ -66,6 +67,11 @@
 		CR.button.screen_loc = "6:[pos],4:-2"
 		CR.button.moved = "6:[pos],4:-2"
 
+/mob/living/simple_animal/hostile/construct/death()
+	if(original_mind)
+		transfer_ckey(original_mind)
+	..()
+
 /mob/living/simple_animal/hostile/construct/Login()
 	..()
 	to_chat(src, playstyle_string)
@@ -107,7 +113,7 @@
 	return
 
 /mob/living/simple_animal/hostile/construct/electrocute_act(shock_damage, source, siemens_coeff = 1, flags = NONE)
-	return 0
+	return FALSE
 
 /mob/living/simple_animal/hostile/construct/adjustHealth(amount, updating_health = TRUE, forced = FALSE)
 	. = ..()

code/modules/mob/living/simple_animal/shade.dm

@@ -1,53 +1,33 @@
-/mob/living/simple_animal/shade
+/mob/living/simple_animal/hostile/construct/shade
 	name = "Shade"
 	real_name = "Shade"
 	desc = "A bound spirit."
-	gender = PLURAL
-	icon = 'icons/mob/mob.dmi'
 	icon_state = "shade"
 	icon_living = "shade"
 	mob_biotypes = MOB_SPIRIT
 	maxHealth = 40
 	health = 40
-	spacewalk = TRUE
-	healable = 0
-	speak_emote = list("hisses")
 	emote_hear = list("wails.","screeches.")
 	response_help_continuous = "puts their hand through"
 	response_help_simple = "put your hand through"
-	response_disarm_continuous = "flails at"
-	response_disarm_simple = "flail at"
-	response_harm_continuous = "punches"
-	response_harm_simple = "punch"
-	speak_chance = 1
 	melee_damage_lower = 5
 	melee_damage_upper = 12
 	attack_verb_continuous = "metaphysically strikes"
 	attack_verb_simple = "metaphysically strike"
-	minbodytemp = 0
-	maxbodytemp = INFINITY
-	atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
-	stop_automated_movement = 1
-	status_flags = 0
-	faction = list("cult")
-	status_flags = CANPUSH
-	movement_type = FLYING
+	speed = -1 //they don't have to lug a body made of runed metal around
 	loot = list(/obj/item/ectoplasm)
-	del_on_death = TRUE
-	initial_language_holder = /datum/language_holder/construct
-	blood_volume = 0
-	has_field_of_vision = FALSE //we are a spoopy ghost
+	playstyle_string = "<span class='big bold'>You are a shade!</span><b> Your job is to survive until you are granted a shell, and help out cultists with casting runes!</b>"
 
-/mob/living/simple_animal/shade/death()
+/mob/living/simple_animal/hostile/construct/shade/death()
 	deathmessage = "lets out a contented sigh as [p_their()] form unwinds."
 	..()
 
-/mob/living/simple_animal/shade/canSuicide()
+/mob/living/simple_animal/hostile/construct/shade/canSuicide()
 	if(istype(loc, /obj/item/soulstone)) //do not suicide inside the soulstone
-		return 0
+		return FALSE
 	return ..()
 
-/mob/living/simple_animal/shade/attack_animal(mob/living/simple_animal/M)
+/mob/living/simple_animal/hostile/construct/shade/attack_animal(mob/living/simple_animal/M)
 	if(isconstruct(M))
 		var/mob/living/simple_animal/hostile/construct/C = M
 		if(!C.can_repair_constructs)
@@ -62,7 +42,7 @@
 	else if(src != M)
 		return ..()
 
-/mob/living/simple_animal/shade/attackby(obj/item/O, mob/user, params)  //Marker -Agouri
+/mob/living/simple_animal/hostile/construct/shade/attackby(obj/item/O, mob/user, params)  //Marker -Agouri
 	if(istype(O, /obj/item/soulstone))
 		var/obj/item/soulstone/SS = O
 		SS.transfer_soul("SHADE", src, user)

code/modules/mob/transform_procs.dm

@@ -617,7 +617,7 @@
 		return 1
 	if(ispath(MP, /mob/living/simple_animal/hostile/mushroom))
 		return 1
-	if(ispath(MP, /mob/living/simple_animal/shade))
+	if(ispath(MP, /mob/living/simple_animal/hostile/construct/shade))
 		return 1
 	if(ispath(MP, /mob/living/simple_animal/hostile/killertomato))
 		return 1