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

Merge pull request #10939 from Baystation12/master

Browse Source 
Dev-freeze
This commit is contained in:
PsiOmegaDelta
2015-08-30 10:20:32 +02:00
parent 574094c60c bfa54052f8
commit 88250ad57f
3 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
code/modules/virus2/dishincubator.dm
View File

@@ -128,14 +128,21 @@
nanomanager.update_uis(src)
if(beaker)
if(!beaker.reagents.remove_reagent("virusfood",5))
foodsupply += 10
if(foodsupply < 100 && beaker.reagents.remove_reagent("virusfood",5))
if(foodsupply + 10 <= 100)
foodsupply += 10
else
beaker.reagents.add_reagent("virusfood",(100 - foodsupply)/2)
foodsupply = 100
nanomanager.update_uis(src)
if (locate(/datum/reagent/toxin) in beaker.reagents.reagent_list)
if (locate(/datum/reagent/toxin) in beaker.reagents.reagent_list && toxins < 100)
for(var/datum/reagent/toxin/T in beaker.reagents.reagent_list)
toxins += max(T.strength,1)
beaker.reagents.remove_reagent(T.id,1)
if(toxins > 100)
toxins = 100
break
nanomanager.update_uis(src)
/obj/machinery/disease2/incubator/Topic(href, href_list)
@@ -170,7 +177,7 @@
return 1
if (href_list["rad"])
radiation += 10
radiation = min(100, radiation + 10)
return 1
if (href_list["flush"])