Merge remote-tracking branch 'citadel/master' into combat_v7

2021-03-15 14:39:16 -07:00
parent 5d1cda26dc c32f3644a6
commit 5d51025ad6
870 changed files with 32914 additions and 23755 deletions
@@ -97,6 +97,9 @@
 	M.lastattacker = user.real_name
 	M.lastattackerckey = user.ckey

+	if(force && M == user && user.client)
+		user.client.give_award(/datum/award/achievement/misc/selfouch, user)
+
 	user.do_attack_animation(M)
 	M.attacked_by(src, user, attackchain_flags, damage_multiplier)