fixes a bunch of bugs (Citadel-Station-13#5578)

Co-authored-by: silicons <[email protected]>
MonaraMir · Jun 9, 2023 · 4b7a379 · 4b7a379
1 parent 36b502b
commit 4b7a379
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/code/modules/mob/living/simple_mob/simple_mob.dm b/code/modules/mob/living/simple_mob/simple_mob.dm
@@ -356,15 +356,14 @@
 	if(C.statpanel_tab("Status") && show_stat_health)
 		STATPANEL_DATA_LINE("Health: [round((health / getMaxHealth()) * 100)]%")
 
-/mob/living/simple_mob/lay_down()
-	..()
+/mob/living/simple_mob/set_resting(value)
+	. = ..()
 	if(resting && icon_rest)
 		icon_state = icon_rest
 	else
 		icon_state = icon_living
 	update_icon()
 
-
 /mob/living/simple_mob/say(var/message, var/datum/language/speaking = null, var/verb="says", var/alt_name="", var/whispering = 0)
 	verb = "says"
 	if(speak_emote.len)

diff --git a/code/modules/preferences/preference_setup/general/06_flavor.dm b/code/modules/preferences/preference_setup/general/06_flavor.dm
@@ -92,9 +92,9 @@
 
 /datum/category_item/player_setup_item/general/flavor/spawn_checks(datum/preferences/prefs, data, flags, list/errors, list/warnings)
 	. = TRUE
-	if(!length(prefs.flavor_texts["general"]))
+	if(!length(prefs.flavor_texts["general"]) && !length(prefs.flavour_texts_robot["flavour_texts_robot_Default"]))
 		var/enforcing = CONFIG_GET(flag/enforce_flavor_text)
-		var/error = "Missing or insufficient general flavor text - See Character Setup for information."
+		var/error = "Missing or insufficient general flavor text - See Character Setup for information. You need either 'general' flavor text, or 'Default' robot flavor text set."
 		if(enforcing)
 			errors += error
 			. = FALSE