From 7c4b98057712e917515689f37afb97d1c19b4872 Mon Sep 17 00:00:00 2001
From: L <rohesie@gmail.com>
Date: Fri, 25 Sep 2020 08:10:20 -0300
Subject: [PATCH] more stringlists

---
 code/datums/dog_fashion.dm                    |  8 ++++----
 code/modules/events/brand_intelligence.dm     |  2 +-
 .../living/simple_animal/guardian/guardian.dm |  2 +-
 .../mob/living/simple_animal/simple_animal.dm | 19 ++++++++++++++++---
 4 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/code/datums/dog_fashion.dm b/code/datums/dog_fashion.dm
index fc192beeb0e..65b403bb12e 100644
--- a/code/datums/dog_fashion.dm
+++ b/code/datums/dog_fashion.dm
@@ -23,13 +23,13 @@
 	if(desc)
 		D.desc = desc
 	if(emote_see)
-		D.emote_see = emote_see
+		D.emote_see = string_list(emote_see)
 	if(emote_hear)
-		D.emote_hear = emote_hear
+		D.emote_hear = string_list(emote_hear)
 	if(speak)
-		D.speak = speak
+		D.speak = string_list(speak)
 	if(speak_emote)
-		D.speak_emote = speak_emote
+		D.speak_emote = string_list(speak_emote)
 
 /datum/dog_fashion/proc/get_overlay(dir)
 	if(icon_file && obj_icon_state)
diff --git a/code/modules/events/brand_intelligence.dm b/code/modules/events/brand_intelligence.dm
index 5c0637b036c..cf3138ec4eb 100644
--- a/code/modules/events/brand_intelligence.dm
+++ b/code/modules/events/brand_intelligence.dm
@@ -59,7 +59,7 @@
 			if(prob(70) && !QDELETED(upriser))
 				var/mob/living/simple_animal/hostile/mimic/copy/M = new(upriser.loc, upriser, null, 1) // it will delete upriser on creation and override any machine checks
 				M.faction = list("profit")
-				M.speak = rampant_speeches.Copy()
+				M.speak = string_list(rampant_speeches.Copy())
 				M.speak_chance = 7
 			else
 				explosion(upriser.loc, -1, 1, 2, 4, 0)
diff --git a/code/modules/mob/living/simple_animal/guardian/guardian.dm b/code/modules/mob/living/simple_animal/guardian/guardian.dm
index fd37176fe7e..7f17ff9f032 100644
--- a/code/modules/mob/living/simple_animal/guardian/guardian.dm
+++ b/code/modules/mob/living/simple_animal/guardian/guardian.dm
@@ -120,7 +120,7 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians
 			icon_state = "holocarp"
 			icon_living = "holocarp"
 			icon_dead = "holocarp"
-			speak_emote = list("gnashes")
+			speak_emote = string_list(list("gnashes"))
 			desc = "A mysterious fish that stands by its charge, ever vigilant."
 			attack_verb_continuous = "bites"
 			attack_verb_simple = "bite"
diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm
index 8491dbc8433..221a3fa19b8 100644
--- a/code/modules/mob/living/simple_animal/simple_animal.dm
+++ b/code/modules/mob/living/simple_animal/simple_animal.dm
@@ -172,8 +172,19 @@
 	update_simplemob_varspeed()
 	if(dextrous)
 		AddComponent(/datum/component/personal_crafting)
+
+	if(speak)
+		speak = string_list(speak)
+	if(speak_emote)
+		speak_emote = string_list(speak_emote)
+	if(emote_hear)
+		emote_hear = string_list(emote_hear)
+	if(emote_see)
+		emote_see = string_list(emote_hear)
+	if(atmos_requirements)
+		atmos_requirements = string_assoc_list(damage_coeff)
 	if(damage_coeff)
-		damage_coeff = string_list(damage_coeff)
+		damage_coeff = string_assoc_list(damage_coeff)
 
 
 /mob/living/simple_animal/Destroy()
@@ -388,10 +399,12 @@
 	if(icon_gib)
 		new /obj/effect/temp_visual/gib_animation/animal(loc, icon_gib)
 
+
 /mob/living/simple_animal/say_mod(input, list/message_mods = list())
-	if(speak_emote && speak_emote.len)
+	if(length(speak_emote))
 		verb_say = pick(speak_emote)
-	. = ..()
+	return ..()
+
 
 /mob/living/simple_animal/emote(act, m_type=1, message = null, intentional = FALSE)
 	if(stat)