From e968c9e03cb8651540cefdfe6b99b1e8e0b042a7 Mon Sep 17 00:00:00 2001 From: phil235 Date: Thu, 16 Jul 2015 13:04:44 +0200 Subject: [PATCH] Fixes dog bed dropping metal on deconstruction. Fixes damp rag smothering not giving a bold red message to the victim. Fixes curare not properly weakening mobs. --- .../objects/structures/stool_bed_chair_nest/bed.dm | 10 +++++++++- code/modules/detectivework/footprints_and_rag.dm | 9 +++++---- .../reagents/Chemistry-Reagents/Toxin-Reagents.dm | 2 +- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/code/game/objects/structures/stool_bed_chair_nest/bed.dm b/code/game/objects/structures/stool_bed_chair_nest/bed.dm index 2d97ac46aec..7f7b7c0ae05 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/bed.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/bed.dm @@ -143,4 +143,12 @@ name = "dog bed" icon_state = "dogbed" desc = "A comfy-looking dog bed. You can even strap your pet in, in case the gravity turns off." - anchored = 0 \ No newline at end of file + anchored = 0 + +/obj/structure/stool/bed/dogbed/attackby(obj/item/weapon/W, mob/user, params) + if(istype(W, /obj/item/weapon/wrench)) + playsound(loc, 'sound/items/Ratchet.ogg', 50, 1) + new /obj/item/stack/sheet/mineral/wood(loc, 10) + qdel(src) + + diff --git a/code/modules/detectivework/footprints_and_rag.dm b/code/modules/detectivework/footprints_and_rag.dm index 512c860991a..31533e780a4 100644 --- a/code/modules/detectivework/footprints_and_rag.dm +++ b/code/modules/detectivework/footprints_and_rag.dm @@ -22,12 +22,13 @@ if(!proximity) return if(ismob(A) && A.reagents && reagents.total_volume) + var/mob/M = A if(user.a_intent == "harm") - src.reagents.reaction(A, TOUCH) - src.reagents.clear_reagents() + reagents.reaction(M, TOUCH) + reagents.clear_reagents() else - reagents.trans_to(A, reagents.total_volume) - user.visible_message("[user] has smothered \the [A] with \the [src]!", "You smother \the [A] with \the [src]!", "You hear some struggling and muffled cries of surprise.") + reagents.trans_to(M, reagents.total_volume) + M.visible_message("[user] has smothered \the [A] with \the [src]!", "[user] has smothered you with \the [src]!", "You hear some struggling and muffled cries of surprise.") else if(istype(A) && src in user) user.visible_message("[user] starts to wipe down [A] with [src]!", "You start to wipe down [A] with [src]...") if(do_after(user,30, target = A)) diff --git a/code/modules/reagents/Chemistry-Reagents/Toxin-Reagents.dm b/code/modules/reagents/Chemistry-Reagents/Toxin-Reagents.dm index d693da360a1..c5416d0fe77 100644 --- a/code/modules/reagents/Chemistry-Reagents/Toxin-Reagents.dm +++ b/code/modules/reagents/Chemistry-Reagents/Toxin-Reagents.dm @@ -604,7 +604,7 @@ /datum/reagent/toxin/curare/on_mob_life(mob/living/M) if(current_cycle >= 11) - M.Weaken(1) + M.Weaken(3) M.adjustOxyLoss(1*REM) ..()