Skip to content

Adds Even More Fill And Transfer Options #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Puckaboo2 wants to merge 2 commits into from
Closed

Adds Even More Fill And Transfer Options #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f4d5a45
Adds More Reagent Transfer Options
Puckaboo2 Nov 9, 2025
25da6d9
Merge remote-tracking branch 'upstream/master' into morefilloptions
Puckaboo2 Nov 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion code/game/objects/items/paint.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ GLOBAL_LIST_EMPTY(cached_icons)
matter = list("metal" = 200)
w_class = SIZE_MEDIUM
amount_per_transfer_from_this = 10
possible_transfer_amounts = list(10,20,30,50,70)
possible_transfer_amounts = list(5,10,15,20,30,35,40,50,60,70)
volume = 70
flags_atom = FPRINT|OPENCONTAINER
var/paint_type = ""
Expand Down
4 changes: 2 additions & 2 deletions code/game/objects/items/reagent_containers/glass.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -616,7 +616,7 @@
matter = list("metal" = 2000)
w_class = SIZE_MEDIUM
amount_per_transfer_from_this = 20
possible_transfer_amounts = list(10,20,30,60,120)
possible_transfer_amounts = list(5,10,15,20,25,30,40,50,60,100,120)
volume = 120
flags_atom = FPRINT|OPENCONTAINER

Expand Down Expand Up @@ -685,7 +685,7 @@
matter = list("metal" = 4000)
w_class = SIZE_LARGE
amount_per_transfer_from_this = 20
possible_transfer_amounts = list(10,20,30,60,120,240)
possible_transfer_amounts = list(5,10,15,20,25,30,40,50,60,100,120,150,240)
volume = 240
flags_atom = FPRINT|OPENCONTAINER

Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/reagent_containers/glass/bottle.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
icon_state = "bottle-1"
item_state = "bottle-1"
amount_per_transfer_from_this = 10
possible_transfer_amounts = list(5, 10, 15, 25, 30, 40, 60)
possible_transfer_amounts = list(5, 10, 15, 20, 25, 30, 40, 50, 60)
flags_atom = FPRINT|OPENCONTAINER
volume = 60
attack_speed = 4
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/reagent_containers/hypospray.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
icon_state = "hypo"
amount_per_transfer_from_this = 5
volume = 30
possible_transfer_amounts = list(3, 5, 10, 15, 30)
possible_transfer_amounts = list(1,3,5,10,15,20,25,30)
flags_atom = FPRINT|OPENCONTAINER
flags_equip_slot = SLOT_WAIST
flags_item = NOBLUDGEON
Expand Down
2 changes: 1 addition & 1 deletion code/modules/reagents/chemistry_machinery/chem_dispenser.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
var/accept_beaker_only = TRUE
var/obj/item/reagent_container/beaker = null
var/ui_check = 0
var/static/list/possible_transfer_amounts = list(5,10,20,30,40)
var/static/list/possible_transfer_amounts = list(5,10,15,20,30,40,60)
/// List of typepaths for reagent containers that a chem dispenser will accept; all containers allowed if empty.
var/list/whitelisted_containers = list()
var/list/dispensable_reagents = list(
Expand Down
4 changes: 3 additions & 1 deletion tgui/packages/tgui/interfaces/ChemMaster.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ export const ChemMaster = () => {
};

return (
<Window width={550} height={600}>
<Window width={600} height={600}>
<Window.Content
className="ChemMaster"
onClick={() => setDeletingPreset(null)}
Expand Down Expand Up @@ -1598,6 +1598,8 @@ const Reagents = (props: {
<ReagentButton amount={1} reagent={reagent} type={type} />
<ReagentButton amount={5} reagent={reagent} type={type} />
<ReagentButton amount={10} reagent={reagent} type={type} />
<ReagentButton amount={15} reagent={reagent} type={type} />
<ReagentButton amount={20} reagent={reagent} type={type} />
<ReagentButton amount={30} reagent={reagent} type={type} />
<ReagentButton amount={60} reagent={reagent} type={type} />
<ReagentButton amount={'All'} reagent={reagent} type={type} />
Expand Down