From fba1c1129a0e4fbe802431f2278e3b9fab9b0cf7 Mon Sep 17 00:00:00 2001 From: Nerd Lord Date: Sun, 29 Nov 2015 13:11:18 -0500 Subject: [PATCH] fine, fine fuck okay sure don't sacrifice dogs, okay? nar-sie has standards, of a sort --- code/game/gamemodes/cult/ritual.dm | 6 ++++++ code/game/gamemodes/cult/runes.dm | 6 ++++-- code/modules/mob/living/simple_animal/constructs.dm | 6 +++--- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/code/game/gamemodes/cult/ritual.dm b/code/game/gamemodes/cult/ritual.dm index 39b7bc07a80..55ce399d19a 100644 --- a/code/game/gamemodes/cult/ritual.dm +++ b/code/game/gamemodes/cult/ritual.dm @@ -59,6 +59,12 @@ It also contains rune words, which are soon to be removed. user << "The scriptures of the Geometer. Allows the scribing of runes and access to the knowledge archives of the cult of Nar-Sie." /obj/item/weapon/tome/attack(mob/living/M, mob/living/user) + if(istype(M,/mob/dead/observer)) + M.invisibility = 0 + user.visible_message("[user] strikes the air with [src], and a ghost appears!", \ + "You drag the ghost to your plane of reality!") + add_logs(user, M, "smacked", src) + return if(!istype(M)) return if(!iscultist(user)) diff --git a/code/game/gamemodes/cult/runes.dm b/code/game/gamemodes/cult/runes.dm index 2859a1b5d07..19d682e3e1b 100644 --- a/code/game/gamemodes/cult/runes.dm +++ b/code/game/gamemodes/cult/runes.dm @@ -378,10 +378,12 @@ var/list/teleport_other_runes = list() /obj/effect/rune/sacrifice/proc/sac(mob/living/T) var/sacrifice_fulfilled if(T) - if(istype(T, /mob/living/simple_animal/pet)) + if(istype(T, /mob/living/simple_animal/pet/dog)) for(var/mob/living/carbon/C in range(3,src)) if(iscultist(C)) - C << "\"A tasty morsel.\"" + C << "\"Even I have standards, such as they are!\"" + if(C.reagents) + C.reagents.add_reagent("hell_water", 2) if(T.mind) sacrificed.Add(T.mind) if(is_sacrifice_target(T.mind)) diff --git a/code/modules/mob/living/simple_animal/constructs.dm b/code/modules/mob/living/simple_animal/constructs.dm index 32c84735f64..0fe833ac3de 100644 --- a/code/modules/mob/living/simple_animal/constructs.dm +++ b/code/modules/mob/living/simple_animal/constructs.dm @@ -56,7 +56,7 @@ adjustBruteLoss(-5) if(src != M) Beam(M,icon_state="sendbeam",icon='icons/effects/effects.dmi',time=4) - M.emote("me", 1, "mends some of \the [src]'s wounds.") + M.emote("me", 1, "repairs some of \the [src]'s dents.") else if(src != M) ..() @@ -78,7 +78,7 @@ /mob/living/simple_animal/construct/armored name = "Juggernaut" real_name = "Juggernaut" - desc = "A massive, armored construct build to spearhead attacks and soak up enemy fire." + desc = "A massive, armored construct built to spearhead attacks and soak up enemy fire." icon_state = "behemoth" icon_living = "behemoth" maxHealth = 250 @@ -134,7 +134,7 @@ /mob/living/simple_animal/construct/wraith name = "Wraith" real_name = "Wraith" - desc = "A wicked, clawed shell built to assassinate enemies and sow chaos behind enemy lines." + desc = "A wicked, clawed shell constructed to assassinate enemies and sow chaos behind enemy lines." icon_state = "floating" icon_living = "floating" maxHealth = 75