mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-29 08:08:49 +01:00
more stringlists
This commit is contained in:
@@ -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)
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user