Merge pull request #3933 from Ccomp5950/ghost_buff

Ghost buffed with AntagHUD

code/controllers/configuration.dm

@@ -43,7 +43,8 @@
 	var/Tickcomp = 0
 	var/socket_talk	= 0					// use socket_talk to communicate with other processes
 	var/list/resource_urls = null
-
+	var/antag_hud_allowed = 0			// Ghosts can turn on Antagovision to see a HUD of who is the bad guys this round.
+	var/antag_hud_restricted = 0                    // Ghosts that turn on Antagovision cannot rejoin the round.
 	var/list/mode_names = list()
 	var/list/modes = list()				// allowed modes
 	var/list/votable_modes = list()		// votable modes
@@ -385,6 +386,11 @@
 				if("ticklag")
 					Ticklag = text2num(value)
 
+				if("allow_antag_hud")
+					config.antag_hud_allowed = 1
+				if("antag_hud_restricted")
+					config.antag_hud_restricted = 1
+
 				if("socket_talk")
 					socket_talk = text2num(value)
 

code/modules/admin/admin_verbs.dm

@@ -70,6 +70,8 @@ var/list/admin_verbs_admin = list(
 	/client/proc/man_up,
 	/client/proc/global_man_up,
 	/client/proc/response_team, // Response Teams admin verb
+	/client/proc/toggle_antagHUD_use,
+	/client/proc/toggle_antagHUD_restrictions,
 	/client/proc/allow_character_respawn    /* Allows a ghost to respawn */	
 )
 var/list/admin_verbs_ban = list(

code/modules/admin/topic.dm

@@ -515,7 +515,7 @@
 	//Non-Human (Green)
 		counter = 0
 		jobs += "<table cellpadding='1' cellspacing='0' width='100%'>"
-		jobs += "<tr bgcolor='ccffcc'><th colspan='[length(nonhuman_positions)]'><a href='?src=\ref[src];jobban3=nonhumandept;jobban4=\ref[M]'>Non-human Positions</a></th></tr><tr align='center'>"
+		jobs += "<tr bgcolor='ccffcc'><th colspan='[length(nonhuman_positions)+1]'><a href='?src=\ref[src];jobban3=nonhumandept;jobban4=\ref[M]'>Non-human Positions</a></th></tr><tr align='center'>"
 		for(var/jobPos in nonhuman_positions)
 			if(!jobPos)	continue
 			var/datum/job/job = job_master.GetJob(jobPos)
@@ -533,11 +533,15 @@
 				counter = 0
 
 		//pAI isn't technically a job, but it goes in here.
+		
 		if(jobban_isbanned(M, "pAI"))
 			jobs += "<td width='20%'><a href='?src=\ref[src];jobban3=pAI;jobban4=\ref[M]'><font color=red>pAI</font></a></td>"
 		else
 			jobs += "<td width='20%'><a href='?src=\ref[src];jobban3=pAI;jobban4=\ref[M]'>pAI</a></td>"
-
+		if(jobban_isbanned(M, "AntagHUD"))
+			jobs += "<td width='20%'><a href='?src=\ref[src];jobban3=AntagHUD;jobban4=\ref[M]'><font color=red>AntagHUD</font></a></td>"
+		else
+			jobs += "<td width='20%'><a href='?src=\ref[src];jobban3=AntagHUD;jobban4=\ref[M]'>AntagHUD</a></td>"
 		jobs += "</tr></table>"
 
 	//Antagonist (Orange)
@@ -2594,4 +2598,4 @@
 				show_player_info(ckey)
 			if("list")
 				PlayerNotesPage(text2num(href_list["index"]))
-		return
+		return

code/modules/admin/verbs/randomverbs.dm

@@ -226,42 +226,116 @@ Allow admins to set players to be able to respawn/bypass 30 min wait, without th
 Ccomp's first proc.
 */
 
-/client/proc/allow_character_respawn()
-	set category = "Special Verbs"
-	set name = "Allow player to respawn"
-	set desc = "Let's the player bypass the 30 minute wait to respawn."
-	if(!holder)
-		src << "Only administrators may use this command."
-	var/any = 0
+/client/proc/get_ghosts(var/notify = 0,var/what = 2)
+	// what = 1, return ghosts ass list.
+	// what = 2, return mob list	
+
 	var/list/mobs = list()
 	var/list/ghosts = list()
-	var/list/sortmob = sortAtom(mob_list)    			// get the mob list.
-	for(var/mob/dead/observer/M in sortmob)	 
-		mobs.Add(M) 						//filter it where it's only ghosts
-		any = 1							//if no ghosts show up, any will just be 0
+	var/list/sortmob = sortAtom(mob_list)                           // get the mob list.
+	/var/any=0
+	for(var/mob/dead/observer/M in sortmob)
+		mobs.Add(M)                                             //filter it where it's only ghosts
+		any = 1                                                 //if no ghosts show up, any will just be 0
 	if(!any)
-		src << "There doesn't appear to be any ghosts for you to select."
+		if(notify)
+			src << "There doesn't appear to be any ghosts for you to select."
 		return
 
 	for(var/mob/M in mobs)
 		var/name = M.name
-		ghosts[name] = M					//get the name of the mob for the popup list
+		ghosts[name] = M                                        //get the name of the mob for the popup list
+	if(what==1)
+		return ghosts
+	else
+		return mobs
+
+
+/client/proc/allow_character_respawn()
+	set category = "Special Verbs"
+	set name = "Allow player to respawn"
+	set desc = "Let's the player bypass the 30 minute wait to respawn or allow them to re-enter their corpse."
+	if(!holder)
+		src << "Only administrators may use this command."
+	var/list/ghosts= get_ghosts(1,1)
 
 	var/target = input("Please, select a ghost!", "COME BACK TO LIFE!", null, null) as null|anything in ghosts
 	if(!target)
 		src << "Hrm, appears you didn't select a ghost"		// Sanity check, if no ghosts in the list we don't want to edit a null variable and cause a runtime error.
 		return
 
-	var/mob/M = ghosts[target]					
-	M.timeofdeath=-19999						/* time of death is checked in /mob/verb/abandon_mob() which is the Respawn verb.
+	var/mob/dead/observer/G = ghosts[target]					
+	if(G.has_enabled_antagHUD && config.antag_hud_restricted)	
+		var/response = alert(src, "Are you sure you wish to allow this individual to play?","Ghost has used AntagHUD","Yes","No")
+		if(response == "No") return	
+	G.timeofdeath=-19999						/* time of death is checked in /mob/verb/abandon_mob() which is the Respawn verb.
 									   timeofdeath is used for bodies on autopsy but since we're messing with a ghost I'm pretty sure
 									   there won't be an autopsy.
 									*/
-	M:show_message(text("\blue <B>You may now respawn.  You should roleplay as if you learned nothing about the round during your time with the dead.</B>"), 1)
-	log_admin("[key_name(usr)] allowed [key_name(M)] to bypass the 30 minute respawn limit")
-	message_admins("Admin [key_name_admin(usr)] allowed [key_name_admin(M)] to bypass the 30 minute respawn limit", 1)
+	G.has_enabled_antagHUD = 2	
+	G.can_reenter_corpse = 1
+
+	G:show_message(text("\blue <B>You may now respawn.  You should roleplay as if you learned nothing about the round during your time with the dead.</B>"), 1)
+	log_admin("[key_name(usr)] allowed [key_name(G)] to bypass the 30 minute respawn limit")
+	message_admins("Admin [key_name_admin(usr)] allowed [key_name_admin(G)] to bypass the 30 minute respawn limit", 1)
 
 	 
+/client/proc/toggle_antagHUD_use()
+	set category = "Server"
+	set name = "Toggle antagHUD usage"
+	set desc = "Toggles antagHUD usage for observers"
+
+	if(!holder)
+		src << "Only administrators may use this command."
+	var/action=""
+	if(config.antag_hud_allowed)
+		for(var/mob/dead/observer/g in get_ghosts())
+			if(g.antagHUD)
+				g.antagHUD = 0				// Disable it on those that have it enabled
+				g.has_enabled_antagHUD = 2		// We'll allow them to respawn
+				g << "\red <B>The Administrator has disabled AntagHUD </B>"    
+		config.antag_hud_allowed = 0
+		src << "\red <B>AntagHUD usage has been disabled</B>"
+		action = "disabled"
+	else
+		for(var/mob/dead/observer/g in get_ghosts())
+			g << "\blue <B>The Administrator has enabled AntagHUD </B>"	// Notify all observers they can now use AntagHUD
+		config.antag_hud_allowed = 1
+		action = "enabled"
+		src << "\blue <B>AntagHUD usage has been enabled</B>"
+		
+	
+	log_admin("[key_name(usr)] has [action] antagHUD usage for observers")
+	message_admins("Admin [key_name_admin(usr)] has [action] antagHUD usage for observers", 1)
+
+
+
+/client/proc/toggle_antagHUD_restrictions()
+	set category = "Server"
+	set name = "Toggle antagHUD Restrictions"
+	set desc = "Restricts players that have used antagHUD from being able to join this round."
+	if(!holder)
+		src << "Only administrators may use this command."
+	var/action=""
+	if(config.antag_hud_restricted)
+		for(var/mob/dead/observer/g in get_ghosts())
+			g << "\blue <B>The administrator has lifted restrictions on joining the round if you use AntagHUD</B>"
+		action = "lifted restrictions"
+		config.antag_hud_restricted = 0		
+		src << "\blue <B>AntagHUD restrictions have been lifted</B>"
+	else
+		for(var/mob/dead/observer/g in get_ghosts())
+			g << "\red <B>The administrator has placed restrictions on joining the round if you use AntagHUD</B>"
+			g << "\red <B>Your AntagHUD has been disabled, you may choose to re-enabled it but will be under restrictions </B>"
+			g.antagHUD = 0
+			g.has_enabled_antagHUD = 0
+		action = "placed restrictions"
+		config.antag_hud_restricted = 1
+		src << "\red <B>AntagHUD restrictions have been enabled</B>"
+
+	log_admin("[key_name(usr)] has [action] on joining the round if they use AntagHUD")
+	message_admins("Admin [key_name_admin(usr)] has [action] on joining the round if they use AntagHUD", 1)
+	
 
 
 

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

@@ -16,6 +16,8 @@
 	var/started_as_observer //This variable is set to 1 when you enter the game as an observer.
 							//If you died in the game and are a ghsot - this will remain as null.
 							//Note that this is not a reliable way to determine if admins started as observers, since they change mobs a lot.
+	var/has_enabled_antagHUD = 0
+	var/antagHUD = 0
 	universal_speak = 1
 	var/atom/movable/following = null
 /mob/dead/observer/New(mob/body)
@@ -70,6 +72,60 @@ Transfer_mind is there to check if mob is being deleted/not going to have a body
 Works together with spawning an observer, noted above.
 */
 
+/mob/dead/observer/Life()
+	..()
+	if(!loc) return		
+	if(!client) return 0
+
+
+	if(client.images.len)
+		for(var/image/hud in client.images)	
+			if(copytext(hud.icon_state,1,4) == "hud")
+				client.images.Remove(hud)
+	if(antagHUD)
+		var/list/target_list = list()
+		for(var/mob/living/target in oview(src))
+			if( target.mind&&(target.mind.special_role||issilicon(target)) )
+				target_list += target
+		if(target_list.len)
+			assess_targets(target_list, src)
+
+		
+
+/mob/dead/proc/assess_targets(list/target_list, mob/dead/observer/U)
+	var/icon/tempHud = 'icons/mob/hud.dmi'
+	for(var/mob/living/target in target_list)
+		if(iscarbon(target))
+			switch(target.mind.special_role)
+				if("traitor","Syndicate")
+					U.client.images += image(tempHud,target,"hudsyndicate")
+				if("Revolutionary")
+					U.client.images += image(tempHud,target,"hudrevolutionary")
+				if("Head Revolutionary")
+					U.client.images += image(tempHud,target,"hudheadrevolutionary")
+				if("Cultist")
+					U.client.images += image(tempHud,target,"hudcultist")
+				if("Changeling")
+					U.client.images += image(tempHud,target,"hudchangeling")
+				if("Wizard","Fake Wizard")
+					U.client.images += image(tempHud,target,"hudwizard")
+				if("Hunter","Sentinel","Drone","Queen")
+					U.client.images += image(tempHud,target,"hudalien")
+				if("Death Commando")
+					U.client.images += image(tempHud,target,"huddeathsquad")
+				if("Ninja")
+					U.client.images += image(tempHud,target,"hudninja")
+				else//If we don't know what role they have but they have one.
+					U.client.images += image(tempHud,target,"hudunknown1")
+		else//If the silicon mob has no law datum, no inherent laws, or a law zero, add them to the hud.
+			var/mob/living/silicon/silicon_target = target
+			if(!silicon_target.laws||(silicon_target.laws&&(silicon_target.laws.zeroth||!silicon_target.laws.inherent.len))||silicon_target.mind.special_role=="traitor")
+				if(isrobot(silicon_target))//Different icons for robutts and AI.
+					U.client.images += image(tempHud,silicon_target,"hudmalborg")
+				else
+					U.client.images += image(tempHud,silicon_target,"hudmalai")
+	return 1
+
 /mob/proc/ghostize(var/can_reenter_corpse = 1)
 	if(key)
 		var/mob/dead/observer/ghost = new(src)	//Transfer safety to observer spawning proc.
@@ -153,7 +209,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 	if(mind.current.key && copytext(mind.current.key,1,2)!="@")	//makes sure we don't accidentally kick any clients
 		usr << "<span class='warning'>Another consciousness is in your body...It is resisting you.</span>"
 		return
-	if(mind.current.ajourn && mind.current.stat != DEAD) 	//check if the corpse is astral-journeying (it's client ghosted using a cultist rune).
+	if(mind.current.ajourn && mind.current.stat != DEAD)	//check if the corpse is astral-journeying (it's client ghosted using a cultist rune).
 		var/obj/effect/rune/R = locate() in mind.current.loc	//whilst corpse is alive, we can only reenter the body if it's on the rune
 		if(!(R && R.word1 == cultwords["hell"] && R.word2 == cultwords["travel"] && R.word3 == cultwords["self"]))	//astral journeying rune
 			usr << "<span class='warning'>The astral cord that ties your body and your spirit has been severed. You are likely to wander the realm beyond until your body is finally dead and thus reunited with you.</span>"
@@ -162,6 +218,32 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 	mind.current.key = key
 	return 1
 
+/mob/dead/observer/verb/toggle_antagHUD()
+	set category = "Ghost"
+	set name = "Toggle AntagHUD"
+	set desc = "Toggles AntagHUD allowing you to see who is the antagonist"
+	if(!config.antag_hud_allowed && !client.holder)
+		src << "\red Admins have disabled this for this round."
+		return
+	if(!client)
+		return
+	var/mob/dead/observer/M = src
+	if(jobban_isbanned(M, "AntagHUD"))
+		src << "\red <B>You have been banned from using this feature</B>"
+		return
+	if(config.antag_hud_restricted && !M.has_enabled_antagHUD &&!client.holder) 
+		var/response = alert(src, "If you turn this on, you will not be able to take any part in the round.","Are you sure you want to turn this feature on?","Yes","No")
+		if(response == "No") return
+		M.can_reenter_corpse = 0
+	if(!M.has_enabled_antagHUD && !client.holder)
+		M.has_enabled_antagHUD = 1
+	if(M.antagHUD)
+		M.antagHUD = 0
+		src << "\blue <B>AntagHUD Disabled</B>"
+	else
+		M.antagHUD = 1
+		src << "\blue <B>AntagHUD Enabled</B>"
+
 /mob/dead/observer/proc/dead_tele()
 	set category = "Ghost"
 	set name = "Teleport"

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

@@ -27,6 +27,8 @@
 
 	proc/request_player()
 		for(var/mob/dead/observer/O in player_list)
+			if(O.has_enabled_antagHUD == 1 && config.antag_hud_restricted)
+				continue
 			if(jobban_isbanned(O, "pAI"))
 				continue
 			if(O.client)

code/modules/mob/living/silicon/pai/recruit.dm

@@ -191,6 +191,8 @@ var/datum/paiController/paiController			// Global handler for pAI candidates
 
 	proc/requestRecruits()
 		for(var/mob/dead/observer/O in player_list)
+			if(O.has_enabled_antagHUD == 1 && config.antag_hud_restricted)
+				continue
 			if(jobban_isbanned(O, "pAI"))
 				continue
 			if(asked.Find(O.key))

code/modules/mob/mob.dm

@@ -348,6 +348,10 @@ var/list/slot_equipment_priority = list( \
 		return
 	else
 		var/deathtime = world.time - src.timeofdeath
+		var/mob/dead/observer/G = src
+		if(G.has_enabled_antagHUD == 1 && config.antag_hud_restricted)
+			usr << "\blue <B>Upon using the antagHUD you forfeighted the ability to join the round.</B>"
+			return
 		var/deathtimeminutes = round(deathtime / 600)
 		var/pluralcheck = "minute"
 		if(deathtimeminutes == 0)
@@ -358,6 +362,7 @@ var/list/slot_equipment_priority = list( \
 			pluralcheck = " [deathtimeminutes] minutes and"
 		var/deathtimeseconds = round((deathtime - deathtimeminutes * 600) / 10,1)
 		usr << "You have been dead for[pluralcheck] [deathtimeseconds] seconds."
+		
 		if (deathtime < 18000)
 			usr << "You must wait 30 minutes to respawn!"
 			return

config/example/config.txt

@@ -121,6 +121,12 @@ VOTE_AUTOTRANSFER_INTERVAL 36000
 ## players' votes default to "No vote" (otherwise,  default to "No change")
 DEFAULT_NO_VOTE
 
+## Allow ghosts to see antagonist through AntagHUD
+ALLOW_ANTAG_HUD
+
+## If ghosts use antagHUD they are no longer allowed to join the round.
+ANTAG_HUD_RESTRICTED
+
 ## allow AI job
 ALLOW_AI