diff --git a/code/game/objects/items/storage/bags.dm b/code/game/objects/items/storage/bags.dm index e34c93340ed..f73186c6b2f 100644 --- a/code/game/objects/items/storage/bags.dm +++ b/code/game/objects/items/storage/bags.dm @@ -39,7 +39,7 @@ inhand_icon_state = "trashbag" lefthand_file = 'icons/mob/inhands/equipment/custodial_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/custodial_righthand.dmi' - slot_flags = null + slot_flags = ITEM_SLOT_BELT //SKYRAT EDIT CHANGE - QOL - ORIGINAL: none var/insertable = TRUE /obj/item/storage/bag/trash/ComponentInitialize() diff --git a/code/modules/vending/_vending.dm b/code/modules/vending/_vending.dm index 3e69ab9d29f..b34c384278b 100644 --- a/code/modules/vending/_vending.dm +++ b/code/modules/vending/_vending.dm @@ -866,8 +866,16 @@ GLOBAL_LIST_EMPTY(vending_products) if(icon_vend) //Show the vending animation if needed flick(icon_vend,src) playsound(src, 'sound/machines/machine_vend.ogg', 50, TRUE, extrarange = -3) - new R.product_path(get_turf(src)) + var/vended = new R.product_path(get_turf(src))//SKYRAT EDIT CHANGE - QOL - ORIGINAL: new R.product_path(get_turf(src)) R.amount-- + //SKYRAT EDIT ADDITION BEGIN - QOL + if(istype(vended, /obj/item)) + var/obj/item/V = vended + if(usr.CanReach(src) && usr.put_in_hands(V)) + to_chat(usr, "You take [R.name] out of the slot.") + else + to_chat(usr, "[capitalize(R.name)] falls onto the floor!") + //SKYRAT EDIT END SSblackbox.record_feedback("nested tally", "vending_machine_usage", 1, list("[type]", "[R.product_path]")) vend_ready = TRUE