cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-30 07:28:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge nutrition refactor for vorestation

Browse Source
This commit is contained in:
Aronai Sieyes
2020-04-29 18:34:22 -04:00
parent f1cabd6742
commit 893130bdff
32 changed files with 98 additions and 469 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/implants/implantreagent_vr.dm
+6 -5
View File
@@ -38,11 +38,12 @@
/obj/item/weapon/implant/reagent_generator/process()
var/before_gen
if(imp_in && generated_reagents)
if(isliving(imp_in) && generated_reagents)
before_gen = reagents.total_volume
var/mob/living/L = imp_in
if(reagents.total_volume < reagents.maximum_volume)
if(imp_in.nutrition >= gen_cost)
do_generation()
if(L.nutrition >= gen_cost)
do_generation(L)
else
return
else
@@ -55,8 +56,8 @@
else if(reagents.total_volume == reagents.maximum_volume && before_gen < reagents.maximum_volume)
to_chat(imp_in, "<span class='warning'>[pick(full_message)]</span>")
/obj/item/weapon/implant/reagent_generator/proc/do_generation()
imp_in.nutrition -= gen_cost
/obj/item/weapon/implant/reagent_generator/proc/do_generation(var/mob/living/L)
L.adjust_nutrition(-gen_cost)
for(var/reagent in generated_reagents)
reagents.add_reagent(reagent, generated_reagents[reagent])
code/game/objects/items/weapons/inducer_vr.dm
+1 -1
View File
@@ -269,7 +269,7 @@
/obj/item/weapon/cell/standin/give(var/amount)
. = ..(amount * NUTRITION_COEFF) //Shrink amount to store
hume.nutrition += . //Add the amount we really stored
hume.adjust_nutrition(.) //Add the amount we really stored
. /= NUTRITION_COEFF //Inflate amount to take from the giver
#undef NUTRITION_COEFF