From 6446328d09f80cc83aa95ba99851559bf634fb20 Mon Sep 17 00:00:00 2001 From: Anewbe Date: Tue, 20 Feb 2018 01:58:49 -0600 Subject: [PATCH] Slimes should no longer /list you. --- code/game/gamemodes/technomancer/assistance/golem.dm | 2 +- code/modules/blob2/mobs/spore.dm | 4 ++-- .../mob/living/simple_animal/animals/sif_wildlife/diyaab.dm | 2 +- .../mob/living/simple_animal/animals/sif_wildlife/savik.dm | 2 +- .../mob/living/simple_animal/animals/sif_wildlife/shantak.dm | 2 +- code/modules/mob/living/simple_animal/slime/combat.dm | 4 ++-- code/modules/xenobio2/mob/slime/slime.dm | 2 +- code/modules/xenobio2/mob/xeno.dm | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/code/game/gamemodes/technomancer/assistance/golem.dm b/code/game/gamemodes/technomancer/assistance/golem.dm index 33fc246911f..6b8654e719a 100644 --- a/code/game/gamemodes/technomancer/assistance/golem.dm +++ b/code/game/gamemodes/technomancer/assistance/golem.dm @@ -30,7 +30,7 @@ melee_damage_lower = 30 // It has a built in esword. melee_damage_upper = 30 attack_sound = 'sound/weapons/blade1.ogg' - attacktext = "slashed" + attacktext = list("slashed") friendly = "hugs" resistance = 0 melee_miss_chance = 0 diff --git a/code/modules/blob2/mobs/spore.dm b/code/modules/blob2/mobs/spore.dm index 3e68344c8b1..e23b96d8aa6 100644 --- a/code/modules/blob2/mobs/spore.dm +++ b/code/modules/blob2/mobs/spore.dm @@ -12,7 +12,7 @@ melee_damage_lower = 2 melee_damage_upper = 4 layer = MOB_LAYER + 0.2 // Over the blob. - attacktext = "slams into" + attacktext = list("slams into") attack_sound = 'sound/effects/slime_squish.ogg' emote_see = list("sways", "inflates briefly") var/mob/living/carbon/human/infested = null // The human this thing is totally not making into a zombie. @@ -97,7 +97,7 @@ melee_damage_lower += 8 // 10 total. melee_damage_upper += 11 // 15 total. emote_see = list("shambles around", "twitches", "stares") - attacktext = "claws" + attacktext = list("claws") H.forceMove(src) infested = H diff --git a/code/modules/mob/living/simple_animal/animals/sif_wildlife/diyaab.dm b/code/modules/mob/living/simple_animal/animals/sif_wildlife/diyaab.dm index 5e21308410d..a39694d02c1 100644 --- a/code/modules/mob/living/simple_animal/animals/sif_wildlife/diyaab.dm +++ b/code/modules/mob/living/simple_animal/animals/sif_wildlife/diyaab.dm @@ -18,7 +18,7 @@ melee_damage_lower = 1 melee_damage_upper = 8 - attacktext = "gouged" + attacktext = list("gouged") cold_damage_per_tick = 0 speak_chance = 5 diff --git a/code/modules/mob/living/simple_animal/animals/sif_wildlife/savik.dm b/code/modules/mob/living/simple_animal/animals/sif_wildlife/savik.dm index c8b6bd7570a..75ebd22bd15 100644 --- a/code/modules/mob/living/simple_animal/animals/sif_wildlife/savik.dm +++ b/code/modules/mob/living/simple_animal/animals/sif_wildlife/savik.dm @@ -17,7 +17,7 @@ melee_damage_lower = 15 melee_damage_upper = 25 - attacktext = "mauled" + attacktext = list("mauled") cold_damage_per_tick = 0 speak_chance = 5 diff --git a/code/modules/mob/living/simple_animal/animals/sif_wildlife/shantak.dm b/code/modules/mob/living/simple_animal/animals/sif_wildlife/shantak.dm index fe3865e4ea3..65db0391089 100644 --- a/code/modules/mob/living/simple_animal/animals/sif_wildlife/shantak.dm +++ b/code/modules/mob/living/simple_animal/animals/sif_wildlife/shantak.dm @@ -17,7 +17,7 @@ melee_damage_lower = 3 melee_damage_upper = 12 - attacktext = "gouged" + attacktext = list("gouged") cold_damage_per_tick = 0 speak_chance = 5 diff --git a/code/modules/mob/living/simple_animal/slime/combat.dm b/code/modules/mob/living/simple_animal/slime/combat.dm index 5aee0a7a3a9..d13e81cd309 100644 --- a/code/modules/mob/living/simple_animal/slime/combat.dm +++ b/code/modules/mob/living/simple_animal/slime/combat.dm @@ -180,7 +180,7 @@ var/damage_to_do = rand(melee_damage_lower, melee_damage_upper) var/armor_modifier = abs((L.getarmor(null, "bio") / 100) - 1) - L.attack_generic(src, damage_to_do, attacktext) + L.attack_generic(src, damage_to_do, pick(attacktext)) playsound(src, 'sound/weapons/bite.ogg', 75, 1) // Give the slime some nutrition, if applicable. @@ -199,7 +199,7 @@ if(istype(L,/obj/mecha)) var/obj/mecha/M = L - M.attack_generic(src, rand(melee_damage_lower, melee_damage_upper), attacktext) + M.attack_generic(src, rand(melee_damage_lower, melee_damage_upper), pick(attacktext)) /mob/living/simple_animal/slime/proc/post_attack(var/mob/living/L, var/intent = I_HURT) if(intent != I_HELP) diff --git a/code/modules/xenobio2/mob/slime/slime.dm b/code/modules/xenobio2/mob/slime/slime.dm index 48f5ce57564..44a1246e1d6 100644 --- a/code/modules/xenobio2/mob/slime/slime.dm +++ b/code/modules/xenobio2/mob/slime/slime.dm @@ -22,7 +22,7 @@ Slime definitions, Life and New live here. var/shiny = 0 move_to_delay = 17 //Slimes shouldn't be able to go faster than humans. default_chems = list("slimejelly" = 5) - attacktext = "absorbed some of" + attacktext = list("absorbed some of") response_help = "pats" response_disarm = "tries to stop" response_harm = "hits" diff --git a/code/modules/xenobio2/mob/xeno.dm b/code/modules/xenobio2/mob/xeno.dm index 979782e9bdc..9a854e9d8eb 100644 --- a/code/modules/xenobio2/mob/xeno.dm +++ b/code/modules/xenobio2/mob/xeno.dm @@ -12,7 +12,7 @@ Also includes Life and New desc = "Something's broken, yell at someone." melee_damage_lower = 0 melee_damage_upper = 0 - attacktext = "hit" + attacktext = list("hit") attack_sound = null friendly = "touches" environment_smash = 0