Merge pull request #1041 from ariaworld/tweak-undead

[SEMI-MODULAR] Undead Quirk Rebalance + Sleep Healing + Quirk tweaks and additions
SPLURT-Station · Feb 16, 2024 · e5a6921 · e5a6921
2 parents 8d58957 + e155e39
commit e5a6921
Show file tree

Hide file tree

Showing 19 changed files with 518 additions and 368 deletions.
diff --git a/code/__SPLURTCODE/DEFINES/traits.dm b/code/__SPLURTCODE/DEFINES/traits.dm
@@ -34,6 +34,7 @@
 #define TRAIT_WEREWOLF			"werewolf"
 #define TRAIT_PRIMITIVE			"primitive"
 #define TRAIT_STEEL_ASS			"steel_ass"
+#define TRAIT_JIGGLY_ASS        "jiggly_ass"
 #define TRAIT_CURSED_BLOOD		"cursed_blood"
 #define TRAIT_HEADPAT_SLUT		"headpat_slut"
 #define TRAIT_DISTANT			"headpat_hater"
@@ -47,3 +48,4 @@
 #define TRAIT_BODY_MORPHER		"body_morpher"
 #define TRAIT_HALLOWED			"hallowed"
 #define TRAIT_MESSY				"messy"
+#define TRAIT_RESTORATIVE_METABOLISM   "restorative_metabolism"
diff --git a/code/controllers/subsystem/materials.dm b/code/controllers/subsystem/materials.dm
@@ -21,7 +21,7 @@ SUBSYSTEM_DEF(materials)
 		new /datum/stack_recipe("Chair", /obj/structure/chair/greyscale, one_per_turf = TRUE, on_floor = TRUE, applies_mats = TRUE),
 		new /datum/stack_recipe("Toilet", /obj/structure/toilet/greyscale, one_per_turf = TRUE, on_floor = TRUE, applies_mats = TRUE),
 		new /datum/stack_recipe("Sink Frame", /obj/structure/sink/greyscale, one_per_turf = TRUE, on_floor = TRUE, applies_mats = TRUE),
-		new /datum/stack_recipe("Floor tile", /obj/item/stack/tile/material, 1, 4, 20, applies_mats = TRUE),
+		new /datum/stack_recipe("Material Floor tile", /obj/item/stack/tile/material, 1, 4, 20, applies_mats = TRUE),
 	)
 	///List of stackcrafting recipes for materials using rigid recipes
 	var/list/rigid_stack_recipes = list(

diff --git a/code/datums/components/mood.dm b/code/datums/components/mood.dm
@@ -329,7 +329,9 @@
 		return FALSE //no mood events for nutrition
 	switch(L.nutrition)
 		if(NUTRITION_LEVEL_FULL to INFINITY)
-			add_event(null, "nutrition", /datum/mood_event/fat)
+			if(!(HAS_TRAIT(L, TRAIT_INCUBUS) || HAS_TRAIT(L, TRAIT_SUCCUBUS)))
+			//No bad fat mood for incubi/succubi, voracious gets a positive mood in needs_events.dm
+				add_event(null, "nutrition", /datum/mood_event/fat)
 		if(NUTRITION_LEVEL_WELL_FED to NUTRITION_LEVEL_FULL)
 			add_event(null, "nutrition", /datum/mood_event/wellfed)
 		if(NUTRITION_LEVEL_FED to NUTRITION_LEVEL_WELL_FED)