diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 8e1bcb93784..32cf7daffb6 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -194,6 +194,7 @@ /mob/living/carbon/human/bullet_act(A as obj, var/datum/organ/external/def_zone) var/shielded = 0 + var/parry = 0 //Preparing the var for grabbing the armor information, can't grab the values yet because we don't know what kind of bullet was used. --NEO var/obj/item/projectile/P = A @@ -213,6 +214,14 @@ show_message("\red Your shield blocks the blow!", 4) return + for(var/obj/item/weapon/melee/energy/sword/B in src) + if (B.active) + parry = 1 + B.active = 1 + if ((parry)) + if (prob(50 - round(P.damage / 3))) + visible_message("\red [src] deflects the shot with their blade!", 4) + return for(var/obj/item/device/shield/S in src) if (S.active) diff --git a/data/mode.txt b/data/mode.txt index bd81a61cbfd..ae791fed369 100644 --- a/data/mode.txt +++ b/data/mode.txt @@ -1 +1 @@ -traitor +extended diff --git a/icons/mob/back.dmi b/icons/mob/back.dmi index b01cfa8fae0..d27ab43497c 100644 Binary files a/icons/mob/back.dmi and b/icons/mob/back.dmi differ diff --git a/icons/obj/gun.dmi b/icons/obj/gun.dmi index 65deb5b10ac..f202694ac7b 100644 Binary files a/icons/obj/gun.dmi and b/icons/obj/gun.dmi differ