shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #10465 from Putnam3145/more-dojo-tweaks

Browse Source 
More ghost dojo tweaks
This commit is contained in:
Ghom
2020-01-11 15:03:45 +01:00
committed by GitHub
parent 86beeb513c 312da86424
commit 5dc598e2ea
2 changed files with 53 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/ghost_role_spawners.dm
+22 -1
View File
@@ -619,6 +619,24 @@
skip_reentry_check = TRUE
banType = "ghostcafe"
/datum/action/toggle_dead_chat_mob
icon_icon = 'icons/mob/mob.dmi'
button_icon_state = "ghost"
name = "Toggle deadchat"
desc = "Turn off or on your ability to hear ghosts."
/datum/action/toggle_dead_chat_mob/Trigger()
if(!..())
return 0
var/mob/M = target
if(HAS_TRAIT_FROM(M,TRAIT_SIXTHSENSE,GHOSTROLE_TRAIT))
REMOVE_TRAIT(M,TRAIT_SIXTHSENSE,GHOSTROLE_TRAIT)
to_chat(M,"<span class='notice'>You're no longer hearing deadchat.</span>")
else
ADD_TRAIT(M,TRAIT_SIXTHSENSE,GHOSTROLE_TRAIT)
to_chat(M,"<span class='notice'>You're once again longer hearing deadchat.</span>")
/obj/effect/mob_spawn/human/ghostcafe/special(mob/living/carbon/human/new_spawn)
if(new_spawn.client)
new_spawn.client.prefs.copy_to(new_spawn)
@@ -629,10 +647,13 @@
new_spawn.AddElement(/datum/element/ghost_role_eligibility)
ADD_TRAIT(new_spawn, TRAIT_SIXTHSENSE, GHOSTROLE_TRAIT)
ADD_TRAIT(new_spawn,TRAIT_EXEMPT_HEALTH_EVENTS,GHOSTROLE_TRAIT)
to_chat(new_spawn,"<span class='boldwarning'>You maybe sharing your cafe with some ninja-captured individuals, so make sure to only interact with the ghosts you hear as a ghost!</span>")
ADD_TRAIT(new_spawn,TRAIT_PACIFISM,GHOSTROLE_TRAIT)
to_chat(new_spawn,"<span class='boldwarning'>You may be sharing your cafe with some ninja-captured individuals, so make sure to only interact with the ghosts you hear as a ghost!</span>")
to_chat(new_spawn,"<span class='boldwarning'>You can turn yourself into a ghost and freely reenter your body with the ghost action.</span>")
var/datum/action/ghost/G = new(new_spawn)
G.Grant(new_spawn)
var/datum/action/toggle_dead_chat_mob/D = new(new_spawn)
D.Grant(new_spawn)
/datum/outfit/ghostcafe
name = "ID, jumpsuit and shoes"