From ff8e5e92bffb461e59a21e01631df5b31fec6e52 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sun, 13 May 2018 12:01:55 -0500 Subject: [PATCH] Update medical.dm --- code/game/objects/items/stacks/medical.dm | 5 ----- 1 file changed, 5 deletions(-) diff --git a/code/game/objects/items/stacks/medical.dm b/code/game/objects/items/stacks/medical.dm index f8e965e295..bee37d1ff9 100644 --- a/code/game/objects/items/stacks/medical.dm +++ b/code/game/objects/items/stacks/medical.dm @@ -167,10 +167,5 @@ grind_results = list("silver_sulfadiazine" = 10) /obj/item/stack/medical/ointment/suicide_act(mob/living/user) -<<<<<<< HEAD - user.visible_message("[user] is squeezing \the [src] into [user.p_their()] mouth! Don't they know that stuff is toxic?") - return TOXLOSS -======= user.visible_message("[user] is squeezing \the [src] into [user.p_their()] mouth! [user.p_do(TRUE)]n't [user.p_they()] know that stuff is toxic?") return TOXLOSS ->>>>>>> 01f9f56... Makes gauze deconstructable into cloth (#37731)