[MIRROR] Turns simple mob vars into string lists and fixes string assoc lists (#1047)

* Merge pull request #53937 from Rohesie/damage

Turns simple mob vars into string lists and fixes string assoc lists

* Turns simple mob vars into string lists and fixes string assoc lists

Co-authored-by: nemvar <47324920+nemvar@users.noreply.github.com>
This commit is contained in:
SkyratBot
2020-09-29 12:35:03 +02:00
committed by GitHub
co-authored by nemvar
parent 85f582708d
commit ced0a88007
6 changed files with 38 additions and 22 deletions
@@ -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"
@@ -173,6 +173,20 @@
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(atmos_requirements)
if(damage_coeff)
damage_coeff = string_assoc_list(damage_coeff)
/mob/living/simple_animal/Destroy()
GLOB.simple_animals[AIStatus] -= src
if (SSnpcpool.state == SS_PAUSED && LAZYLEN(SSnpcpool.currentrun))
@@ -188,6 +202,7 @@
return ..()
/mob/living/simple_animal/attackby(obj/item/O, mob/user, params)
if(!is_type_in_list(O, food_type))
..()
@@ -384,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)