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

Update gauntlets.dm

Browse Source
This commit is contained in:
Razgriz
2020-05-21 03:41:03 -07:00
committed by GitHub
parent 5bf0c28a38
commit b99e19a978
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/gauntlets.dm
View File

@@ -14,11 +14,7 @@
punch_force = 5
var/obj/item/clothing/gloves/gloves = null //Undergloves
<<<<<<< HEAD
/obj/item/clothing/gloves/gauntlets/mob_can_equip(mob/user, slot, disable_warning = 0)
=======
/obj/item/clothing/gloves/gauntlets/mob_can_equip(mob/user, slot, disable_warning = FALSE)
>>>>>>> e791692aea59a96b1b45c20d61974aa10493a7f6
var/mob/living/carbon/human/H = user
if(H.gloves)
gloves = H.gloves
@@ -51,4 +47,4 @@
if(ring)
gloves.ring = ring
src.gloves = null
wearer = null
wearer = null