2017 Cult Overhaul P1: Cult Master and Datum Cult

code/modules/mob/living/death.dm

@@ -49,8 +49,8 @@
 	timeofdeath = world.time
 	tod = worldtime2text()
 	var/turf/T = get_turf(src)
+	var/area/A = get_area(T)
 	if(mind && mind.name && mind.active && (!(T.flags & NO_DEATHRATTLE)))
-		var/area/A = get_area(T)
 		var/rendered = "<span class='deadsay'><b>[mind.name]</b> has died at <b>[A.name]</b>.</span>"
 		deadchat_broadcast(rendered, follow_target = src, turf_target = T, message_type=DEADCHAT_DEATHRATTLE)
 	if(mind)

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

@@ -31,12 +31,20 @@
 	deathmessage = "collapses in a shattered heap."
 	var/list/construct_spells = list()
 	var/playstyle_string = "<b>You are a generic construct! Your job is to not exist, and you should probably adminhelp this.</b>"
+	var/master = null
+	var/seeking = FALSE
 
 /mob/living/simple_animal/hostile/construct/Initialize()
 	. = ..()
 	for(var/spell in construct_spells)
 		AddSpell(new spell(null))
 
+/mob/living/simple_animal/hostile/construct/Destroy()
+	for(var/X in actions)
+		var/datum/action/A = X
+		qdel(A)
+	..()
+
 /mob/living/simple_animal/hostile/construct/Login()
 	..()
 	to_chat(src, playstyle_string)

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

@@ -0,0 +1,40 @@
+diff a/code/modules/mob/living/simple_animal/constructs.dm b/code/modules/mob/living/simple_animal/constructs.dm	(rejected hunks)
+@@ -41,14 +41,11 @@
+ 	for(var/spell in construct_spells)
+ 		AddSpell(new spell(null))
+ 
+-<<<<<<< HEAD
+ /mob/living/simple_animal/hostile/construct/Destroy()
+ 	for(var/X in actions)
+ 		var/datum/action/A = X
+ 		qdel(A)
+ 	..()
+-=======
+->>>>>>> a7603e4aba50d410795d5207e6d5e929b2401cb9
+ 
+ /mob/living/simple_animal/hostile/construct/Login()
+ 	..()
+@@ -288,8 +285,6 @@
+ 	environment_smash = 1 //only token destruction, don't smash the cult wall NO STOP
+ 
+ 
+-
+-<<<<<<< HEAD
+ ///////////////////////Master-Tracker///////////////////////
+ 
+ /datum/action/innate/seek_master
+@@ -320,7 +315,7 @@
+ 		the_construct.seeking = TRUE
+ 		to_chat(the_construct, "<span class='cultitalic'>You are now tracking your master.</span>")
+ 
+-=======
++
+ /////////////////////////////ui stuff/////////////////////////////
+ 
+ /mob/living/simple_animal/hostile/construct/update_health_hud()
+@@ -337,4 +332,4 @@
+ 			hud_used.healths.icon_state = "[icon_state]_health5"
+ 		else
+ 			hud_used.healths.icon_state = "[icon_state]_health6"
+->>>>>>> a7603e4aba50d410795d5207e6d5e929b2401cb9
++