cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-19 12:05:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

mod clamp can carry wrapped crates + mod activation not affected by do after slowdowns + radial icons highlight on extended pieces (#65193)

Browse Source
This commit is contained in:
Fikou
2022-03-01 22:47:49 +01:00
committed by GitHub
parent 4f7509ed50
commit c0064f7071
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mod/mod_activation.dm
+3 -1
View File
@@ -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)
code/modules/mod/modules/modules_supply.dm
+1 -1
View File
@@ -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!")