From 688e9673da3f417a47e0197a458bf5d3f98316f6 Mon Sep 17 00:00:00 2001 From: Cocacolagua <48032385+Cocacolagua@users.noreply.github.com> Date: Wed, 28 Oct 2020 12:04:30 -0300 Subject: [PATCH] IPCs can properly kill themselves with salt (#14760) * what is a man * Revert "Merge pull request #2 from ParadiseSS13/master" This reverts commit 5d81d143b020932cf21984c03515f284b1d97a86, reversing changes made to 157524c11513885bff875f7987e4eb02113d68f4. * Revert "Revert "Merge pull request #2 from ParadiseSS13/master"" This reverts commit 11d12dad9b5026acd03407ea8e154f24fff0ae71. * Revert "what is a man" This reverts commit c35f1022f5bfe1dad1ec001c0b0c5241d3c9c5fe. * im not gonna make only ipcs take brute --- code/modules/food_and_drinks/food/condiment.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/food_and_drinks/food/condiment.dm b/code/modules/food_and_drinks/food/condiment.dm index 733ac4692a3..898d3f3cc71 100644 --- a/code/modules/food_and_drinks/food/condiment.dm +++ b/code/modules/food_and_drinks/food/condiment.dm @@ -135,7 +135,7 @@ user.name = newname user.real_name = newname desc = "Salt. From dead crew, presumably." - return TOXLOSS + return BRUTELOSS /obj/item/reagent_containers/food/condiment/peppermill name = "pepper mill"