cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 19:22:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2917 from VOREStation/vplk-reghosts

Browse Source 
Make ghosts invisible again.
This commit is contained in:
Aronai Sieyes
2018-01-31 14:41:41 -05:00
committed by GitHub
parent 378c0bcd06 f6f3abe5ec
commit cc857cab00
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/admin/admin_verbs.dm
View File

@@ -509,9 +509,11 @@ var/list/admin_verbs_event_manager = list(
if(choice == "Show 'em!" && mob.plane_holder) if(choice == "Show 'em!" && mob.plane_holder)
mob.plane_holder.set_vis(VIS_GHOSTS,TRUE) mob.plane_holder.set_vis(VIS_GHOSTS,TRUE)
usr.see_invisible = SEE_INVISIBLE_CULT
to_chat(src,"<span class='notice'>Ghosts are now visible (while in this mob).</span>") to_chat(src,"<span class='notice'>Ghosts are now visible (while in this mob).</span>")
else if(mob.plane_holder) else if(mob.plane_holder)
mob.plane_holder.set_vis(VIS_GHOSTS,FALSE) mob.plane_holder.set_vis(VIS_GHOSTS,FALSE)
usr.see_invisible = initial(mob.see_invisible)
to_chat(src,"<span class='notice'>Ghosts are now hidden (while in this mob).</span>") to_chat(src,"<span class='notice'>Ghosts are now hidden (while in this mob).</span>")
/client/proc/invisimin() /client/proc/invisimin()

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

@@ -15,6 +15,7 @@
canmove = 0 canmove = 0
blinded = 0 blinded = 0
anchored = 1 // don't get pushed around anchored = 1 // don't get pushed around
invisibility = INVISIBILITY_OBSERVER
var/can_reenter_corpse var/can_reenter_corpse
var/datum/hud/living/carbon/hud = null // hud var/datum/hud/living/carbon/hud = null // hud
var/bootime = 0 var/bootime = 0
@@ -661,7 +662,8 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
else else
src << "<span class='info'>You are now visible!</span>" src << "<span class='info'>You are now visible!</span>"
plane = PLANE_GHOSTS ? PLANE_WORLD : PLANE_GHOSTS plane = (plane == PLANE_GHOSTS) ? PLANE_WORLD : PLANE_GHOSTS
invisibility = (plane == PLANE_WORLD) ? 0 : INVISIBILITY_OBSERVER
// Give the ghost a cult icon which should be visible only to itself // Give the ghost a cult icon which should be visible only to itself
toggle_icon("cult") toggle_icon("cult")