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

2021-04-26 14:17:43 -07:00
parent 1fd06a89b7 3fac51374f
commit 275b532a8c
480 changed files with 310849 additions and 306446 deletions
@@ -267,8 +267,7 @@ They *could* go in their appropriate files, but this is supposed to be modular
 		apply_effect(EFFECT_STUTTER, G.stunforce)
 		SEND_SIGNAL(src, COMSIG_LIVING_MINOR_SHOCK)

-		lastattacker = H.real_name
-		lastattackerckey = H.ckey
+		set_last_attacker(H)
 		log_combat(H, src, "stunned")

 		playsound(loc, 'sound/weapons/egloves.ogg', 50, 1, -1)