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

hate the mask of narnar

Browse Source
This commit is contained in:
Aurorablade
2015-12-15 22:27:30 -05:00
parent c3f662a6dc
commit 6eac1092bb
5 changed files with 16 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/dead/observer/observer.dm
+8 -6
View File
@@ -253,11 +253,6 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
return 1
/mob/dead/observer/proc/show_me_the_hud(hud_index)
var/datum/atom_hud/H = huds[hud_index]
H.add_hud_to(src)
data_hud_seen = hud_index
//src << "Datahud"//debug print
/mob/dead/observer/verb/toggle_medHUD()
set category = "Ghost"
@@ -296,6 +291,13 @@ 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[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)
@@ -308,7 +310,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
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
+5 -3
View File
@@ -97,6 +97,7 @@
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.
@@ -104,6 +105,7 @@
"[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>"
@@ -113,7 +115,7 @@
// let spirits identify cultists
if(ticker.mode)
ticker.mode.reset_cult_icons_for_spirit(new_spirit)
ticker.mode.update_cult_icons_added(new_spirit.mind.current)
// highlander test
there_can_be_only_one_mask(new_spirit)
@@ -320,7 +322,7 @@
/mob/proc/safe_respawn(var/MP)
if(!MP)
return 0
return 0
if(ispath(MP, /mob/living/simple_animal/pet/cat))
return 1
@@ -347,7 +349,7 @@
if(ispath(MP, /mob/living/simple_animal/borer) && !jobban_isbanned(src, "alien") && !jobban_isbanned(src, "Syndicate"))
return 1
if(ispath(MP, /mob/living/simple_animal/diona) && !jobban_isbanned(src, "Dionaea"))
return 1