This commit is contained in:
Tim
2020-03-16 18:05:33 +01:00
parent d80fc64315
commit 818643440d
3 changed files with 11 additions and 8 deletions
+2 -2
View File
@@ -484,8 +484,8 @@ GLOBAL_VAR_INIT(embedpocalypse, FALSE) // if true, all items will be able to emb
/obj/item/proc/ui_action_click(mob/user, actiontype)
attack_self(user)
/obj/item/proc/IsReflect(var/def_zone) //This proc determines if and at what% an object will reflect energy projectiles if it's in l_hand,r_hand or wear_suit
return 0
/obj/item/proc/IsReflect(var/def_zone) //This proc determines if and at what an object will reflect energy projectiles if it's in l_hand,r_hand or wear_suit
return FALSE
/obj/item/proc/eyestab(mob/living/carbon/M, mob/living/carbon/user)
+1 -1
View File
@@ -674,7 +674,7 @@
H.remove_hud_from(user)
/obj/item/clothing/head/hooded/ablative/IsReflect(def_zone)
if(!(def_zone in BODY_ZONE_HEAD)) //If not shot where ablative is covering you, you don't get the reflection bonus!
if(def_zone != BODY_ZONE_HEAD) //If not shot where ablative is covering you, you don't get the reflection bonus!
return FALSE
if (prob(hit_reflect_chance))
return TRUE
@@ -89,12 +89,15 @@
/mob/living/carbon/human/proc/check_reflect(def_zone) //Reflection checks for anything in your l_hand, r_hand, or wear_suit based on the reflection chance of the object
if(wear_suit)
if(wear_suit.IsReflect(def_zone) == 1)
return 1
if(wear_suit.IsReflect(def_zone))
return TRUE
if(head)
if(head.IsReflect(def_zone))
return TRUE
for(var/obj/item/I in held_items)
if(I.IsReflect(def_zone) == 1)
return 1
return 0
if(I.IsReflect(def_zone))
return TRUE
return FALSE
/mob/living/carbon/human/proc/check_shields(atom/AM, damage, attack_text = "the attack", attack_type = MELEE_ATTACK, armour_penetration = 0)
var/block_chance_modifier = round(damage / -3)