cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update arm_guards.dm

Browse Source
This commit is contained in:
Razgriz
2020-05-21 03:40:34 -07:00
committed by GitHub
parent 3e58d2490a
commit 5bf0c28a38
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/modules/clothing/gloves/arm_guards.dm
View File

@@ -7,11 +7,7 @@
w_class = ITEMSIZE_NORMAL
drop_sound = 'sound/items/drop/metalshield.ogg'
<<<<<<< HEAD
/obj/item/clothing/gloves/arm_guard/mob_can_equip(var/mob/living/carbon/human/H, slot, disable_warning = 0)
=======
/obj/item/clothing/gloves/arm_guard/mob_can_equip(var/mob/living/carbon/human/H, slot, disable_warning = FALSE)
>>>>>>> e791692aea59a96b1b45c20d61974aa10493a7f6
if(..()) //This will only run if no other problems occured when equiping.
if(H.wear_suit)
if(H.wear_suit.body_parts_covered & ARMS)
@@ -63,4 +59,4 @@
siemens_coefficient = 0.6
armor = list(melee = 40, bullet = 40, laser = 60, energy = 35, bomb = 30, bio = 0, rad = 0)
min_cold_protection_temperature = T0C - 20
cold_protection = ARMS
cold_protection = ARMS