From c4fc8defec762353f84b9f0abdbf848b07c8451e Mon Sep 17 00:00:00 2001
From: Tkdrg <tkdrg@users.noreply.github.com>
Date: Sun, 8 Nov 2015 20:28:38 -0300
Subject: [PATCH] HoG fixes

Fixes check antag when gods are dead.
Borging antags no longer announces removal of antag status.
Removes stun from Smite.
Fixes #12929
Fixes #12927
Fixes #12936
---
 code/game/gamemodes/game_mode.dm        |  8 ++++----
 code/game/gamemodes/handofgod/powers.dm |  1 -
 code/modules/admin/player_panel.dm      | 18 ++++++++++++------
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm
index c1edc75e1e4..fe7ef07e784 100644
--- a/code/game/gamemodes/game_mode.dm
+++ b/code/game/gamemodes/game_mode.dm
@@ -519,7 +519,7 @@
 	return max(0, enemy_minimum_age - C.player_age)
 
 /datum/game_mode/proc/remove_antag_for_borging(datum/mind/newborgie)
-	ticker.mode.remove_cultist(newborgie, 1)
-	ticker.mode.remove_revolutionary(newborgie, 1)
-	ticker.mode.remove_gangster(newborgie, 1, remove_bosses=1)
-	ticker.mode.remove_hog_follower(newborgie, 1)
+	ticker.mode.remove_cultist(newborgie, 0)
+	ticker.mode.remove_revolutionary(newborgie, 0)
+	ticker.mode.remove_gangster(newborgie, 0, remove_bosses=1)
+	ticker.mode.remove_hog_follower(newborgie, 0)
diff --git a/code/game/gamemodes/handofgod/powers.dm b/code/game/gamemodes/handofgod/powers.dm
index fadb0667b12..6979b2be704 100644
--- a/code/game/gamemodes/handofgod/powers.dm
+++ b/code/game/gamemodes/handofgod/powers.dm
@@ -177,7 +177,6 @@
 	for(var/mob/living/L in get_turf(src))
 		L.adjustFireLoss(20)
 		L.adjustBruteLoss(20)
-		L.Weaken(2)
 		L << "<span class='danger'><B>You feel the wrath of [name]!<B></span>"
 		has_smitten = 1
 	if(has_smitten)
diff --git a/code/modules/admin/player_panel.dm b/code/modules/admin/player_panel.dm
index d6ce96bc9fb..9e4ee5c8e26 100644
--- a/code/modules/admin/player_panel.dm
+++ b/code/modules/admin/player_panel.dm
@@ -444,42 +444,48 @@
 			dat += "<br><table cellspacing=5><tr><td><B>Red Deity</B></td><td></td></tr>"
 			for(var/datum/mind/N in ticker.mode.red_deities)
 				var/mob/M = N.current
-				dat += "<tr><td>Red Deity: <a href='?_src_=holder;adminplayeropts=\ref[M]'>[M.real_name]</a>[M.client ? "" : " <i>(ghost)</i>"][M.stat == 2 ? " <b><font color=red>(DEAD)</font></b>" : ""]</td>"
+				if(M)
+					dat += "<tr><td>Red Deity: <a href='?_src_=holder;adminplayeropts=\ref[M]'>[M.real_name]</a>[M.client ? "" : " <i>(ghost)</i>"][M.stat == 2 ? " <b><font color=red>(DEAD)</font></b>" : ""]</td>"
 			dat += "</table>"
 
 		if(ticker.mode.blue_deities.len)
 			dat += "<br><table cellspacing=5><tr><td><B>Blue Deity</B></td><td></td></tr>"
 			for(var/datum/mind/N in ticker.mode.blue_deities)
 				var/mob/M = N.current
