Merge pull request #14603 from Putnam3145/fix-base-option

Activity tracking; traitor class tweaks
2021-04-18 18:49:27 -06:00
parent f6b2ec0215 4811216f07
commit e8e625cb5c
26 changed files with 159 additions and 73 deletions
--- a/code/game/objects/structures/manned_turret.dm
+++ b/code/game/objects/structures/manned_turret.dm
@@ -199,8 +199,7 @@
 	return TRUE

 /obj/item/gun_control/attack(mob/living/M, mob/living/user)
-	M.lastattacker = user.real_name
-	M.lastattackerckey = user.ckey
+	M.set_last_attacker(user)
 	M.attacked_by(src, user)
 	add_fingerprint(user)