diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm index 7928616c7ee..577bdb85925 100644 --- a/code/game/objects/structures/crates_lockers/closets.dm +++ b/code/game/objects/structures/crates_lockers/closets.dm @@ -351,8 +351,8 @@ /obj/structure/closet/AltClick(var/mob/user) ..() - if(user.stat || !user.canmove || user.restrained() || broken) - user << "You can't do that right now." + if(!user.canUseTopic(user) || broken) + user << "You can't do that right now!" return if(src.opened || !secure || !in_range(src, user)) return diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index c64c25d5302..ae08ac4b5ce 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -315,9 +315,15 @@ atom/proc/generate_female_clothing(index,t_color,icon,type) ..() -/obj/item/clothing/under/AltClick() +/obj/item/clothing/under/AltClick(var/mob/user) ..() - rolldown() + if(!user.canUseTopic(user)) + user << "You can't do that right now!" + return + if(!in_range(src, user)) + return + else + rolldown() /obj/item/clothing/under/verb/jumpsuit_adjust() set name = "Adjust Jumpsuit Style" diff --git a/code/modules/clothing/head/soft_caps.dm b/code/modules/clothing/head/soft_caps.dm index 96c5f55cedd..36d26136d5f 100644 --- a/code/modules/clothing/head/soft_caps.dm +++ b/code/modules/clothing/head/soft_caps.dm @@ -19,7 +19,14 @@ /obj/item/clothing/head/soft/AltClick(var/mob/user) - flip(user) + ..() + if(!user.canUseTopic(user)) + user << "You can't do that right now!" + return + if(!in_range(src, user)) + return + else + flip(user) /obj/item/clothing/head/soft/proc/flip(var/mob/user) diff --git a/code/modules/clothing/masks/breath.dm b/code/modules/clothing/masks/breath.dm index da10a0170de..4735d9325b9 100644 --- a/code/modules/clothing/masks/breath.dm +++ b/code/modules/clothing/masks/breath.dm @@ -16,7 +16,14 @@ adjustmask(user) /obj/item/clothing/mask/breath/AltClick(var/mob/user) - adjustmask(user) + ..() + if(!user.canUseTopic(user)) + user << "You can't do that right now!" + return + if(!in_range(src, user)) + return + else + adjustmask(user) /obj/item/clothing/mask/breath/examine(mob/user) ..() diff --git a/code/modules/clothing/suits/toggles.dm b/code/modules/clothing/suits/toggles.dm index 470b6f6ebd4..44e2d98abf6 100644 --- a/code/modules/clothing/suits/toggles.dm +++ b/code/modules/clothing/suits/toggles.dm @@ -53,9 +53,15 @@ //Toggle exosuits for different aesthetic styles (hoodies, suit jacket buttons, etc) -/obj/item/clothing/suit/toggle/AltClick() +/obj/item/clothing/suit/toggle/AltClick(var/mob/user) ..() - suit_toggle() + if(!user.canUseTopic(user)) + user << "You can't do that right now!" + return + if(!in_range(src, user)) + return + else + suit_toggle(user) /obj/item/clothing/suit/toggle/ui_action_click() suit_toggle()