cyberpresidentvanellope/GS13
1
0
Fork 0
mirror of https://github.com/KabKebab/GS13.git synced 2026-07-12 08:27:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Drinks dispenser fix, fat drinks tweak

Browse Source 
-Removed tea from the bartender's drinks dispenser, as it was not working. Replaced by tea powder/ground tea leaves.
-Fatty drinks now work if the food WG preference is on, instead of chems
-Fruits tea now also works as if it were normal tea, on top of adding fatness
This commit is contained in:
Alphas00
2024-01-07 19:22:09 +01:00
parent 86abc6ec6b
commit a0cf16bde9
2 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GainStation13/code/modules/reagents/chemistry/reagents/fatty_drinks.dm
+14 -6
View File
@@ -14,7 +14,7 @@
hydration = 3
/datum/reagent/consumable/ethanol/belly_bloats/on_mob_life(mob/living/carbon/M)
if(M && M?.client?.prefs.weight_gain_chems) // GS13
if(M && M?.client?.prefs.weight_gain_food) // GS13
M.nutrition += 15 * REAGENTS_METABOLISM
else
M.nutrition += 1
@@ -34,7 +34,7 @@
hydration = 4
/datum/reagent/consumable/ethanol/blobby_mary/on_mob_life(mob/living/carbon/M)
if(M && M?.client?.prefs.weight_gain_chems) // GS13
if(M && M?.client?.prefs.weight_gain_food) // GS13
M.nutrition += 25 * REAGENTS_METABOLISM
else
M.nutrition += 1
@@ -54,7 +54,7 @@
hydration = 4
/datum/reagent/consumable/ethanol/beltbuster_mead/on_mob_life(mob/living/carbon/M)
if(M && M?.client?.prefs.weight_gain_chems) // GS13
if(M && M?.client?.prefs.weight_gain_food) // GS13
M.nutrition += 30 * REAGENTS_METABOLISM
else
M.nutrition += 1
@@ -80,7 +80,7 @@
M.Jitter(5)
if(M.getBruteLoss() && prob(20))
M.heal_bodypart_damage(1,0, 0)
if(M && M?.client?.prefs.weight_gain_chems) // GS13
if(M && M?.client?.prefs.weight_gain_food) // GS13
M.nutrition += 15 * REAGENTS_METABOLISM
else
M.nutrition += 1
@@ -99,11 +99,19 @@
hydration = 4
/datum/reagent/consumable/fruits_tea/on_mob_life(mob/living/carbon/M)
if(M && M?.client?.prefs.weight_gain_chems) // GS13
M.dizziness = max(0,M.dizziness-2)
M.drowsyness = max(0,M.drowsyness-1)
M.jitteriness = max(0,M.jitteriness-3)
M.AdjustSleeping(-20, FALSE)
if(M.getToxLoss() && prob(20))
M.adjustToxLoss(-1, 0)
M.adjust_bodytemperature(20 * TEMPERATURE_DAMAGE_COEFFICIENT, 0, BODYTEMP_NORMAL)
if(M && M?.client?.prefs.weight_gain_food) // GS13
M.nutrition += 15 * REAGENTS_METABOLISM
else
M.nutrition += 1
..()
. = 1
/datum/reagent/consumable/snakebite
name = "Snakebite"
@@ -118,7 +126,7 @@
hydration = 4
/datum/reagent/consumable/snakebite/on_mob_life(mob/living/carbon/M)
if(M && M?.client?.prefs.weight_gain_chems) // GS13
if(M && M?.client?.prefs.weight_gain_food) // GS13
M.nutrition += 25 * REAGENTS_METABOLISM
else
M.nutrition += 1
code/modules/reagents/chemistry/machinery/chem_dispenser.dm
+1 -2
View File
@@ -475,8 +475,7 @@
/datum/reagent/consumable/ice,
/datum/reagent/consumable/coffee,
/datum/reagent/consumable/cream,
/datum/reagent/consumable/tea/pinktea,
/datum/reagent/consumable/icetea,
/datum/reagent/toxin/teapowder,
/datum/reagent/consumable/space_cola,
/datum/reagent/consumable/spacemountainwind,
/datum/reagent/consumable/dr_gibb,