Merge pull request #11803 from RemieRichards/HandOfGod-Resurgence

Hand of God: Resurgence

code/modules/mob/dead/observer/observer.dm

@@ -385,6 +385,11 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 		if(href_list["reenter"])
 			reenter_corpse()
 
+//We don't want to update the current var
+//But we will still carry a mind.
+/mob/dead/observer/mind_initialize()
+	return
+
 /mob/dead/observer/verb/toggle_ghosthud()
 	set name = "Toggle Ghost HUD"
 	set desc = "Toggles your ghost's on-screen HUD"

code/modules/mob/living/carbon/alien/special/alien_embryo.dm

@@ -67,7 +67,7 @@ var/const/ALIEN_AFK_BRACKET = 450 // 45 seconds
 
 /obj/item/organ/internal/body_egg/alien_embryo/proc/AttemptGrow(gib_on_success = 1)
 	if(!owner) return
-	var/list/candidates = get_candidates(BE_ALIEN, ALIEN_AFK_BRACKET, "alien candidate")
+	var/list/candidates = get_candidates(ROLE_ALIEN, ALIEN_AFK_BRACKET, "alien candidate")
 	var/client/C = null
 
 	// To stop clientless larva, we will check that our host has a client

code/modules/mob/living/living_defines.dm

@@ -42,7 +42,6 @@
 	var/metabolism_efficiency = 1 //more or less efficiency to metabolize helpful/harmful reagents and regulate body temperature..
 	var/list/image/staticOverlays = list()
 	var/has_limbs = 0 //does the mob have distinct limbs?(arms,legs, chest,head)
-	var/list/datum/action/actions = list()
 
 	var/list/pipes_shown = list()
 	var/last_played_vent

code/modules/mob/living/silicon/login.dm

@@ -5,4 +5,5 @@
 		ticker.mode.remove_gangster(mind, remove_bosses=1)
 		ticker.mode.remove_thrall(mind,0)
 		ticker.mode.remove_shadowling(mind)
+		ticker.mode.remove_hog_follower(mind,0)
 	..()

code/modules/mob/living/silicon/robot/login.dm

@@ -3,10 +3,12 @@
 	..()
 	regenerate_icons()
 	show_laws(0)
-	if(mind)	ticker.mode.remove_revolutionary(mind)
-	if(mind)	ticker.mode.remove_gangster(mind,1,remove_bosses=1)
-	if(mind)	ticker.mode.remove_thrall(mind,0)
-	if(mind)	ticker.mode.remove_shadowling(mind)
+	if(mind)
+		ticker.mode.remove_revolutionary(mind)
+		ticker.mode.remove_gangster(mind,1,remove_bosses=1)
+		ticker.mode.remove_thrall(mind,0)
+		ticker.mode.remove_shadowling(mind)
+		ticker.mode.remove_hog_follower(mind, 0)
 
 /mob/living/silicon/robot/update_hotkey_mode()
 	winset(src, null, "mainwindow.macro=borghotkeymode hotkey_toggle.is-checked=true mapwindow.map.focus=true input.background-color=#F0F0F0")

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

@@ -554,7 +554,7 @@
 		return
 	used = TRUE
 	user << "[use_message]"
-	var/list/mob/dead/observer/candidates = pollCandidates("Do you want to play as the [mob_name] of [user.real_name]?", "pAI", null, FALSE, 100)
+	var/list/mob/dead/observer/candidates = pollCandidates("Do you want to play as the [mob_name] of [user.real_name]?", ROLE_PAI, null, FALSE, 100)
 	var/mob/dead/observer/theghost = null
 
 	if(candidates.len)

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

@@ -193,7 +193,7 @@
 /datum/round_event/morph/proc/get_morph(end_if_fail = 0)
 	key_of_morph = null
 	if(!key_of_morph)
-		var/list/candidates = get_candidates(BE_ALIEN)
+		var/list/candidates = get_candidates(ROLE_ALIEN)
 		if(!candidates.len)
 			if(end_if_fail)
 				return 0

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

@@ -402,7 +402,7 @@
 				key_of_revenant = client_to_revive.key
 	if(!key_of_revenant)
 		message_admins("The new revenant's old client either could not be found or is in a new, living mob - grabbing a random candidate instead...")
-		var/list/candidates = get_candidates(BE_REVENANT)
+		var/list/candidates = get_candidates(ROLE_REVENANT)
 		if(!candidates.len)
 			qdel(R)
 			message_admins("No candidates were found for the new revenant. Oh well!")

code/modules/mob/living/simple_animal/revenant/revenant_spawn_event.dm

@@ -21,7 +21,7 @@
 		return
 	key_of_revenant = null
 	if(!key_of_revenant)
-		var/list/candidates = get_candidates(BE_REVENANT)
+		var/list/candidates = get_candidates(ROLE_REVENANT)
 		if(!candidates.len)
 			if(end_if_fail)
 				return 0

code/modules/mob/living/simple_animal/slaughter/slaughterevent.dm

@@ -15,7 +15,7 @@
 /datum/round_event/slaughter/proc/get_slaughter(end_if_fail = 0)
 	key_of_slaughter = null
 	if(!key_of_slaughter)
-		var/list/candidates = get_candidates(BE_ALIEN)
+		var/list/candidates = get_candidates(ROLE_ALIEN)
 		if(!candidates.len)
 			if(end_if_fail)
 				return 0

code/modules/mob/login.dm

@@ -57,6 +57,8 @@
 
 	add_click_catcher()
 
+	sync_mind()
+
 // Calling update_interface() in /mob/Login() causes the Cyborg to immediately be ghosted; because of winget().
 // Calling it in the overriden Login, such as /mob/living/Login() doesn't cause this.
 /mob/proc/update_interface()

code/modules/mob/mob_defines.dm

@@ -6,6 +6,7 @@
 	hud_possible = list(ANTAG_HUD)
 	pressure_resistance = 8
 	var/datum/mind/mind
+	var/list/datum/action/actions = list()
 
 	var/stat = 0 //Whether a mob is alive or dead. TODO: Move this to living - Nodrak
 

code/modules/mob/transform_procs.dm

@@ -433,6 +433,23 @@
 	gib(src)
 
 
+/mob/proc/become_god(var/side_colour)
+	var/mob/camera/god/G = new /mob/camera/god(loc)
+	G.side = side_colour
+	G.invisibility = 40
+	if(mind)
+		mind.transfer_to(G)
+	else
+		G.key = key
+
+	G.job = "Deity"
+	G.rename_self("deity", 0)
+	G.update_icons()
+
+	. = G
+	qdel(src)
+
+
 
 /mob/living/carbon/human/proc/corgize()
 	if (notransform)