shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3570 from Citadel-Station-13/upstream-merge-31885

Browse Source 
Fixes #3397
This commit is contained in:
LetterJay
2017-10-23 15:08:11 -04:00
committed by GitHub
parent 78e0e83bf2 6dfe89b419
commit 97929ff3f1
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/chemistry/machinery/reagentgrinder.dm
+4 -2
View File
@@ -285,7 +285,9 @@
updateUsrDialog()
/obj/machinery/reagentgrinder/proc/get_allowed_by_obj(obj/item/O)
return blend_items[O.type]
for (var/i in blend_items)
if (istype(O, i))
return blend_items[i]
/obj/machinery/reagentgrinder/proc/get_allowed_juice_by_obj(obj/item/reagent_containers/food/snacks/O)
for(var/i in juice_items)
@@ -433,7 +435,7 @@
if (O.Uses > 0)
beaker.reagents.add_reagent("slimejelly",min(20, space))
remove_object(O)
else if(istype(I, /obj/item/reagent_containers))
if(istype(I, /obj/item/reagent_containers))
var/obj/item/reagent_containers/O = I
var/amount = O.reagents.total_volume
O.reagents.trans_to(beaker, amount)