From 11bcd573a05f14d4d81a615e8dcde15255f7e652 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Mon, 23 Oct 2017 13:17:52 -0500 Subject: [PATCH] Update mob_defines.dm --- code/modules/mob/mob_defines.dm | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm index ee54d9a9ac..6d9630cb56 100644 --- a/code/modules/mob/mob_defines.dm +++ b/code/modules/mob/mob_defines.dm @@ -27,13 +27,9 @@ var/damageoverlaytemp = 0 var/computer_id = null var/lastattacker = null -<<<<<<< HEAD - var/lastattacked = null - var/list/logging = list(INDIVIDUAL_ATTACK_LOG, INDIVIDUAL_SAY_LOG, INDIVIDUAL_EMOTE_LOG, INDIVIDUAL_OOC_LOG, INDIVIDUAL_LOOC_LOG) -======= var/lastattackerckey = null var/list/logging = list(INDIVIDUAL_ATTACK_LOG, INDIVIDUAL_SAY_LOG, INDIVIDUAL_EMOTE_LOG, INDIVIDUAL_OOC_LOG) ->>>>>>> 032c864... Removes mob.lastattacked and replaces lastattacker with a string (#31981) + var/obj/machinery/machine = null var/other_mobs = null var/disabilities = 0 //Carbon