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
@@ -94,8 +94,7 @@
 	else if(hitsound)
 		playsound(loc, hitsound, get_clamped_volume(), 1, -1)

-	M.lastattacker = user.real_name
-	M.lastattackerckey = user.ckey
+	M.set_last_attacker(user)

 	if(force && M == user && user.client)
 		user.client.give_award(/datum/award/achievement/misc/selfouch, user)