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

Commiting for Numbers:

Browse Source 
* Flour produce should be accurate now producing a whole lot now
* Added multipliers to grinder nutriment transformation functionality. Any negative number is treated as a multiplier now -1.5 would turn x nutriments into 1.5x products etc.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4932 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
giacomand@gmail.com
2012-10-21 21:40:16 +00:00
parent d5422f6a7e
commit 0f88f133fb
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -696,7 +696,7 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/soybeans = list("soymilk" = 0), /obj/item/weapon/reagent_containers/food/snacks/grown/soybeans = list("soymilk" = 0),
/obj/item/weapon/reagent_containers/food/snacks/grown/tomato = list("ketchup" = 0), /obj/item/weapon/reagent_containers/food/snacks/grown/tomato = list("ketchup" = 0),
/obj/item/weapon/reagent_containers/food/snacks/grown/corn = list("cornoil" = 0), /obj/item/weapon/reagent_containers/food/snacks/grown/corn = list("cornoil" = 0),
/obj/item/weapon/reagent_containers/food/snacks/grown/wheat = list("flour" = 0), /obj/item/weapon/reagent_containers/food/snacks/grown/wheat = list("flour" = -5),
/obj/item/weapon/reagent_containers/food/snacks/grown/cherries = list("cherryjelly" = 0), /obj/item/weapon/reagent_containers/food/snacks/grown/cherries = list("cherryjelly" = 0),
@@ -961,7 +961,7 @@
spawn(60) spawn(60)
inuse = 0 inuse = 0
interact(usr) interact(usr)
//Snacks //Snacks and Plants
for (var/obj/item/weapon/reagent_containers/food/snacks/O in holdingitems) for (var/obj/item/weapon/reagent_containers/food/snacks/O in holdingitems)
if (beaker.reagents.total_volume >= beaker.reagents.maximum_volume) if (beaker.reagents.total_volume >= beaker.reagents.maximum_volume)
break break
@@ -974,10 +974,15 @@
var/space = beaker.reagents.maximum_volume - beaker.reagents.total_volume var/space = beaker.reagents.maximum_volume - beaker.reagents.total_volume
var/amount = allowed[r_id] var/amount = allowed[r_id]
if(amount == 0) if(amount <= 0)
if (O.reagents != null && O.reagents.has_reagent("nutriment")) if(amount == 0)
beaker.reagents.add_reagent(r_id, min(O.reagents.get_reagent_amount("nutriment"), space)) if (O.reagents != null && O.reagents.has_reagent("nutriment"))
O.reagents.remove_reagent("nutriment", min(O.reagents.get_reagent_amount("nutriment"), space)) beaker.reagents.add_reagent(r_id, min(O.reagents.get_reagent_amount("nutriment"), space))
O.reagents.remove_reagent("nutriment", min(O.reagents.get_reagent_amount("nutriment"), space))
else
if (O.reagents != null && O.reagents.has_reagent("nutriment"))
beaker.reagents.add_reagent(r_id, min(round(O.reagents.get_reagent_amount("nutriment")*abs(amount)), space))
O.reagents.remove_reagent("nutriment", min(O.reagents.get_reagent_amount("nutriment"), space))
else else
O.reagents.trans_id_to(beaker, r_id, min(amount, space)) O.reagents.trans_id_to(beaker, r_id, min(amount, space))