diff --git a/code/game/objects/items/weapons/storage/bags.dm b/code/game/objects/items/weapons/storage/bags.dm index d7313d6db9b..748e0645d03 100644 --- a/code/game/objects/items/weapons/storage/bags.dm +++ b/code/game/objects/items/weapons/storage/bags.dm @@ -323,6 +323,7 @@ icon_state = "chembag" item_state = "chembag" desc = "A bag for storing pills and bottles of medicine." + storage_slots = 100 max_storage_space = 200 w_class = WEIGHT_CLASS_BULKY slowdown = 1 diff --git a/code/modules/mining/ore_satchel.dm b/code/modules/mining/ore_satchel.dm index c68391660bb..648ffcc456a 100644 --- a/code/modules/mining/ore_satchel.dm +++ b/code/modules/mining/ore_satchel.dm @@ -5,6 +5,7 @@ icon = 'icons/obj/storage/bags.dmi' icon_state = "satchel" slot_flags = SLOT_BELT | SLOT_POCKET + storage_slots = 50 max_storage_space = 100 can_hold = list(/obj/item/ore) var/obj/structure/ore_box/linked_box diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm index 1b8da0739d6..63d8f8dda86 100644 --- a/code/modules/reagents/reagent_containers/glass.dm +++ b/code/modules/reagents/reagent_containers/glass.dm @@ -107,7 +107,8 @@ matter = list(MATERIAL_GLASS = 500) drop_sound = 'sound/items/drop/drinkglass.ogg' pickup_sound = 'sound/items/pickup/drinkglass.ogg' - fragile = 1 + fragile = TRUE + storage_slot_sort_by_name = TRUE /obj/item/reagent_containers/glass/beaker/Initialize() . = ..() diff --git a/code/modules/reagents/reagent_containers/glass/bottle.dm b/code/modules/reagents/reagent_containers/glass/bottle.dm index cecc4f94059..9bbbff7949b 100644 --- a/code/modules/reagents/reagent_containers/glass/bottle.dm +++ b/code/modules/reagents/reagent_containers/glass/bottle.dm @@ -11,6 +11,7 @@ possible_transfer_amounts = list(5,10,15,25,30,60) atom_flags = 0 volume = 60 + storage_slot_sort_by_name = TRUE /obj/item/reagent_containers/glass/bottle/on_reagent_change() update_icon() diff --git a/code/modules/reagents/reagent_containers/pill.dm b/code/modules/reagents/reagent_containers/pill.dm index d44289cc7e4..99cad30a19d 100644 --- a/code/modules/reagents/reagent_containers/pill.dm +++ b/code/modules/reagents/reagent_containers/pill.dm @@ -17,6 +17,7 @@ volume = 60 drop_sound = 'sound/items/drop/food.ogg' pickup_sound = 'sound/items/pickup/food.ogg' + storage_slot_sort_by_name = TRUE /obj/item/reagent_containers/pill/New() ..() diff --git a/html/changelogs/wezzy_chembagfix.yml b/html/changelogs/wezzy_chembagfix.yml new file mode 100644 index 00000000000..a2e037b018a --- /dev/null +++ b/html/changelogs/wezzy_chembagfix.yml @@ -0,0 +1,58 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# Your name. +author: Wowzewow (Wezzy) + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - bugfix: "Fixes mining and chem bags."