cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 03:33:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3940 from Ccomp5950/ghost_buff

Browse Source 
AntagHUD's player verbs will now disappear from the players view if disabled by admin or by configuration options.
This commit is contained in:
Chinsky
2013-11-20 10:32:18 -08:00
parent 8a0b08d291 46218e71f1
commit 4beabc587d
3 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/admin/verbs/randomverbs.dm
View File

@@ -290,6 +290,8 @@ Ccomp's first proc.
var/action="" var/action=""
if(config.antag_hud_allowed) if(config.antag_hud_allowed)
for(var/mob/dead/observer/g in get_ghosts()) for(var/mob/dead/observer/g in get_ghosts())
if(!g.client.holder) //Remove the verb from non-admin ghosts
g.verbs -= /mob/dead/observer/verb/toggle_antagHUD
if(g.antagHUD) if(g.antagHUD)
g.antagHUD = 0 // Disable it on those that have it enabled g.antagHUD = 0 // Disable it on those that have it enabled
g.has_enabled_antagHUD = 2 // We'll allow them to respawn g.has_enabled_antagHUD = 2 // We'll allow them to respawn
@@ -299,6 +301,8 @@ Ccomp's first proc.
action = "disabled" action = "disabled"
else else
for(var/mob/dead/observer/g in get_ghosts()) for(var/mob/dead/observer/g in get_ghosts())
if(!g.client.holder) // Add the verb back for all non-admin ghosts
g.verbs += /mob/dead/observer/verb/toggle_antagHUD
g << "\blue <B>The Administrator has enabled AntagHUD </B>" // Notify all observers they can now use AntagHUD g << "\blue <B>The Administrator has enabled AntagHUD </B>" // Notify all observers they can now use AntagHUD
config.antag_hud_allowed = 1 config.antag_hud_allowed = 1
action = "enabled" action = "enabled"

3
code/modules/mob/dead/observer/observer.dm
View File

@@ -25,6 +25,7 @@
see_invisible = SEE_INVISIBLE_OBSERVER see_invisible = SEE_INVISIBLE_OBSERVER
see_in_dark = 100 see_in_dark = 100
verbs += /mob/dead/observer/proc/dead_tele verbs += /mob/dead/observer/proc/dead_tele
stat = DEAD stat = DEAD
var/turf/T var/turf/T
@@ -149,6 +150,8 @@ Works together with spawning an observer, noted above.
ghost.can_reenter_corpse = can_reenter_corpse ghost.can_reenter_corpse = can_reenter_corpse
ghost.timeofdeath = src.timeofdeath //BS12 EDIT ghost.timeofdeath = src.timeofdeath //BS12 EDIT
ghost.key = key ghost.key = key
if(!ghost.client.holder && !config.antag_hud_allowed) // For new ghosts we remove the verb from even showing up if it's not allowed.
ghost.verbs -= /mob/dead/observer/verb/toggle_antagHUD // Poor guys, don't know what they are missing!
return ghost return ghost
/* /*

4
code/modules/mob/new_player/new_player.dm
View File

@@ -114,6 +114,7 @@
spawning = 1 spawning = 1
src << sound(null, repeat = 0, wait = 0, volume = 85, channel = 1) // MAD JAMS cant last forever yo src << sound(null, repeat = 0, wait = 0, volume = 85, channel = 1) // MAD JAMS cant last forever yo
observer.started_as_observer = 1 observer.started_as_observer = 1
close_spawn_windows() close_spawn_windows()
var/obj/O = locate("landmark*Observer-Start") var/obj/O = locate("landmark*Observer-Start")
@@ -129,8 +130,11 @@
client.prefs.real_name = random_name(client.prefs.gender) client.prefs.real_name = random_name(client.prefs.gender)
observer.real_name = client.prefs.real_name observer.real_name = client.prefs.real_name
observer.name = observer.real_name observer.name = observer.real_name
if(!client.holder && !config.antag_hud_allowed) // For new ghosts we remove the verb from even showing up if it's not allowed.
observer.verbs -= /mob/dead/observer/verb/toggle_antagHUD // Poor guys, don't know what they are missing!
observer.key = key observer.key = key
del(src) del(src)
return 1 return 1
if(href_list["late_join"]) if(href_list["late_join"])