From ec8db75ebd8e0c6ac3dbceaec2ea57b71165cb0c Mon Sep 17 00:00:00 2001 From: KorPhaeron Date: Wed, 24 Feb 2016 15:02:48 -0600 Subject: [PATCH 1/2] Push block --- code/modules/mob/living/living.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index aa91c1a2b79..0c955c8fdaa 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -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))) 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))) return 1 //Called when we bump onto an obj From c7b15dfb6a78d1eb67241b51c5e87cadfe89e6e3 Mon Sep 17 00:00:00 2001 From: KorPhaeron Date: Wed, 24 Feb 2016 15:37:10 -0600 Subject: [PATCH 2/2] Checks for clothing --- code/modules/mob/living/living.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 0c955c8fdaa..3773808a438 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -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 && (prob(M.r_hand.block_chance * 2))) + if(M.r_hand && (prob(M.r_hand.block_chance * 2)) && !istype(M.r_hand, /obj/item/clothing)) return 1 - if(M.l_hand && (prob(M.l_hand.block_chance * 2))) + 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