Merge pull request #63 from Superlagg/i-feel-nothing-and-i-hunger-for…

…ever Remove mood component and add no hunger trait
ARF-SS13 · Aug 17, 2024 · 539f9f6 · 539f9f6
2 parents 2d5f460 + 33d7d6f
commit 539f9f6
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 4 deletions.
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
@@ -55,8 +55,8 @@ GLOBAL_VAR_INIT(crotch_call_cooldown, 0)
 
 /mob/living/carbon/human/ComponentInitialize()
 	. = ..()
-	if(!CONFIG_GET(flag/disable_human_mood))
-		AddComponent(/datum/component/mood)
+	// if(!CONFIG_GET(flag/disable_human_mood))
+	// 	AddComponent(/datum/component/mood)
 	AddComponent(/datum/component/combat_mode)
 	AddElement(/datum/element/flavor_text/carbon, _name = "Flavor Text", _save_key = "flavor_text")
 	AddElement(/datum/element/flavor_text, "", "Set Pose/Leave OOC Message", "This should be used only for things pertaining to the current round!")

diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm
@@ -83,7 +83,7 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
 	// species-only traits. Can be found in DNA.dm
 	var/list/species_traits = list(HAS_FLESH,HAS_BONE) //by default they can scar and have bones/flesh unless set to something else
 	// generic traits tied to having the species
-	var/list/inherent_traits = list()
+	var/list/inherent_traits = list(TRAIT_NOHUNGER)
 	var/inherent_biotypes = MOB_ORGANIC|MOB_HUMANOID
 
 	var/attack_verb = "punch"	// punch-specific attack verb

diff --git a/code/modules/mob/living/carbon/human/species_types/dwarves.dm b/code/modules/mob/living/carbon/human/species_types/dwarves.dm
@@ -3,7 +3,7 @@
 	id = "dwarf" //Also called Homo sapiens pumilionis
 	default_color = "FFFFFF"
 	species_traits = list(EYECOLOR,HAIR,FACEHAIR,LIPS,MUTCOLORS,HORNCOLOR,WINGCOLOR,HAS_FLESH,HAS_BONE)
-	inherent_traits = list(TRAIT_DWARF)
+	inherent_traits = list(TRAIT_DWARF,TRAIT_NOHUNGER)
 	limbs_id = "human"
 
 	mutant_bodyparts = list("mcolor" = "FFFFFF","mcolor2" = "FFFFFF","mcolor3" = "FFFFFF", "mam_snouts" = "Husky", "mam_tail" = "Husky", "mam_ears" = "Husky", "deco_wings" = "None",

diff --git a/code/modules/mob/living/carbon/human/species_types/ipc.dm b/code/modules/mob/living/carbon/human/species_types/ipc.dm
@@ -26,6 +26,7 @@
 		TRAIT_CLONEIMMUNE,
 		TRAIT_VIRUSIMMUNE,
 		TRAIT_MUTATION_STASIS,
+		TRAIT_NOHUNGER,
 		)
 	hair_alpha = 210
 	inherent_biotypes = MOB_ROBOTIC|MOB_HUMANOID

diff --git a/code/modules/mob/living/carbon/human/species_types/synthliz.dm b/code/modules/mob/living/carbon/human/species_types/synthliz.dm
@@ -23,6 +23,7 @@
 		TRAIT_CLONEIMMUNE,
 		TRAIT_VIRUSIMMUNE,
 		TRAIT_MUTATION_STASIS,
+		TRAIT_NOHUNGER,
 		)
 	inherent_biotypes = MOB_ROBOTIC|MOB_HUMANOID|MOB_REPTILE|MOB_BEAST|MOB_SYNTH
 	mutant_bodyparts = list(