From 66b51acdc6515ae7aa73880af462caf16261d0ea Mon Sep 17 00:00:00 2001 From: Chiemi <80381079+scionalu@users.noreply.github.com> Date: Tue, 19 Nov 2024 02:58:30 +0700 Subject: [PATCH] Fix Janky Bugs from putting ego armors on other people (#2558) WEAR SOME FUCKING CLOTHES --- code/modules/clothing/suits/ego_gear/_ego_gear.dm | 2 +- code/modules/mob/living/living.dm | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/code/modules/clothing/suits/ego_gear/_ego_gear.dm b/code/modules/clothing/suits/ego_gear/_ego_gear.dm index f396ec2d0301..3fe0109ab19f 100644 --- a/code/modules/clothing/suits/ego_gear/_ego_gear.dm +++ b/code/modules/clothing/suits/ego_gear/_ego_gear.dm @@ -36,7 +36,7 @@ if(slot_flags & slot) // Equipped to right slot, not just in hands if(!CanUseEgo(H)) return FALSE - if(equip_slowdown > 0) + if(equip_slowdown > 0 && (M == equipper || !equipper)) if(!do_after(H, equip_slowdown, target = H)) return FALSE return ..() diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index f3a1cf006fab..3b43b5bc8ed9 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -1024,7 +1024,12 @@ to_chat(src, "You try to put [what] on [who]...") who.log_message("[key_name(who)] is having [what] put on them by [key_name(src)]", LOG_ATTACK, color="red") log_message("[key_name(who)] is having [what] put on them by [key_name(src)]", LOG_ATTACK, color="red", log_globally=FALSE) - if(do_mob(src, who, what.equip_delay_other)) + + var/equip_delay = what.equip_delay_other + if(istype(what,/obj/item/clothing/suit/armor/ego_gear)) + var/obj/item/clothing/suit/armor/ego_gear/EGO = what + equip_delay = max(EGO.equip_delay_other, EGO.equip_slowdown) //Preventing 0 delay on some ego suits + if(do_mob(src, who, equip_delay)) if(what && Adjacent(who) && what.mob_can_equip(who, src, final_where, TRUE, TRUE)) if(temporarilyRemoveItemFromInventory(what)) if(where_list)