diff --git a/code/modules/detectivework/footprints_and_rag.dm b/code/modules/detectivework/footprints_and_rag.dm index ad48a72a888..945e133b85f 100644 --- a/code/modules/detectivework/footprints_and_rag.dm +++ b/code/modules/detectivework/footprints_and_rag.dm @@ -19,18 +19,17 @@ volume = 5 can_be_placed_into = null -/obj/item/weapon/reagent_containers/glass/rag/attack(atom/target as obj|turf|area, mob/user as mob , flag) - if(ismob(target) && target.reagents && reagents.total_volume) - user.visible_message("[user] has smothered \the [target] with \the [src]!", "You smother \the [target] with \the [src]!", "You hear some struggling and muffled cries of surprise.") - src.reagents.reaction(target, TOUCH) - src.reagents.clear_reagents() - return - else - ..() - /obj/item/weapon/reagent_containers/glass/rag/afterattack(atom/A as obj|turf|area, mob/user as mob,proximity) - if(!proximity) return - if(istype(A) && src in user) + if(!proximity) + return + if(ismob(A) && A.reagents && reagents.total_volume) + if(user.a_intent == "harm") + src.reagents.reaction(A, TOUCH) + src.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.") + 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)) user.visible_message("[user] finishes wiping off the [A]!", "You finish wiping off the [A].") diff --git a/html/changelogs/jordie bluedoll.txt b/html/changelogs/jordie bluedoll.txt deleted file mode 100644 index 9dcb18c9fe1..00000000000 --- a/html/changelogs/jordie bluedoll.txt +++ /dev/null @@ -1,6 +0,0 @@ -author: Jordie0608 - -delete-after: True - -changes: - - imageadd: "The healthdoll is now blue when at full health to make it more clear when a body part is injured." \ No newline at end of file diff --git a/html/changelogs/jordie stuff.txt b/html/changelogs/jordie stuff.txt new file mode 100644 index 00000000000..316a2b7fc1f --- /dev/null +++ b/html/changelogs/jordie stuff.txt @@ -0,0 +1,7 @@ +author: Jordie0608 + +delete-after: True + +changes: + - tweak: "Smothering someone with a damp rag when in harm intent will apply reagents onto them, for acid-burning their face; otherwise it will inject them, for drugging with chloral hydrate." + - imageadd: "The healthdoll is now blue when at full health to make it more clear when a body part is injured." \ No newline at end of file