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

Removes mob.lastattacked and replaces lastattacker with a string

Browse Source
This commit is contained in:
vuonojenmustaturska
2017-10-22 19:28:25 +03:00
committed by CitadelStationBot
parent f450abcaab
commit 1794018ae1
6 changed files with 219 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/mob_defines.dm
+5
View File
@@ -27,8 +27,13 @@
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