shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update mob_defines.dm

Browse Source
This commit is contained in:
LetterJay
2017-10-23 13:17:52 -05:00
committed by GitHub
parent 23765d9ddd
commit 11bcd573a0
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/modules/mob/mob_defines.dm
View File

@@ -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