shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Coonflict fiiixeeess

Browse Source
This commit is contained in:
Artur
2020-05-13 12:56:17 +03:00
parent 5b7d9a9008 871361936c
commit dabdf16eac
261 changed files with 3312 additions and 1483 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/chemistry/reagents/alcohol_reagents.dm
+3 -3
View File
@@ -1834,7 +1834,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
/datum/reagent/consumable/ethanol/fernet/on_mob_life(mob/living/carbon/M)
if(M.nutrition <= NUTRITION_LEVEL_STARVING)
M.adjustToxLoss(1*REM, 0)
M.nutrition = max(M.nutrition - 5, 0)
M.adjust_nutrition(-5)
M.overeatduration = 0
return ..()
@@ -1852,7 +1852,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
/datum/reagent/consumable/ethanol/fernet_cola/on_mob_life(mob/living/carbon/M)
if(M.nutrition <= NUTRITION_LEVEL_STARVING)
M.adjustToxLoss(0.5*REM, 0)
M.nutrition = max(M.nutrition - 3, 0)
M.adjust_nutrition(-3)
M.overeatduration = 0
return ..()
@@ -1868,7 +1868,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_desc = "A glass of Fanciulli. It's just Manhattan with Fernet."
/datum/reagent/consumable/ethanol/fanciulli/on_mob_life(mob/living/carbon/M)
M.nutrition = max(M.nutrition - 5, 0)
M.adjust_nutrition(-5)
M.overeatduration = 0
return ..()
code/modules/reagents/chemistry/reagents/drink_reagents.dm
+2 -3
View File
@@ -692,9 +692,8 @@
M.adjustFireLoss(-0.5, 0)
M.adjustToxLoss(-0.5, 0)
M.adjustOxyLoss(-0.5, 0)
if(M.nutrition && (M.nutrition - 2 > 0))
if(!(M.mind && M.mind.assigned_role == "Medical Doctor")) //Drains the nutrition of the holder. Not medical doctors though, since it's the Doctor's Delight!
M.nutrition -= 2
if(!(M.mind && M.mind.assigned_role == "Medical Doctor")) //Drains the nutrition of the holder. Not medical doctors though, since it's the Doctor's Delight!
M.adjust_nutrition(-2)
..()
. = 1
code/modules/reagents/chemistry/reagents/food_reagents.dm
+3 -5
View File
@@ -13,11 +13,12 @@
taste_mult = 4
value = REAGENT_VALUE_VERY_COMMON
var/nutriment_factor = 1 * REAGENTS_METABOLISM
var/max_nutrition = INFINITY
var/quality = 0 //affects mood, typically higher for mixed drinks with more complex recipes
/datum/reagent/consumable/on_mob_life(mob/living/carbon/M)
current_cycle++
M.nutrition += nutriment_factor
M.adjust_nutrition(nutriment_factor, max_nutrition)
M.CheckBloodsuckerEatFood(nutriment_factor)
holder.remove_reagent(type, metabolization_rate)
@@ -694,13 +695,10 @@
description = "A bioengineered protien-nutrient structure designed to decompose in high saturation. In layman's terms, it won't get you fat."
reagent_state = SOLID
nutriment_factor = 12 * REAGENTS_METABOLISM
max_nutrition = NUTRITION_LEVEL_FULL - 25
color = "#664330" // rgb: 102, 67, 48
value = REAGENT_VALUE_RARE
/datum/reagent/consumable/nutriment/stabilized/on_mob_life(mob/living/carbon/M)
if(M.nutrition > NUTRITION_LEVEL_FULL - 25)
M.nutrition -= 3*nutriment_factor
..()
////Lavaland Flora Reagents////
code/modules/reagents/chemistry/reagents/medicine_reagents.dm
+9 -9
View File
@@ -413,7 +413,7 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
/datum/reagent/medicine/mine_salve/reaction_mob(mob/living/M, method=TOUCH, reac_volume, show_message = 1)
if(iscarbon(M) && M.stat != DEAD)
if(method in list(INGEST, VAPOR, INJECT))
M.nutrition -= 5
M.adjust_nutrition(-5)
if(show_message)
to_chat(M, "<span class='warning'>Your stomach feels empty and cramps!</span>")
else
@@ -1218,15 +1218,15 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
value = REAGENT_VALUE_VERY_RARE
/datum/reagent/medicine/lesser_syndicate_nanites/on_mob_life(mob/living/carbon/M)
M.adjustBruteLoss(-3*REM, FALSE) // hidden gold shh
M.adjustFireLoss(-3*REM, FALSE)
M.adjustOxyLoss(-15, FALSE)
M.adjustToxLoss(-3*REM, FALSE)
M.adjustOrganLoss(ORGAN_SLOT_BRAIN, -15*REM)
M.adjustCloneLoss(-3*REM, FALSE)
M.adjustStaminaLoss(-20*REM,FALSE)
M.adjustBruteLoss(-2*REM, FALSE)
M.adjustFireLoss(-2*REM, FALSE)
M.adjustOxyLoss(-5*REM, FALSE)
M.adjustToxLoss(-2*REM, FALSE)
M.adjustOrganLoss(ORGAN_SLOT_BRAIN, -5*REM)
M.adjustCloneLoss(-1.25*REM, FALSE)
M.adjustStaminaLoss(-4*REM,FALSE)
if(M.blood_volume < (BLOOD_VOLUME_NORMAL*M.blood_ratio))
M.blood_volume += 20 // blood fall out man bad
M.blood_volume += 3
..()
. = 1
code/modules/reagents/chemistry/reagents/toxin_reagents.dm
+1 -1
View File
@@ -675,7 +675,7 @@
/datum/reagent/toxin/lipolicide/on_mob_life(mob/living/carbon/M)
if(M.nutrition <= NUTRITION_LEVEL_STARVING)
M.adjustToxLoss(1*REM, 0)
M.nutrition = max(M.nutrition - 3, 0) // making the chef more valuable, one meme trap at a time
M.adjust_nutrition(-3) // making the chef more valuable, one meme trap at a time
M.overeatduration = 0
return ..()