-				dat += "<tr><td>Blue Deity: <a href='?_src_=holder;adminplayeropts=\ref[M]'>[M.real_name]</a>[M.client ? "" : " <i>(ghost)</i>"][M.stat == 2 ? " <b><font color=red>(DEAD)</font></b>" : ""]</td>"
+				if(M)
+					dat += "<tr><td>Blue Deity: <a href='?_src_=holder;adminplayeropts=\ref[M]'>[M.real_name]</a>[M.client ? "" : " <i>(ghost)</i>"][M.stat == 2 ? " <b><font color=red>(DEAD)</font></b>" : ""]</td>"
 			dat += "</table>"
 
 		if(ticker.mode.red_deity_prophets.len)
 			dat += "<br><table cellspacing=5><tr><td><B>Red Deity Prophets</B></td><td></td></tr>"
 			for(var/datum/mind/N in ticker.mode.red_deity_prophets)
 				var/mob/M = N.current
-				dat += "<tr><td>Red Deity Prophet: <a href='?_src_=holder;adminplayeropts=\ref[M]'>[M.real_name]</a>[M.client ? "" : " <i>(ghost)</i>"][M.stat == 2 ? " <b><font color=red>(DEAD)</font></b>" : ""]</td>"
+				if(M)
+					dat += "<tr><td>Red Deity Prophet: <a href='?_src_=holder;adminplayeropts=\ref[M]'>[M.real_name]</a>[M.client ? "" : " <i>(ghost)</i>"][M.stat == 2 ? " <b><font color=red>(DEAD)</font></b>" : ""]</td>"
 			dat += "</table>"
 
 		if(ticker.mode.blue_deity_prophets.len)
 			dat += "<br><table cellspacing=5><tr><td><B>Blue Deity Prophets</B></td><td></td></tr>"
 			for(var/datum/mind/N in ticker.mode.blue_deity_prophets)
 				var/mob/M = N.current
-				dat += "<tr><td>Blue Deity Prophet: <a href='?_src_=holder;adminplayeropts=\ref[M]'>[M.real_name]</a>[M.client ? "" : " <i>(ghost)</i>"][M.stat == 2 ? " <b><font color=red>(DEAD)</font></b>" : ""]</td>"
+				if(M)
+					dat += "<tr><td>Blue Deity Prophet: <a href='?_src_=holder;adminplayeropts=\ref[M]'>[M.real_name]</a>[M.client ? "" : " <i>(ghost)</i>"][M.stat == 2 ? " <b><font color=red>(DEAD)</font></b>" : ""]</td>"
 			dat += "</table>"
 
 		if(ticker.mode.red_deity_followers.len)
 			dat += "<br><table cellspacing=5><tr><td><B>Red Deity Followers</B></td><td></td></tr>"
 			for(var/datum/mind/N in ticker.mode.red_deity_followers)
 				var/mob/M = N.current
-				dat += "<tr><td>Red Deity Followers: <a href='?_src_=holder;adminplayeropts=\ref[M]'>[M.real_name]</a>[M.client ? "" : " <i>(ghost)</i>"][M.stat == 2 ? " <b><font color=red>(DEAD)</font></b>" : ""]</td>"
+				if(M)
+					dat += "<tr><td>Red Deity Followers: <a href='?_src_=holder;adminplayeropts=\ref[M]'>[M.real_name]</a>[M.client ? "" : " <i>(ghost)</i>"][M.stat == 2 ? " <b><font color=red>(DEAD)</font></b>" : ""]</td>"
 			dat += "</table>"
 
 		if(ticker.mode.blue_deity_followers.len)
 			dat += "<br><table cellspacing=5><tr><td><B>Blue Deity Followers</B></td><td></td></tr>"
 			for(var/datum/mind/N in ticker.mode.blue_deity_followers)
 				var/mob/M = N.current
-				dat += "<tr><td>Blue Deity Followers: <a href='?_src_=holder;adminplayeropts=\ref[M]'>[M.real_name]</a>[M.client ? "" : " <i>(ghost)</i>"][M.stat == 2 ? " <b><font color=red>(DEAD)</font></b>" : ""]</td>"
+				if(M)
+					dat += "<tr><td>Blue Deity Followers: <a href='?_src_=holder;adminplayeropts=\ref[M]'>[M.real_name]</a>[M.client ? "" : " <i>(ghost)</i>"][M.stat == 2 ? " <b><font color=red>(DEAD)</font></b>" : ""]</td>"
 			dat += "</table>"
 
 		if(ticker.mode.traitors.len > 0)