cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-22 04:30:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #15731 from KorPhaeron/push_block

Browse Source 
Refactor push blocking
This commit is contained in:
Joan Lung
2016-02-27 19:27:55 -05:00
parent 77b7f02bdd c7b15dfb6a
commit 86f94e5308
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/living.dm
+2 -2
View File
@@ -129,9 +129,9 @@ Sorry Giacom. Please don't be mad :(
if(!(M.status_flags & CANPUSH))
return 1
//anti-riot equipment is also anti-push
if(M.r_hand && istype(M.r_hand, /obj/item/weapon/shield/riot))
if(M.r_hand && (prob(M.r_hand.block_chance * 2)) && !istype(M.r_hand, /obj/item/clothing))
return 1
if(M.l_hand && istype(M.l_hand, /obj/item/weapon/shield/riot))
if(M.l_hand && (prob(M.l_hand.block_chance * 2)) && !istype(M.l_hand, /obj/item/clothing))
return 1
//Called when we bump onto an obj