cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-10 23:54:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7987 from phil235/SugarSatietyRemoval

Browse Source 
Remove sugar satiety effect
This commit is contained in:
Swag McYolosteinen
2015-03-02 18:17:40 +01:00
parent 969b301930 fa0e5344ef
commit daffcdf075
4 changed files with 2 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/food&drinks/drinks/drinks.dm
-4
View File
@@ -33,10 +33,6 @@
return 0
if(M == user)
if(src.reagents.has_reagent("sugar") && M.satiety < -150 && M.nutrition > NUTRITION_LEVEL_STARVING + 50 )
M << "<span class='notice'>You don't feel like drinking any more sugary drink at the moment.</span>"
return 0
M << "<span class='notice'>You swallow a gulp of [src].</span>"
if(reagents.total_volume)
reagents.reaction(M, INGEST)
code/modules/food&drinks/food/condiment.dm
-3
View File
@@ -40,9 +40,6 @@
return 0
if(M == user)
if(src.reagents.has_reagent("sugar") && M.satiety < -150 && M.nutrition > NUTRITION_LEVEL_STARVING + 50 )
M << "<span class='notice'>You don't feel like drinking any more sugary food at the moment.</span>"
return 0
M << "<span class='notice'>You swallow some of contents of \the [src].</span>"
if(reagents.total_volume)
reagents.reaction(M, INGEST)
code/modules/food&drinks/food/snacks.dm
+2 -2
View File
@@ -59,8 +59,8 @@
fullness += C.nutriment_factor * C.volume / C.metabolization_rate
if(M == user) //If you're eating it yourself.
if(src.reagents.has_reagent("sugar") && M.satiety < -150 && M.nutrition > NUTRITION_LEVEL_STARVING + 50 )
M << "<span class='notice'>You don't feel like eating any more sugary food at the moment.</span>"
if(junkiness && M.satiety < -150 && M.nutrition > NUTRITION_LEVEL_STARVING + 50 )
M << "<span class='notice'>You don't feel like eating any more junk food at the moment.</span>"
return 0
if(wrapped)
code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Food-Reagents.dm
-6
View File
@@ -55,12 +55,6 @@ datum/reagent/consumable/sugar
metabolization_rate = 2 * REAGENTS_METABOLISM
overdose_threshold = 200 // Hyperglycaemic shock
datum/reagent/consumable/sugar/on_mob_life(var/mob/living/M as mob)
if(M.satiety > -200)
M.satiety -= 20 //eating sugar makes you more hungry over time by making your hunger drop faster.
M.nutrition += max(((NUTRITION_LEVEL_FED + 50) - M.nutrition )/100, 0) * nutriment_factor // sugar doesn't help your hunger if your stomach is nearly full
holder.remove_reagent(src.id, metabolization_rate)
datum/reagent/consumable/sugar/overdose_start(var/mob/living/M as mob)
M << "<span class = 'userdanger'>You go into hyperglycaemic shock! Lay off the twinkies!</span>"
M.sleeping += 30