From dd5669d752d639e3fdfaa48f119c8183ef1d21b0 Mon Sep 17 00:00:00 2001 From: deathride58 Date: Tue, 1 May 2018 21:22:42 -0400 Subject: [PATCH] Update suicide.dm --- code/modules/client/verbs/suicide.dm | 3 --- 1 file changed, 3 deletions(-) diff --git a/code/modules/client/verbs/suicide.dm b/code/modules/client/verbs/suicide.dm index dc4441ed13..e192af633c 100644 --- a/code/modules/client/verbs/suicide.dm +++ b/code/modules/client/verbs/suicide.dm @@ -12,11 +12,8 @@ return if(confirm == "Yes") suiciding = TRUE -<<<<<<< HEAD log_game("[key_name(src)] (job: [job ? "[job]" : "None"]) committed suicide at [get_area(src)].") message_admins("[key_name(src)] (job: [job ? "[job]" : "None"]) committed suicide at [get_area(src)].") -======= ->>>>>>> f280924... Deactivate suicide prescans via ghost var (#36839) var/obj/item/held_item = get_active_held_item() if(held_item) var/damagetype = held_item.suicide_act(src)