From c540dde158839ab376c5d2e1c5eac4b47447edee Mon Sep 17 00:00:00 2001 From: "quartz235@gmail.com" Date: Tue, 7 Feb 2012 22:17:23 +0000 Subject: [PATCH] - Can't burn up the nuke disk in a crematorium lololol - The message for trying to cremate nothing is now based off the crematorium instead of user - Minor grammar fix git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3051 316c924e-a436-60f5-8080-3fe189b3f50e --- code/game/machinery/morgue.dm | 7 ++++--- code/modules/chemical/Chemistry-Reagents.dm | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/code/game/machinery/morgue.dm b/code/game/machinery/morgue.dm index 0f413af7c9e..48ed0675aed 100644 --- a/code/game/machinery/morgue.dm +++ b/code/game/machinery/morgue.dm @@ -251,7 +251,7 @@ return //don't let you cremate something twice or w/e if(length(contents) == 0) - for (var/mob/M in viewers(user)) + for (var/mob/M in viewers(src)) M.show_message("\red You hear a hollow crackle.", 1) return else if(contents) @@ -283,8 +283,9 @@ playsound(src.loc, 'ding.ogg', 50, 1) else for(var/obj/item/I in contents) - del(I) - new /obj/effect/decal/ash(src) + if(!istype(I, /obj/item/weapon/disk/nuclear)) + del(I) + new /obj/effect/decal/ash(src) sleep(30) cremating = 0 locked = 0 diff --git a/code/modules/chemical/Chemistry-Reagents.dm b/code/modules/chemical/Chemistry-Reagents.dm index 6745163f9d1..657d0e59b86 100644 --- a/code/modules/chemical/Chemistry-Reagents.dm +++ b/code/modules/chemical/Chemistry-Reagents.dm @@ -701,7 +701,7 @@ datum if(M:head) if(prob(15)) del(M:head) - M << "\red Your helmet melts from the acid" + M << "\red Your helmet melts from the acid!" else M << "\red Your helmet protects you from the acid!" return