From f9cf59ab406b9bbd57bfc31caf8fc269fb7b1567 Mon Sep 17 00:00:00 2001 From: Heroman Date: Wed, 5 Oct 2022 05:32:14 +1000 Subject: [PATCH] Fixes some one person having a specific emote giving it to everyone --- code/modules/emotes/emote_mob.dm | 2 +- code/modules/mob/living/carbon/alien/diona/diona.dm | 2 +- code/modules/mob/living/carbon/alien/emote.dm | 2 +- code/modules/mob/living/carbon/brain/emote.dm | 2 +- code/modules/mob/living/carbon/human/emote.dm | 4 ++-- .../mob/living/carbon/human/species/station/prommie_blob.dm | 2 +- .../carbon/human/species/station/protean_vr/protean_blob.dm | 2 +- code/modules/mob/living/silicon/emote.dm | 4 ++-- code/modules/mob/living/silicon/robot/emote.dm | 2 +- .../mob/living/simple_mob/subtypes/animal/pets/cat.dm | 2 +- .../mob/living/simple_mob/subtypes/animal/sif/grafadreka.dm | 5 +++-- code/modules/mob/living/simple_mob/subtypes/slime/slime.dm | 2 +- 12 files changed, 16 insertions(+), 15 deletions(-) diff --git a/code/modules/emotes/emote_mob.dm b/code/modules/emotes/emote_mob.dm index 9f60ca53d7d..e7611b84803 100644 --- a/code/modules/emotes/emote_mob.dm +++ b/code/modules/emotes/emote_mob.dm @@ -4,7 +4,7 @@ var/last_emote_summary /mob/proc/get_available_emotes() - return global._default_mob_emotes + return global._default_mob_emotes.Copy() /mob/proc/can_emote(var/emote_type) return (stat == CONSCIOUS) diff --git a/code/modules/mob/living/carbon/alien/diona/diona.dm b/code/modules/mob/living/carbon/alien/diona/diona.dm index 690fdb3325c..753bdc90100 100644 --- a/code/modules/mob/living/carbon/alien/diona/diona.dm +++ b/code/modules/mob/living/carbon/alien/diona/diona.dm @@ -47,7 +47,7 @@ var/list/_nymph_default_emotes = list( var/obj/item/hat /mob/living/carbon/alien/diona/get_available_emotes() - return global._nymph_default_emotes + return global._nymph_default_emotes.Copy() /mob/living/carbon/alien/diona/Initialize() . = ..() diff --git a/code/modules/mob/living/carbon/alien/emote.dm b/code/modules/mob/living/carbon/alien/emote.dm index cb7ab9b7b0c..5f38b60b4c8 100644 --- a/code/modules/mob/living/carbon/alien/emote.dm +++ b/code/modules/mob/living/carbon/alien/emote.dm @@ -28,4 +28,4 @@ var/list/_alien_default_emotes = list( ) /mob/living/carbon/alien/get_available_emotes() - . = global._alien_default_emotes + . = global._alien_default_emotes.Copy() diff --git a/code/modules/mob/living/carbon/brain/emote.dm b/code/modules/mob/living/carbon/brain/emote.dm index 5fb8159b1f7..41023589ce1 100644 --- a/code/modules/mob/living/carbon/brain/emote.dm +++ b/code/modules/mob/living/carbon/brain/emote.dm @@ -14,4 +14,4 @@ var/list/_brain_default_emotes = list( return (istype(container, /obj/item/device/mmi) && ..()) /mob/living/carbon/brain/get_available_emotes() - return global._brain_default_emotes + return global._brain_default_emotes.Copy() diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm index 1f021551d52..9a36a6775bf 100644 --- a/code/modules/mob/living/carbon/human/emote.dm +++ b/code/modules/mob/living/carbon/human/emote.dm @@ -305,12 +305,12 @@ var/list/_simple_mob_default_emotes = list( //VOREStation Add End /mob/living/carbon/human/get_available_emotes() - . = global._human_default_emotes + . = global._human_default_emotes.Copy() if(length(species?.default_emotes)) . |= species.default_emotes /mob/living/simple_mob/get_available_emotes() - . = global._simple_mob_default_emotes + . = global._simple_mob_default_emotes.Copy() /mob/living/carbon/human/verb/pose() set name = "Set Pose" diff --git a/code/modules/mob/living/carbon/human/species/station/prommie_blob.dm b/code/modules/mob/living/carbon/human/species/station/prommie_blob.dm index 17f90129164..77928ed46f0 100644 --- a/code/modules/mob/living/carbon/human/species/station/prommie_blob.dm +++ b/code/modules/mob/living/carbon/human/species/station/prommie_blob.dm @@ -311,7 +311,7 @@ return /mob/living/simple_mob/slime/promethean/get_available_emotes() - var/list/fulllist = _slime_default_emotes + var/list/fulllist = global._slime_default_emotes.Copy() fulllist += default_emotes return fulllist /mob/living/carbon/human diff --git a/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_blob.dm b/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_blob.dm index 3b942ed3652..f2250b7e7f3 100644 --- a/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_blob.dm +++ b/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_blob.dm @@ -91,7 +91,7 @@ return "synthetic" /mob/living/simple_mob/protean_blob/get_available_emotes() - return global._robot_default_emotes + return global._robot_default_emotes.Copy() /mob/living/simple_mob/protean_blob/init_vore() return //Don't make a random belly, don't waste your time diff --git a/code/modules/mob/living/silicon/emote.dm b/code/modules/mob/living/silicon/emote.dm index a471c62b220..5bb86dac682 100644 --- a/code/modules/mob/living/silicon/emote.dm +++ b/code/modules/mob/living/silicon/emote.dm @@ -13,11 +13,11 @@ var/list/_silicon_default_emotes = list( ) /mob/living/silicon/get_available_emotes() - return global._silicon_default_emotes + return global._silicon_default_emotes.Copy() /mob/living/silicon/pai/get_available_emotes() - var/list/fulllist = _silicon_default_emotes + var/list/fulllist = global._silicon_default_emotes.Copy() fulllist |= _robot_default_emotes fulllist |= _human_default_emotes return fulllist \ No newline at end of file diff --git a/code/modules/mob/living/silicon/robot/emote.dm b/code/modules/mob/living/silicon/robot/emote.dm index 9def436c7cb..018c2b4336b 100644 --- a/code/modules/mob/living/silicon/robot/emote.dm +++ b/code/modules/mob/living/silicon/robot/emote.dm @@ -33,4 +33,4 @@ var/list/_robot_default_emotes = list( ) /mob/living/silicon/robot/get_available_emotes() - return global._robot_default_emotes + return global._robot_default_emotes.Copy() diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/pets/cat.dm b/code/modules/mob/living/simple_mob/subtypes/animal/pets/cat.dm index 241d00714fe..184e7c4ed57 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/pets/cat.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/pets/cat.dm @@ -60,7 +60,7 @@ var/list/_cat_default_emotes = list( return ..() /mob/living/simple_mob/animal/passive/cat/get_available_emotes() - return global._cat_default_emotes + return global._cat_default_emotes.Copy() /mob/living/simple_mob/animal/passive/cat/handle_special() if(!stat && prob(2)) // spooky diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/sif/grafadreka.dm b/code/modules/mob/living/simple_mob/subtypes/animal/sif/grafadreka.dm index 8772a061d7f..c07c0cd4675 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/sif/grafadreka.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/sif/grafadreka.dm @@ -89,9 +89,10 @@ Field studies suggest analytical abilities on par with some species of cepholapo to_chat(target, SPAN_NOTICE("You hear an eerie howl from somewhere to the [dir2text(direction)].")) /mob/living/simple_mob/animal/sif/grafadreka/get_available_emotes() + . = global._default_mob_emotes.Copy() if(!is_baby) - return global._default_mob_emotes | /decl/emote/audible/drake_howl - return global._default_mob_emotes + . |= /decl/emote/audible/drake_howl + return // Overriding this to handle sitting. /mob/living/simple_mob/animal/sif/grafadreka/lay_down() diff --git a/code/modules/mob/living/simple_mob/subtypes/slime/slime.dm b/code/modules/mob/living/simple_mob/subtypes/slime/slime.dm index 4c2a5b3a98a..68674189a6c 100644 --- a/code/modules/mob/living/simple_mob/subtypes/slime/slime.dm +++ b/code/modules/mob/living/simple_mob/subtypes/slime/slime.dm @@ -83,7 +83,7 @@ var/list/_slime_default_emotes = list( can_enter_vent_with = list(/obj/item/clothing/head) /mob/living/simple_mob/slime/get_available_emotes() - return global._slime_default_emotes + return global._slime_default_emotes.Copy() /datum/say_list/slime speak = list("Blorp...", "Blop...")