From ddb9955e53a881b06f47d68d335285be44d1cec8 Mon Sep 17 00:00:00 2001 From: AstralSerpent Date: Wed, 2 Jul 2014 09:27:06 +1000 Subject: [PATCH 1/2] Removed an unused suicide_act proc belonging to the scalpel. --- code/modules/surgery/tools.dm | 6 ------ 1 file changed, 6 deletions(-) diff --git a/code/modules/surgery/tools.dm b/code/modules/surgery/tools.dm index d8db9381aaa..841e96959e7 100644 --- a/code/modules/surgery/tools.dm +++ b/code/modules/surgery/tools.dm @@ -50,12 +50,6 @@ origin_tech = "materials=1;biotech=1" attack_verb = list("drilled") -/obj/item/weapon/scalpel/suicide_act(mob/user) - user.visible_message(pick("[user] is pressing [src] to \his temple and activating it! It looks like \he's trying to commit suicide.", \ - "[user] is pressing [src] to \his chest and activating it! It looks like \he's trying to commit suicide.")) - return (BRUTELOSS) - - /obj/item/weapon/scalpel name = "scalpel" desc = "Cut, cut, and once more cut." From cdd91c27f67520cb0f515dcbcf23bbf2d268fccd Mon Sep 17 00:00:00 2001 From: AstralSerpent Date: Fri, 4 Jul 2014 21:34:34 +1000 Subject: [PATCH 2/2] Traitor code phrases/responses will be announced at round end. --- code/game/gamemodes/traitor/traitor.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/game/gamemodes/traitor/traitor.dm b/code/game/gamemodes/traitor/traitor.dm index 687b9490a46..c3273c5071c 100644 --- a/code/game/gamemodes/traitor/traitor.dm +++ b/code/game/gamemodes/traitor/traitor.dm @@ -250,7 +250,10 @@ text += "
" + text += "
The code phrases were: [syndicate_code_phrase]
\ + The code responses were: [syndicate_code_response]
" world << text + return 1