Merge pull request #7800 from Citadel-Station-13/kevinz000-patch-19

xeno tackles now hardstun for 3 seconds if someone is not lying down
2018-12-10 19:26:58 -05:00
parent 87f10ae5c5 7978daa370
commit abdf3b2cd9
1 changed files with 4 additions and 1 deletions
@@ -272,7 +272,10 @@
 						"<span class='userdanger'>[M] disarmed [src]!</span>")
 			else
 				playsound(loc, 'sound/weapons/pierce.ogg', 25, 1, -1)
-				Knockdown(100)
+				if(!lying)				//CITADEL EDIT
+					Knockdown(100, override_duration = 30, override_stam = 25)
+				else
+					Knockdown(100)
 				log_combat(M, src, "tackled")
 				visible_message("<span class='danger'>[M] has tackled down [src]!</span>", \
 					"<span class='userdanger'>[M] has tackled down [src]!</span>")