Merge pull request #12033 from Citadel-Station-13/kevinz000-patch-6

fixes shield bashing working while downed
2020-04-27 16:24:29 +00:00
parent c610ee86c1 5c20bde9f0
commit 68bad2ee3f
1 changed files with 3 additions and 0 deletions
@@ -110,6 +110,9 @@
 	if(!(shield_flags & SHIELD_CAN_BASH))
 		to_chat(user, "<span class='warning'>[src] can't be used to shield bash!</span>")
 		return FALSE
+	if(!CHECK_MOBILITY(user, MOBILITY_STAND))
+		to_chat(user, "<span class='warning'>You can't bash with [src] while on the ground!</span>")
+		return FALSE
 	if(world.time < last_shieldbash + shieldbash_cooldown)
 		to_chat(user, "<span class='warning'>You can't bash with [src] again so soon!</span>")
 		return FALSE