From dd5ed6a1cdc29b7d8b7aa863bfa3b4044ae78190 Mon Sep 17 00:00:00 2001 From: Erthilo Date: Mon, 21 May 2012 21:02:01 +0100 Subject: [PATCH] Adds a sounds for implant removal, and better messages for the rag. --- code/game/objects/items/weapons/surgery_tools.dm | 1 + code/modules/DetectiveWork/detective_work.dm | 4 +--- sound/effects/squelch1.ogg | Bin 0 -> 9661 bytes 3 files changed, 2 insertions(+), 3 deletions(-) create mode 100644 sound/effects/squelch1.ogg diff --git a/code/game/objects/items/weapons/surgery_tools.dm b/code/game/objects/items/weapons/surgery_tools.dm index ecd091dfa5b..cf501a4a63b 100644 --- a/code/game/objects/items/weapons/surgery_tools.dm +++ b/code/game/objects/items/weapons/surgery_tools.dm @@ -593,6 +593,7 @@ CIRCULAR SAW implant.loc = (get_turf(H)) implant.implanted = 0 S.implant = null + playsound(user, 'squelch1.ogg', 50, 1) if(istype(implant, /obj/item/weapon/implant/explosive) || istype(implant, /obj/item/weapon/implant/uplink) || istype(implant, /obj/item/weapon/implant/dexplosive) || istype(implant, /obj/item/weapon/implant/explosive) || istype(implant, /obj/item/weapon/implant/compressed)) usr << "The implant disintegrates into nothing..." del(implant) diff --git a/code/modules/DetectiveWork/detective_work.dm b/code/modules/DetectiveWork/detective_work.dm index dec64c2fb59..55a18aa3e34 100644 --- a/code/modules/DetectiveWork/detective_work.dm +++ b/code/modules/DetectiveWork/detective_work.dm @@ -760,9 +760,7 @@ proc/blood_incompatible(donor,receiver) attack(atom/target as obj|turf|area, mob/user as mob , flag) if(ismob(target) && target.reagents && reagents.total_volume) - user << "\blue You smother [target] with \the [src]." - for(var/mob/O in viewers(world.view, user)) - O.show_message(text("\red [] has been smothered with \the [] by []!", target, src, user), 1) + user.visible_message("\red \The [target] has been smothered with \the [src] by \the [user]!", "\red You smother \the [target] with \the [src]!", "You hear some struggling and muffled cries of surprise") src.reagents.reaction(target, TOUCH) spawn(5) src.reagents.clear_reagents() return diff --git a/sound/effects/squelch1.ogg b/sound/effects/squelch1.ogg new file mode 100644 index 0000000000000000000000000000000000000000..6e00b7f8f3b4870812d57d4a9e718535d585534b GIT binary patch literal 9661 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 kHK4x%ta%SRQM^@sZsAG%87pI(IBZMtEBZb(^b literal 0 HcmV?d00001