mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-13 19:52:40 +00:00
Merge pull request #13851 from Heroman3003/emote-fixes
Fixes some one person having a specific emote giving it to everyone
This commit is contained in:
@@ -4,7 +4,7 @@
|
|||||||
var/last_emote_summary
|
var/last_emote_summary
|
||||||
|
|
||||||
/mob/proc/get_available_emotes()
|
/mob/proc/get_available_emotes()
|
||||||
return global._default_mob_emotes
|
return global._default_mob_emotes.Copy()
|
||||||
|
|
||||||
/mob/proc/can_emote(var/emote_type)
|
/mob/proc/can_emote(var/emote_type)
|
||||||
return (stat == CONSCIOUS)
|
return (stat == CONSCIOUS)
|
||||||
|
|||||||
@@ -47,7 +47,7 @@ var/list/_nymph_default_emotes = list(
|
|||||||
var/obj/item/hat
|
var/obj/item/hat
|
||||||
|
|
||||||
/mob/living/carbon/alien/diona/get_available_emotes()
|
/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()
|
/mob/living/carbon/alien/diona/Initialize()
|
||||||
. = ..()
|
. = ..()
|
||||||
|
|||||||
@@ -28,4 +28,4 @@ var/list/_alien_default_emotes = list(
|
|||||||
)
|
)
|
||||||
|
|
||||||
/mob/living/carbon/alien/get_available_emotes()
|
/mob/living/carbon/alien/get_available_emotes()
|
||||||
. = global._alien_default_emotes
|
. = global._alien_default_emotes.Copy()
|
||||||
|
|||||||
@@ -14,4 +14,4 @@ var/list/_brain_default_emotes = list(
|
|||||||
return (istype(container, /obj/item/device/mmi) && ..())
|
return (istype(container, /obj/item/device/mmi) && ..())
|
||||||
|
|
||||||
/mob/living/carbon/brain/get_available_emotes()
|
/mob/living/carbon/brain/get_available_emotes()
|
||||||
return global._brain_default_emotes
|
return global._brain_default_emotes.Copy()
|
||||||
|
|||||||
@@ -309,12 +309,12 @@ var/list/_simple_mob_default_emotes = list(
|
|||||||
//VOREStation Add End
|
//VOREStation Add End
|
||||||
|
|
||||||
/mob/living/carbon/human/get_available_emotes()
|
/mob/living/carbon/human/get_available_emotes()
|
||||||
. = global._human_default_emotes
|
. = global._human_default_emotes.Copy()
|
||||||
if(length(species?.default_emotes))
|
if(length(species?.default_emotes))
|
||||||
. |= species.default_emotes
|
. |= species.default_emotes
|
||||||
|
|
||||||
/mob/living/simple_mob/get_available_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()
|
/mob/living/carbon/human/verb/pose()
|
||||||
set name = "Set Pose"
|
set name = "Set Pose"
|
||||||
|
|||||||
@@ -323,7 +323,7 @@
|
|||||||
return
|
return
|
||||||
|
|
||||||
/mob/living/simple_mob/slime/promethean/get_available_emotes()
|
/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
|
fulllist += default_emotes
|
||||||
return fulllist
|
return fulllist
|
||||||
/mob/living/carbon/human
|
/mob/living/carbon/human
|
||||||
|
|||||||
@@ -13,11 +13,11 @@ var/list/_silicon_default_emotes = list(
|
|||||||
)
|
)
|
||||||
|
|
||||||
/mob/living/silicon/get_available_emotes()
|
/mob/living/silicon/get_available_emotes()
|
||||||
return global._silicon_default_emotes
|
return global._silicon_default_emotes.Copy()
|
||||||
|
|
||||||
/mob/living/silicon/pai/get_available_emotes()
|
/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 |= _robot_default_emotes
|
||||||
fulllist |= _human_default_emotes
|
fulllist |= _human_default_emotes
|
||||||
return fulllist
|
return fulllist
|
||||||
@@ -33,4 +33,4 @@ var/list/_robot_default_emotes = list(
|
|||||||
)
|
)
|
||||||
|
|
||||||
/mob/living/silicon/robot/get_available_emotes()
|
/mob/living/silicon/robot/get_available_emotes()
|
||||||
return global._robot_default_emotes
|
return global._robot_default_emotes.Copy()
|
||||||
|
|||||||
@@ -60,7 +60,7 @@ var/list/_cat_default_emotes = list(
|
|||||||
return ..()
|
return ..()
|
||||||
|
|
||||||
/mob/living/simple_mob/animal/passive/cat/get_available_emotes()
|
/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()
|
/mob/living/simple_mob/animal/passive/cat/handle_special()
|
||||||
if(!stat && prob(2)) // spooky
|
if(!stat && prob(2)) // spooky
|
||||||
|
|||||||
@@ -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)]."))
|
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()
|
/mob/living/simple_mob/animal/sif/grafadreka/get_available_emotes()
|
||||||
|
. = global._default_mob_emotes.Copy()
|
||||||
if(!is_baby)
|
if(!is_baby)
|
||||||
return global._default_mob_emotes | /decl/emote/audible/drake_howl
|
. |= /decl/emote/audible/drake_howl
|
||||||
return global._default_mob_emotes
|
return
|
||||||
|
|
||||||
// Overriding this to handle sitting.
|
// Overriding this to handle sitting.
|
||||||
/mob/living/simple_mob/animal/sif/grafadreka/lay_down()
|
/mob/living/simple_mob/animal/sif/grafadreka/lay_down()
|
||||||
|
|||||||
@@ -83,7 +83,7 @@ var/list/_slime_default_emotes = list(
|
|||||||
can_enter_vent_with = list(/obj/item/clothing/head)
|
can_enter_vent_with = list(/obj/item/clothing/head)
|
||||||
|
|
||||||
/mob/living/simple_mob/slime/get_available_emotes()
|
/mob/living/simple_mob/slime/get_available_emotes()
|
||||||
return global._slime_default_emotes
|
return global._slime_default_emotes.Copy()
|
||||||
|
|
||||||
/datum/say_list/slime
|
/datum/say_list/slime
|
||||||
speak = list("Blorp...", "Blop...")
|
speak = list("Blorp...", "Blop...")
|
||||||
|
|||||||
@@ -155,7 +155,7 @@
|
|||||||
return "synthetic"
|
return "synthetic"
|
||||||
|
|
||||||
/mob/living/simple_mob/protean_blob/get_available_emotes()
|
/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()
|
/mob/living/simple_mob/protean_blob/init_vore()
|
||||||
return //Don't make a random belly, don't waste your time
|
return //Don't make a random belly, don't waste your time
|
||||||
|
|||||||
Reference in New Issue
Block a user