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

Reversions and fixes (#7889)

Browse Source 
Co-authored-by: Selis <selis@xynolabs.com>
This commit is contained in:
Raeschen
2024-03-06 18:20:29 +01:00
committed by GitHub
parent c277710a50
commit e29b9d4d35
37 changed files with 254 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/modules/reagents/holder/holder.dm
View File

@@ -243,7 +243,10 @@
if(!target || !istype(target))
return
amount = max(0, min(amount, total_volume, target.get_free_space() / multiplier))
if(multiplier)
amount = max(0, min(amount, total_volume, target.get_free_space() / multiplier))
else
amount = max(0, min(amount, total_volume))
if(!amount)
return

2
code/modules/reagents/reagents/dispenser.dm
View File

@@ -443,7 +443,7 @@
if(B.item_digest_mode == IM_HOLD)
return
var/obj/item/I = O
var/spent_amt = I.digest_act(I.loc, 1, amount / (meltdose / 3))
var/spent_amt = I.digest_act(B, 1, amount / (meltdose / 3))
remove_self(spent_amt) //10u stomacid per w_class, less if stronger acid.
if(B.owner)
B.owner_adjust_nutrition((B.nutrition_percent / 100) * 5 * spent_amt)