Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum

# Conflicts: # code/modules/ninja/suit/ninjaDrainAct.dm
2021-05-02 22:47:39 -04:00
parent d7bdfbc35b 6887e2d097
commit 359c778955
448 changed files with 310031 additions and 306315 deletions
@@ -318,9 +318,14 @@
 		apply_effect(EFFECT_STUTTER, ninja_gloves.stunforce)
 		SEND_SIGNAL(src, COMSIG_LIVING_MINOR_SHOCK)

+<<<<<<< HEAD
 		lastattacker = ninja.real_name
 		lastattackerckey = ninja.ckey
 		log_combat(ninja, src, "stunned")
+=======
+		set_last_attacker(H)
+		log_combat(H, src, "stunned")
+>>>>>>> 6887e2d097b9ba361e455deccb57c6ac35c8fc79

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