From fdf02fc2a017b46d9fec7d52047bd19e5acba4fc Mon Sep 17 00:00:00 2001 From: Aurorablade Date: Sun, 29 Jan 2017 21:57:08 -0500 Subject: [PATCH] ......TIGERCATTTTT!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!111111111111111111111111111 --- code/game/gamemodes/cult/runes.dm | 4 +--- code/game/gamemodes/wizard/soulstone.dm | 4 ++-- code/modules/mob/living/carbon/human/npcs.dm | 8 +++++++- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/code/game/gamemodes/cult/runes.dm b/code/game/gamemodes/cult/runes.dm index af488fdb028..1e0fd243966 100644 --- a/code/game/gamemodes/cult/runes.dm +++ b/code/game/gamemodes/cult/runes.dm @@ -972,10 +972,8 @@ var/list/teleport_runes = list() if(O.client && !jobban_isbanned(O, ROLE_CULTIST)) ghosts_on_rune |= O var/mob/dead/observer/ghost_to_spawn = pick(ghosts_on_rune) - var/mob/living/carbon/human/new_human = new(get_turf(src)) + var/mob/living/carbon/human/manifested/new_human = new(get_turf(src)) new_human.real_name = ghost_to_spawn.real_name - new_human.alpha = 150 //Makes them translucent - new_human.color = "grey" //heh..cult greytide...litterly... ..() visible_message("A cloud of red mist forms above [src], and from within steps... a man.") to_chat(user, "Your blood begins flowing into [src]. You must remain in place and conscious to maintain the forms of those summoned. This will hurt you slowly but surely...") diff --git a/code/game/gamemodes/wizard/soulstone.dm b/code/game/gamemodes/wizard/soulstone.dm index 1428b1a915d..0e1afe46bc6 100644 --- a/code/game/gamemodes/wizard/soulstone.dm +++ b/code/game/gamemodes/wizard/soulstone.dm @@ -26,8 +26,8 @@ to_chat(user, "A mysterious force prevents you from trapping this being's soul.") return ..() - if(iscultist(M)) - to_chat(user, "This souls is already MINE.") + if(istype(M, /mob/living/carbon/human/manifested)) + to_chat(user, "This soul is already MINE.") return ..() M.create_attack_log("Has had their soul captured with [src.name] by [key_name(user)]") diff --git a/code/modules/mob/living/carbon/human/npcs.dm b/code/modules/mob/living/carbon/human/npcs.dm index b66a0ee52ba..cc38afbcdd0 100644 --- a/code/modules/mob/living/carbon/human/npcs.dm +++ b/code/modules/mob/living/carbon/human/npcs.dm @@ -10,4 +10,10 @@ spawn(1) name = "Pun Pun" real_name = name - equip_to_slot(new /obj/item/clothing/under/punpun(src), slot_w_uniform) \ No newline at end of file + equip_to_slot(new /obj/item/clothing/under/punpun(src), slot_w_uniform) + +//For Cult mode...God..dammit...tiger... +/mob/living/carbon/human/manifested + name = "Tormented Soul" + alpha = 150 //Makes them translucent + color = "grey" //heh..cult greytide...litterly... \ No newline at end of file