cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 11:43:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #8611

Browse Source
This commit is contained in:
Zuhayr
2015-04-01 07:24:53 -07:00
parent 63a2fc6bff
commit 5326abb67d
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
code/modules/reagents/Chemistry-Machinery.dm
View File

@@ -1020,6 +1020,9 @@
continue continue
var/remaining_volume = beaker.reagents.maximum_volume - beaker.reagents.total_volume var/remaining_volume = beaker.reagents.maximum_volume - beaker.reagents.total_volume
if(remaining_volume <= 0)
break
if(sheet_reagents[O.type]) if(sheet_reagents[O.type])
var/obj/item/stack/stack = O var/obj/item/stack/stack = O
if(istype(stack)) if(istype(stack))
@@ -1029,10 +1032,11 @@
beaker.reagents.add_reagent(sheet_reagents[stack.type], (amount_to_take*REAGENTS_PER_SHEET)) beaker.reagents.add_reagent(sheet_reagents[stack.type], (amount_to_take*REAGENTS_PER_SHEET))
continue continue
O.reagents.trans_to(beaker, min(O.reagents.total_volume, remaining_volume)) if(O.reagents)
if(O.reagents.total_volume == 0) O.reagents.trans_to(beaker, min(O.reagents.total_volume, remaining_volume))
remove_object(O) if(O.reagents.total_volume == 0)
if (beaker.reagents.total_volume >= beaker.reagents.maximum_volume) remove_object(O)
break if (beaker.reagents.total_volume >= beaker.reagents.maximum_volume)
break
#undef REAGENTS_PER_SHEET #undef REAGENTS_PER_SHEET