From 11e86c434e16b2c691d923a78b7bc0636f3ad029 Mon Sep 17 00:00:00 2001 From: Isaac Erwin Date: Sun, 14 Aug 2016 13:48:54 -0400 Subject: [PATCH] Fixes talking swords being unable to their wielders, or anyone --- code/game/objects/items/weapons/holy_weapons.dm | 4 ++-- code/modules/mob/living/simple_animal/shade.dm | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/weapons/holy_weapons.dm b/code/game/objects/items/weapons/holy_weapons.dm index ada15a3b108..ae6e8b7888c 100644 --- a/code/game/objects/items/weapons/holy_weapons.dm +++ b/code/game/objects/items/weapons/holy_weapons.dm @@ -212,7 +212,7 @@ if(candidates.len) theghost = pick(candidates) - var/mob/living/simple_animal/shade/S = new(src) + var/mob/living/simple_animal/shade/sword/S = new(src) S.real_name = name S.name = name S.ckey = theghost.ckey @@ -227,7 +227,7 @@ possessed = FALSE /obj/item/weapon/nullrod/scythe/talking/Destroy() - for(var/mob/living/simple_animal/shade/S in contents) + for(var/mob/living/simple_animal/shade/sword/S in contents) to_chat(S, "You were destroyed!") S.ghostize() qdel(S) diff --git a/code/modules/mob/living/simple_animal/shade.dm b/code/modules/mob/living/simple_animal/shade.dm index 99a65c0052d..d4d52f63ce5 100644 --- a/code/modules/mob/living/simple_animal/shade.dm +++ b/code/modules/mob/living/simple_animal/shade.dm @@ -47,3 +47,7 @@ if((M.client && !( M.blinded ))) M.show_message("\red [user] gently taps [src] with the [O]. ") return + +/mob/living/simple_animal/shade/sword + universal_speak = 1 + faction = list("neutral") \ No newline at end of file