From c0064f70714128be02ceb61b2cb2cd78eea06563 Mon Sep 17 00:00:00 2001 From: Fikou <23585223+Fikou@users.noreply.github.com> Date: Tue, 1 Mar 2022 22:47:49 +0100 Subject: [PATCH] mod clamp can carry wrapped crates + mod activation not affected by do after slowdowns + radial icons highlight on extended pieces (#65193) --- code/modules/mod/mod_activation.dm | 4 +++- code/modules/mod/modules/modules_supply.dm | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/code/modules/mod/mod_activation.dm b/code/modules/mod/mod_activation.dm index 426b07e422f..cedf4131770 100644 --- a/code/modules/mod/mod_activation.dm +++ b/code/modules/mod/mod_activation.dm @@ -1,4 +1,4 @@ -#define MOD_ACTIVATION_STEP_FLAGS IGNORE_USER_LOC_CHANGE|IGNORE_TARGET_LOC_CHANGE|IGNORE_HELD_ITEM|IGNORE_INCAPACITATED +#define MOD_ACTIVATION_STEP_FLAGS IGNORE_USER_LOC_CHANGE|IGNORE_TARGET_LOC_CHANGE|IGNORE_HELD_ITEM|IGNORE_INCAPACITATED|IGNORE_SLOWDOWNS /// Creates a radial menu from which the user chooses parts of the suit to deploy/retract. Repeats until all parts are extended or retracted. /obj/item/mod/control/proc/choose_deploy(mob/user) @@ -9,6 +9,8 @@ for(var/obj/item/piece as anything in mod_parts) display_names[piece.name] = REF(piece) var/image/piece_image = image(icon = piece.icon, icon_state = piece.icon_state) + if(piece.loc != src) + piece_image.underlays += image(icon = 'icons/hud/radial.dmi', icon_state = "module_active") items += list(piece.name = piece_image) var/pick = show_radial_menu(user, src, items, custom_check = FALSE, require_near = TRUE, tooltips = TRUE) if(!pick) diff --git a/code/modules/mod/modules/modules_supply.dm b/code/modules/mod/modules/modules_supply.dm index aba395da5c9..430abb460b2 100644 --- a/code/modules/mod/modules/modules_supply.dm +++ b/code/modules/mod/modules/modules_supply.dm @@ -50,7 +50,7 @@ return if(!mod.wearer.Adjacent(target)) return - if(istype(target, /obj/structure/closet/crate)) + if(istype(target, /obj/structure/closet/crate) || istype(target, /obj/structure/big_delivery)) var/atom/movable/picked_crate = target if(length(stored_crates) >= max_crates) balloon_alert(mod.wearer, "too many crates!")