cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-24 20:47:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

good news everyone! It works!

Browse Source
This commit is contained in:
Aurorablade
2015-12-17 01:29:21 -05:00
parent 6eac1092bb
commit 52e43c4d2d
12 changed files with 72 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/dead/observer/observer.dm
+5 -19
View File
@@ -291,26 +291,12 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
if(!M.has_enabled_antagHUD && !check_rights(R_ADMIN|R_MOD,0))
M.has_enabled_antagHUD = 1
var/datum/atom_hud/A = huds[DATA_HUD_SECURITY_ADVANCED]
var/adding_hud = (usr in A.hudusers) ? 0 : 1
for(var/datum/atom_hud/H in huds)
if(istype(H, /datum/atom_hud/antag) || istype(H, /datum/atom_hud/data/human/security/advanced))
(adding_hud) ? H.add_hud_to(usr) : H.remove_hud_from(usr)
var/datum/atom_hud/A = huds[SPECIALROLE_HUD]
if(M.has_enabled_antagHUD || check_rights(R_ADMIN|R_MOD))
for(var/datum/atom_hud/H in huds)
if(istype(H, /datum/atom_hud/antag))
(usr in A.hudusers) ? H.add_hud_to(usr) : H.remove_hud_from(usr)
/*
if(M.antagHUD)
M.antagHUD = 0
for(var/datum/atom_hud/H in huds)
if(istype(H, /datum/atom_hud/antag))
H.remove_hud_from(usr)
usr << "You toggled your antag HUD Off."
else
M.antagHUD = 1
for(var/datum/atom_hud/H in huds)
if(istype(H, /datum/atom_hud/antag))
H.add_hud_to(usr)
usr << "You toggled your antag HUD On."
*/
/mob/dead/observer/proc/dead_tele(A in ghostteleportlocs)
set category = "Ghost"
code/modules/mob/transform_procs.dm
+1 -3
View File
@@ -97,7 +97,6 @@
if (should_gib)
spawn(0)
ticker.mode.update_cult_icons_removed(src.mind.current)
src.gib() // gib the body
else
spawn(0)//To prevent the proc from returning null.
@@ -105,7 +104,6 @@
"[src] disappears into the shadows, never to be seen again.", \
"You disappear into the shadows, never to be seen again.", \
"You hear strange noise, you can't quite place it.")
ticker.mode.update_cult_icons_removed(src.mind.current)
qdel(src)
new_spirit << "<font color=\"purple\"><b><i>You are a Mask of Nar'sie now. You are a tiny fragment of the unknowable entity that is the god.</b></i></font>"
@@ -115,7 +113,7 @@
// let spirits identify cultists
if(ticker.mode)
ticker.mode.update_cult_icons_added(new_spirit.mind.current)
ticker.mode.add_cult_icon_to_spirit(new_spirit)
// highlander test
there_can_be_only_one_mask(new_spirit)