Skip to content

Commit

Permalink
Revert "feat(nutrition): prolonged overeating or starving change body…
Browse files Browse the repository at this point in the history
… type"

This reverts commit 1f0b3a9.
  • Loading branch information
intercepti0n authored Oct 11, 2023
1 parent a9d2838 commit 7ed6046
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 55 deletions.
2 changes: 0 additions & 2 deletions code/datums/configuration/health_section.dm
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
var/organ_health_multiplier = 0.9
var/organ_regeneration_multiplier = 0.25
var/organ_damage_spillover_multiplier = 0.5
var/bodybuild_change_time = 4 MINUTES

/datum/configuration_section/health/load_data(list/data)
CONFIG_LOAD_NUM(health_threshold_dead, data["health_threshold_dead"])
Expand All @@ -18,4 +17,3 @@
CONFIG_LOAD_NUM(organ_health_multiplier, data["organ_health_multiplier"])
CONFIG_LOAD_NUM(organ_regeneration_multiplier, data["organ_regeneration_multiplier"])
CONFIG_LOAD_NUM(organ_damage_spillover_multiplier, data["organ_damage_spillover_multiplier"])
CONFIG_LOAD_NUM(bodybuild_change_time, data["bodybuild_change_time"])
23 changes: 0 additions & 23 deletions code/modules/mob/living/carbon/human/body_build.dm
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,6 @@ var/global/datum/body_build/default_body_build = new
var/poise_pool = HUMAN_DEFAULT_POISE
var/stomach_capacity = STOMACH_CAPACITY_NORMAL

var/next_body_build = "Fat"
var/previous_body_build ="Slim"

/datum/body_build/proc/get_mob_icon(slot, icon_state)
var/icon/I
if(!(slot in default_onmob_slots))
Expand Down Expand Up @@ -87,9 +84,6 @@ var/global/datum/body_build/default_body_build = new
stomach_capacity = STOMACH_CAPACITY_LOW
poise_pool = HUMAN_LOW_POISE

next_body_build = "Default"
previous_body_build ="Slim Alt"

/datum/body_build/slim/alt
name = "Slim Alt"
index = "_slim_alt"
Expand Down Expand Up @@ -117,9 +111,6 @@ var/global/datum/body_build/default_body_build = new
blood_icon = 'icons/mob/human_races/masks/blood_human_slim_alt.dmi'
dam_mask = 'icons/mob/human_races/masks/dam_mask_human_slim_alt.dmi'

next_body_build = "Slim"
previous_body_build = null

/datum/body_build/slim/male
name = "Slim"
index = "_slim"
Expand Down Expand Up @@ -147,9 +138,6 @@ var/global/datum/body_build/default_body_build = new
blood_icon = 'icons/mob/human_races/masks/blood_human_m_slim.dmi'
dam_mask = 'icons/mob/human_races/masks/dam_mask_human_m_slim.dmi'

next_body_build = "Default"
previous_body_build = null

/datum/body_build/fat
name = "Fat"
index = "_fat"
Expand Down Expand Up @@ -183,8 +171,6 @@ var/global/datum/body_build/default_body_build = new
equipment_modifier = 0.5
poise_pool = HUMAN_HIGH_POISE

next_body_build = null
previous_body_build = "Default"

/datum/body_build/slim/alt/tajaran //*sigh. I regret of doing this.
name = "Slim Tajaran"
Expand Down Expand Up @@ -215,9 +201,6 @@ var/global/datum/body_build/default_body_build = new

equipment_modifier = -0.5

next_body_build = "Tajaran"
previous_body_build = null

/datum/body_build/tajaran
name = "Tajaran"

Expand All @@ -242,9 +225,6 @@ var/global/datum/body_build/default_body_build = new
)
dam_mask = 'icons/mob/human_races/masks/dam_mask_tajaran.dmi'

next_body_build = "Fat Tajaran"
previous_body_build = "Slim Tajaran"

/datum/body_build/tajaran/fat
name = "Fat Tajaran"
index = "_fat"
Expand Down Expand Up @@ -274,9 +254,6 @@ var/global/datum/body_build/default_body_build = new
equipment_modifier = 0.5
poise_pool = HUMAN_HIGH_POISE

next_body_build = null
previous_body_build = "Tajaran"

/datum/body_build/unathi
name = SPECIES_UNATHI

Expand Down
27 changes: 0 additions & 27 deletions code/modules/mob/living/carbon/human/life.dm
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,6 @@

#define RADIATION_SPEED_COEFFICIENT (0.0005 SIEVERT)

#define STARVATION 1
#define OVEREATING 2

/mob/living/carbon/human
var/oxygen_alert = 0
var/plasma_alert = 0
Expand All @@ -45,8 +42,6 @@
var/poise = HUMAN_DEFAULT_POISE
var/blocking_hand = 0 //0 for main hand, 1 for offhand
var/last_block = 0
var/nutrition_problem = FALSE
var/nutrition_problem_start = 0

/mob/living/carbon/human/Initialize()
. = ..()
Expand Down Expand Up @@ -702,28 +697,6 @@
if(STOMACH_FULLNESS_SUPER_HIGH to INFINITY)
to_chat(src, SPAN("warning", "[pick("You definitely overate", "Thinking about food makes you gag", "It would be nice to clear your stomach")]..."))

// body build correction
var/normalized_nutrition = nutrition / body_build.stomach_capacity
if(normalized_nutrition <= STOMACH_FULLNESS_SUPER_LOW)
if(!nutrition_problem)
nutrition_problem_start = world.time
nutrition_problem = STARVATION
else if(normalized_nutrition >= STOMACH_FULLNESS_SUPER_HIGH)
if(!nutrition_problem)
nutrition_problem_start = world.time
nutrition_problem = OVEREATING
else
nutrition_problem = FALSE

if(nutrition_problem && (world.time > nutrition_problem_start + config.health.bodybuild_change_time))
var/BB = nutrition_problem == OVEREATING ? body_build.next_body_build : body_build.previous_body_build
if(BB)
var/datum/body_build/new_body_build = species.get_body_build(gender, BB)
if(new_body_build)
change_body_build(new_body_build)
to_chat(src, SPAN("warning", "You've [nutrition_problem == OVEREATING ? "gained" : "lost"] some weight!"))
nutrition_problem = FALSE

if(stasis_value > 1 && drowsyness < stasis_value * 4)
drowsyness += min(stasis_value, 3)
if(!stat && prob(1))
Expand Down
3 changes: 0 additions & 3 deletions config/example/config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -421,9 +421,6 @@ organ_regeneration_multiplier = 0.25
## 1.0 means normal, 0.5 means half.
organ_damage_spillover_multiplier = 0.5

## Amount of time (in hundredths of seconds) a spessman must starve / overat before changing bodybuild (set to -1 to disable).
bodybuild_change_time = -1

[revival]
## If cortical stacks (aka neurolace) are to be used.
use_cortical_stacks = true
Expand Down

0 comments on commit 7ed6046

Please sign in to comment.