From 312da86424744cd0862e65d72d883a5d67e21a1d Mon Sep 17 00:00:00 2001 From: Putnam Date: Sat, 11 Jan 2020 01:28:49 -0800 Subject: [PATCH] Suggested changes --- _maps/map_files/generic/CentCom.dmm | 1 + code/game/objects/structures/ghost_role_spawners.dm | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index 2cca63db46..9a94fd3f61 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -17753,6 +17753,7 @@ /obj/item/stack/sheet/glass/fifty, /obj/item/stack/sheet/metal/fifty, /obj/item/storage/toolbox/mechanical, +/obj/item/stack/sheet/plastic/fifty, /obj/item/multitool, /turf/open/indestructible/hotelwood, /area/centcom/holding) diff --git a/code/game/objects/structures/ghost_role_spawners.dm b/code/game/objects/structures/ghost_role_spawners.dm index 8aa84f2210..0cce1de41b 100644 --- a/code/game/objects/structures/ghost_role_spawners.dm +++ b/code/game/objects/structures/ghost_role_spawners.dm @@ -629,7 +629,7 @@ if(!..()) return 0 var/mob/M = target - if(HAS_TRAIT(M,TRAIT_SIXTHSENSE)) + if(HAS_TRAIT_FROM(M,TRAIT_SIXTHSENSE,GHOSTROLE_TRAIT)) REMOVE_TRAIT(M,TRAIT_SIXTHSENSE,GHOSTROLE_TRAIT) to_chat(M,"You're no longer hearing deadchat.") else