cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-12 16:44:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Changes some stuff Giacom provided input on. Thanks Aranclanos and Kaze Espada for the help.

Browse Source
This commit is contained in:
AstralSerpent
2013-10-06 07:21:19 +11:00
parent 113d6c0193
commit 73d4b247a2
3 changed files with 7 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/Chemistry-Machinery.dm
+6 -10
View File
@@ -953,7 +953,7 @@ obj/machinery/computer/pandemic/proc/replicator_cooldown(var/waittime)
return 1
return 0
/obj/machinery/reagentgrinder/proc/get_allowed_by_id(var/obj/item/weapon/grown/O)
/obj/machinery/reagentgrinder/proc/get_allowed_by_id(var/obj/item/O)
for (var/i in blend_items)
if (istype(O, i))
return blend_items[i]
@@ -1098,7 +1098,8 @@ obj/machinery/computer/pandemic/proc/replicator_cooldown(var/waittime)
remove_object(O)
//Crayons
//Crayons
//With some input from aranclanos, now 30% less shoddily copypasta
for (var/obj/item/toy/crayon/O in holdingitems)
if (beaker.reagents.total_volume >= beaker.reagents.maximum_volume)
break
@@ -1106,15 +1107,10 @@ obj/machinery/computer/pandemic/proc/replicator_cooldown(var/waittime)
for (var/r_id in allowed)
var/space = beaker.reagents.maximum_volume - beaker.reagents.total_volume
var/amount = allowed[r_id]
if (amount == 0)
if (O.reagents != null && O.reagents.has_reagent(r_id))
beaker.reagents.add_reagent(r_id,min(O.reagents.get_reagent_amount(r_id), space))
else
beaker.reagents.add_reagent(r_id,min(amount, space))
if (beaker.reagents.total_volume >= beaker.reagents.maximum_volume)
beaker.reagents.add_reagent(r_id,min(amount, space))
if (space < amount)
break
remove_object(O)
remove_object(O)
//Everything else - Transfers reagents from it into beaker
for (var/obj/item/weapon/reagent_containers/O in holdingitems)