From f6cfa0a3ed930ac6f07ee35c2bbce3da00df3bb2 Mon Sep 17 00:00:00 2001 From: Casey Date: Fri, 18 Nov 2022 01:39:47 -0500 Subject: [PATCH] Merge pull request #14093 from Very-Soft/equipspecial equip_special --- code/modules/clothing/under/miscellaneous_vr.dm | 9 ++++++--- code/modules/mob/living/carbon/human/inventory.dm | 6 ++++++ 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/code/modules/clothing/under/miscellaneous_vr.dm b/code/modules/clothing/under/miscellaneous_vr.dm index 424e9326e8..e66947796b 100644 --- a/code/modules/clothing/under/miscellaneous_vr.dm +++ b/code/modules/clothing/under/miscellaneous_vr.dm @@ -127,9 +127,12 @@ var/emagged = FALSE var/target_size = 1 -/obj/item/clothing/gloves/bluespace/mob_can_equip(mob/M, gloves, disable_warning = 0) - . = ..() - if(. && ishuman(M) && !disable_warning) +/obj/item/proc/equip_special() + return + +/obj/item/clothing/gloves/bluespace/equip_special() + var/mob/M = src.loc + if(ishuman(M)) var/mob/living/carbon/human/H = M if(!H.resizable) return diff --git a/code/modules/mob/living/carbon/human/inventory.dm b/code/modules/mob/living/carbon/human/inventory.dm index c017377297..c8aba57735 100644 --- a/code/modules/mob/living/carbon/human/inventory.dm +++ b/code/modules/mob/living/carbon/human/inventory.dm @@ -377,6 +377,12 @@ This saves us from having to call add_fingerprint() any time something is put in W.in_inactive_hand(src) + //VOREStation Addition Start + if(istype(W, /obj/item)) + var/obj/item/I = W + I.equip_special() + //VOREStation Addition End + return 1 //Checks if a given slot can be accessed at this time, either to equip or unequip I