diff --git a/code/datums/inventory_slots/inventory_gripper.dm b/code/datums/inventory_slots/inventory_gripper.dm index 3529f692126..66d0c12a9ac 100644 --- a/code/datums/inventory_slots/inventory_gripper.dm +++ b/code/datums/inventory_slots/inventory_gripper.dm @@ -3,6 +3,7 @@ var/can_use_held_item = TRUE var/dexterity = DEXTERITY_FULL var/covering_slot_flags + quick_equip_priority = -1 // you quick-equip stuff by holding it in a gripper, so this ought to be dead last // For reference, grippers do not use ui_loc, they have it set dynamically during /datum/hud/proc/rebuild_hands() diff --git a/code/datums/inventory_slots/slots/slot_back.dm b/code/datums/inventory_slots/slots/slot_back.dm index 8128a23f643..cc65742561b 100644 --- a/code/datums/inventory_slots/slots/slot_back.dm +++ b/code/datums/inventory_slots/slots/slot_back.dm @@ -6,7 +6,7 @@ requires_organ_tag = BP_CHEST requires_slot_flags = SLOT_BACK mob_overlay_layer = HO_BACK_LAYER - quick_equip_priority = 13 + quick_equip_priority = 14 /datum/inventory_slot/back/simple requires_organ_tag = null diff --git a/code/datums/inventory_slots/slots/slot_id.dm b/code/datums/inventory_slots/slots/slot_id.dm index 2c015a2a9cf..c660fa56413 100644 --- a/code/datums/inventory_slots/slots/slot_id.dm +++ b/code/datums/inventory_slots/slots/slot_id.dm @@ -5,7 +5,7 @@ slot_id = slot_wear_id_str requires_slot_flags = SLOT_ID mob_overlay_layer = HO_ID_LAYER - quick_equip_priority = 12 + quick_equip_priority = 13 /datum/inventory_slot/id/update_mob_equipment_overlay(var/mob/living/user, var/obj/item/prop, var/redraw_mob = TRUE) var/obj/item/clothing/under/under = user.get_equipped_item(slot_w_uniform_str) diff --git a/code/datums/inventory_slots/slots/slot_suit.dm b/code/datums/inventory_slots/slots/slot_suit.dm index 5319ac7ec70..f7b1342c4b3 100644 --- a/code/datums/inventory_slots/slots/slot_suit.dm +++ b/code/datums/inventory_slots/slots/slot_suit.dm @@ -8,6 +8,7 @@ requires_organ_tag = BP_CHEST requires_slot_flags = SLOT_OVER_BODY mob_overlay_layer = HO_SUIT_LAYER + quick_equip_priority = 11 /datum/inventory_slot/suit/update_mob_equipment_overlay(var/mob/living/user, var/obj/item/prop, var/redraw_mob = TRUE) if(prop) diff --git a/code/datums/inventory_slots/slots/slot_uniform.dm b/code/datums/inventory_slots/slots/slot_uniform.dm index ac804e3cc10..b254028a7c4 100644 --- a/code/datums/inventory_slots/slots/slot_uniform.dm +++ b/code/datums/inventory_slots/slots/slot_uniform.dm @@ -13,7 +13,7 @@ ) requires_organ_tag = BP_CHEST requires_slot_flags = SLOT_UPPER_BODY - quick_equip_priority = 11 + quick_equip_priority = 12 /datum/inventory_slot/uniform/update_mob_equipment_overlay(var/mob/living/user, var/obj/item/prop, var/redraw_mob = TRUE) if(prop?.flags_inv & HIDESHOES) diff --git a/code/game/objects/item.dm b/code/game/objects/item.dm index a3df048851b..20fd3b598df 100644 --- a/code/game/objects/item.dm +++ b/code/game/objects/item.dm @@ -427,9 +427,10 @@ if(S.collection_mode) //Mode is set to collect all items if(isturf(src.loc)) S.gather_all(src.loc, user) + return TRUE else if(S.can_be_inserted(src, user)) S.handle_item_insertion(src) - return TRUE + return TRUE if(has_extension(src, /datum/extension/loaded_cell)) var/datum/extension/loaded_cell/cell_loaded = get_extension(src, /datum/extension/loaded_cell) diff --git a/code/modules/atmospherics/components/unary/vent_scrubber.dm b/code/modules/atmospherics/components/unary/vent_scrubber.dm index 9b74b0723cd..a79c7d4467b 100644 --- a/code/modules/atmospherics/components/unary/vent_scrubber.dm +++ b/code/modules/atmospherics/components/unary/vent_scrubber.dm @@ -93,10 +93,10 @@ icon_state = "weld" else if((stat & NOPOWER) || !use_power) icon_state = "off" - else if(scrubbing == SCRUBBER_EXCHANGE) - icon_state = "on" - else + else if(scrubbing == SCRUBBER_SIPHON) icon_state = "in" + else + icon_state = "on" build_device_underlays() diff --git a/code/modules/reagents/reagent_containers/food.dm b/code/modules/reagents/reagent_containers/food.dm index 2a1b65d94f4..e2bb15b144c 100644 --- a/code/modules/reagents/reagent_containers/food.dm +++ b/code/modules/reagents/reagent_containers/food.dm @@ -15,6 +15,8 @@ icon_state = null randpixel = 6 atom_flags = ATOM_FLAG_OPEN_CONTAINER + item_flags = null + material = /decl/material/liquid/nutriment possible_transfer_amounts = null volume = 50 center_of_mass = @"{'x':16,'y':16}"