mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-08-24 12:37:50 +01:00
Magboot and glove fix (#19415)
* Magboot and glove fix * Update armblade.dm * Update leash.dm
This commit is contained in:
@@ -9,7 +9,7 @@
|
||||
pickup_sound = 'sound/items/pickup/axe.ogg'
|
||||
resistance_flags = FIRE_PROOF
|
||||
|
||||
/obj/item/clothing/gloves/arm_guard/mob_can_equip(var/mob/living/carbon/human/H, slot, disable_warning = FALSE)
|
||||
/obj/item/clothing/gloves/arm_guard/mob_can_equip(mob/living/carbon/human/H, slot, disable_warning = FALSE, ignore_obstruction, go_over_slot = TRUE)
|
||||
if(..()) //This will only run if no other problems occured when equiping.
|
||||
if(H.wear_suit)
|
||||
if(H.wear_suit.body_parts_covered & ARMS)
|
||||
|
||||
@@ -13,28 +13,3 @@
|
||||
overgloves = 1
|
||||
punch_force = 5
|
||||
resistance_flags = FIRE_PROOF
|
||||
|
||||
/obj/item/clothing/gloves/gauntlets/mob_can_equip(mob/user, slot, disable_warning = FALSE)
|
||||
var/mob/living/carbon/human/H = user
|
||||
if(H.gloves)
|
||||
gloves = H.gloves
|
||||
if(!istype(gloves))
|
||||
to_chat(user, "You are unable to wear \the [src] as \the [H.gloves] are in the way.")
|
||||
gloves = null
|
||||
return 0
|
||||
if(gloves.overgloves)
|
||||
to_chat(user, "You are unable to wear \the [src] as \the [H.gloves] are in the way.")
|
||||
gloves = null
|
||||
return 0
|
||||
H.drop_from_inventory(gloves)
|
||||
gloves.forceMove(src)
|
||||
|
||||
if(!..())
|
||||
if(gloves)
|
||||
if(H.equip_to_slot_if_possible(gloves, slot_gloves))
|
||||
gloves = null
|
||||
return 0
|
||||
if(gloves)
|
||||
to_chat(user, "You slip \the [src] on over \the [gloves].")
|
||||
wearer = WEAKREF(H)
|
||||
return 1
|
||||
|
||||
Reference in New Issue
Block a user