okay you can use any emote

This commit is contained in:
Timothy Teakettle
2020-08-27 21:04:36 +01:00
parent 398692df0b
commit b3c459c59c
10 changed files with 4 additions and 57 deletions

View File

@@ -102,8 +102,9 @@
/datum/emote/proc/can_run_emote(mob/user, status_check = TRUE, intentional = FALSE) /datum/emote/proc/can_run_emote(mob/user, status_check = TRUE, intentional = FALSE)
. = TRUE . = TRUE
if(!is_type_in_typecache(user, mob_type_allowed_typecache)) if(mob_type_allowed_typecache) //empty list = anyone can use it unless specifically blacklisted
return FALSE if(!is_type_in_typecache(user, mob_type_allowed_typecache))
return FALSE
if(is_type_in_typecache(user, mob_type_blacklist_typecache)) if(is_type_in_typecache(user, mob_type_blacklist_typecache))
return FALSE return FALSE
if(status_check && !is_type_in_typecache(user, mob_type_ignore_stat_typecache)) if(status_check && !is_type_in_typecache(user, mob_type_ignore_stat_typecache))

View File

@@ -1,13 +1,3 @@
/datum/emote/brain
mob_type_allowed_typecache = list(/mob/living/brain)
mob_type_blacklist_typecache = list()
/datum/emote/brain/can_run_emote(mob/user, status_check = TRUE)
. = ..()
var/mob/living/brain/B = user
if(!istype(B) || (!(B.container && istype(B.container, /obj/item/mmi))))
return FALSE
/datum/emote/brain/alarm /datum/emote/brain/alarm
key = "alarm" key = "alarm"
message = "sounds an alarm." message = "sounds an alarm."

View File

@@ -1,6 +1,3 @@
/datum/emote/living/alien
mob_type_allowed_typecache = list(/mob/living/carbon/alien)
/datum/emote/living/alien/gnarl /datum/emote/living/alien/gnarl
key = "gnarl" key = "gnarl"
key_third_person = "gnarls" key_third_person = "gnarls"

View File

@@ -1,6 +1,3 @@
/datum/emote/living/carbon
mob_type_allowed_typecache = list(/mob/living/carbon)
/datum/emote/living/carbon/airguitar /datum/emote/living/carbon/airguitar
key = "airguitar" key = "airguitar"
message = "is strumming the air and headbanging like a safari chimp." message = "is strumming the air and headbanging like a safari chimp."
@@ -22,7 +19,6 @@
muzzle_ignore = TRUE muzzle_ignore = TRUE
restraint_check = TRUE restraint_check = TRUE
emote_type = EMOTE_AUDIBLE emote_type = EMOTE_AUDIBLE
mob_type_allowed_typecache = list(/mob/living/carbon, /mob/living/silicon/pai)
/datum/emote/living/carbon/clap/run_emote(mob/living/user, params) /datum/emote/living/carbon/clap/run_emote(mob/living/user, params)
. = ..() . = ..()
@@ -41,7 +37,6 @@
key = "gnarl" key = "gnarl"
key_third_person = "gnarls" key_third_person = "gnarls"
message = "gnarls and shows its teeth..." message = "gnarls and shows its teeth..."
mob_type_allowed_typecache = list(/mob/living/carbon/monkey, /mob/living/carbon/alien)
/datum/emote/living/carbon/moan /datum/emote/living/carbon/moan
key = "moan" key = "moan"
@@ -55,27 +50,23 @@
key = "roll" key = "roll"
key_third_person = "rolls" key_third_person = "rolls"
message = "rolls." message = "rolls."
mob_type_allowed_typecache = list(/mob/living/carbon/monkey, /mob/living/carbon/alien)
restraint_check = TRUE restraint_check = TRUE
/datum/emote/living/carbon/scratch /datum/emote/living/carbon/scratch
key = "scratch" key = "scratch"
key_third_person = "scratches" key_third_person = "scratches"
message = "scratches." message = "scratches."
mob_type_allowed_typecache = list(/mob/living/carbon/monkey, /mob/living/carbon/alien)
restraint_check = TRUE restraint_check = TRUE
/datum/emote/living/carbon/screech /datum/emote/living/carbon/screech
key = "screech" key = "screech"
key_third_person = "screeches" key_third_person = "screeches"
message = "screeches." message = "screeches."
mob_type_allowed_typecache = list(/mob/living/carbon/monkey, /mob/living/carbon/alien)
/datum/emote/living/carbon/sign /datum/emote/living/carbon/sign
key = "sign" key = "sign"
key_third_person = "signs" key_third_person = "signs"
message_param = "signs the number %t." message_param = "signs the number %t."
mob_type_allowed_typecache = list(/mob/living/carbon/monkey, /mob/living/carbon/alien)
restraint_check = TRUE restraint_check = TRUE
/datum/emote/living/carbon/sign/select_param(mob/user, params) /datum/emote/living/carbon/sign/select_param(mob/user, params)
@@ -87,13 +78,11 @@
key = "signal" key = "signal"
key_third_person = "signals" key_third_person = "signals"
message_param = "raises %t fingers." message_param = "raises %t fingers."
mob_type_allowed_typecache = list(/mob/living/carbon/human)
restraint_check = TRUE restraint_check = TRUE
/datum/emote/living/carbon/tail /datum/emote/living/carbon/tail
key = "tail" key = "tail"
message = "waves their tail." message = "waves their tail."
mob_type_allowed_typecache = list(/mob/living/carbon/monkey, /mob/living/carbon/alien)
/datum/emote/living/carbon/wink /datum/emote/living/carbon/wink
key = "wink" key = "wink"

View File

@@ -1,6 +1,3 @@
/datum/emote/living/carbon/human
mob_type_allowed_typecache = list(/mob/living/carbon/human)
/datum/emote/living/carbon/human/cry /datum/emote/living/carbon/human/cry
key = "cry" key = "cry"
key_third_person = "cries" key_third_person = "cries"

View File

@@ -1,9 +1,3 @@
/* EMOTE DATUMS */
/datum/emote/living
mob_type_allowed_typecache = /mob/living
mob_type_blacklist_typecache = list(/mob/living/simple_animal/slime, /mob/living/brain)
/datum/emote/living/blush /datum/emote/living/blush
key = "blush" key = "blush"
key_third_person = "blushes" key_third_person = "blushes"

View File

@@ -5,7 +5,7 @@
/datum/emote/sound/silicon /datum/emote/sound/silicon
mob_type_allowed_typecache = list(/mob/living/silicon, /mob/living/carbon/human) mob_type_allowed_typecache = list(/mob/living/silicon, /mob/living/carbon/human)
emote_type = EMOTE_AUDIBLE emote_type = EMOTE_AUDIBLE
var/unrestricted = FALSE var/unrestricted = TRUE
/datum/emote/sound/silicon/run_emote(mob/user, params) /datum/emote/sound/silicon/run_emote(mob/user, params)
if(!unrestricted && !(issilicon(user) || isipcperson(user))) if(!unrestricted && !(issilicon(user) || isipcperson(user)))
@@ -23,13 +23,11 @@
message = "buzzes." message = "buzzes."
message_param = "buzzes at %t." message_param = "buzzes at %t."
sound = 'sound/machines/buzz-sigh.ogg' sound = 'sound/machines/buzz-sigh.ogg'
unrestricted = TRUE
/datum/emote/sound/silicon/buzz2 /datum/emote/sound/silicon/buzz2
key = "buzz2" key = "buzz2"
message = "buzzes twice." message = "buzzes twice."
sound = 'sound/machines/buzz-two.ogg' sound = 'sound/machines/buzz-two.ogg'
unrestricted = TRUE
/datum/emote/sound/silicon/chime /datum/emote/sound/silicon/chime
key = "chime" key = "chime"
@@ -50,7 +48,6 @@
message = "pings." message = "pings."
message_param = "pings at %t." message_param = "pings at %t."
sound = 'sound/machines/ping.ogg' sound = 'sound/machines/ping.ogg'
unrestricted = TRUE
/datum/emote/sound/silicon/chime /datum/emote/sound/silicon/chime
key = "chime" key = "chime"

View File

@@ -1,6 +1,5 @@
/datum/emote/sound/gorilla /datum/emote/sound/gorilla
mob_type_allowed_typecache = /mob/living/simple_animal/hostile/gorilla mob_type_allowed_typecache = /mob/living/simple_animal/hostile/gorilla
mob_type_blacklist_typecache = list()
/datum/emote/sound/gorilla/ooga /datum/emote/sound/gorilla/ooga
key = "ooga" key = "ooga"
@@ -8,4 +7,3 @@
message = "oogas." message = "oogas."
message_param = "oogas at %t." message_param = "oogas at %t."
sound = 'sound/creatures/gorilla.ogg' sound = 'sound/creatures/gorilla.ogg'

View File

@@ -1,6 +1,5 @@
/datum/emote/slime /datum/emote/slime
mob_type_allowed_typecache = /mob/living/simple_animal/slime mob_type_allowed_typecache = /mob/living/simple_animal/slime
mob_type_blacklist_typecache = list()
/datum/emote/slime/bounce /datum/emote/slime/bounce
key = "bounce" key = "bounce"

View File

@@ -3,10 +3,6 @@
/mob /mob
var/nextsoundemote = 1 var/nextsoundemote = 1
//Disables the custom emote blacklist from TG that normally applies to slimes.
/datum/emote/living/custom
mob_type_blacklist_typecache = list(/mob/living/brain)
/datum/emote/living/insult /datum/emote/living/insult
key = "insult" key = "insult"
key_third_person = "insults" key_third_person = "insults"
@@ -74,7 +70,6 @@
emote_type = EMOTE_AUDIBLE emote_type = EMOTE_AUDIBLE
muzzle_ignore = TRUE muzzle_ignore = TRUE
restraint_check = TRUE restraint_check = TRUE
mob_type_allowed_typecache = list(/mob/living/carbon, /mob/living/silicon/pai)
/datum/emote/living/snap/run_emote(mob/living/user, params) /datum/emote/living/snap/run_emote(mob/living/user, params)
if(!(. = ..())) if(!(. = ..()))
@@ -91,7 +86,6 @@
emote_type = EMOTE_AUDIBLE emote_type = EMOTE_AUDIBLE
muzzle_ignore = TRUE muzzle_ignore = TRUE
restraint_check = TRUE restraint_check = TRUE
mob_type_allowed_typecache = list(/mob/living/carbon, /mob/living/silicon/pai)
/datum/emote/living/snap2/run_emote(mob/living/user, params) /datum/emote/living/snap2/run_emote(mob/living/user, params)
if(!(. = ..())) if(!(. = ..()))
@@ -108,7 +102,6 @@
emote_type = EMOTE_AUDIBLE emote_type = EMOTE_AUDIBLE
muzzle_ignore = TRUE muzzle_ignore = TRUE
restraint_check = TRUE restraint_check = TRUE
mob_type_allowed_typecache = list(/mob/living/carbon, /mob/living/silicon/pai)
/datum/emote/living/snap3/run_emote(mob/living/user, params) /datum/emote/living/snap3/run_emote(mob/living/user, params)
if(!(. = ..())) if(!(. = ..()))
@@ -125,7 +118,6 @@
emote_type = EMOTE_AUDIBLE emote_type = EMOTE_AUDIBLE
muzzle_ignore = FALSE muzzle_ignore = FALSE
restraint_check = FALSE restraint_check = FALSE
mob_type_allowed_typecache = list(/mob/living/carbon, /mob/living/silicon/pai)
/datum/emote/living/awoo/run_emote(mob/living/user, params) /datum/emote/living/awoo/run_emote(mob/living/user, params)
if(!(. = ..())) if(!(. = ..()))
@@ -142,7 +134,6 @@
emote_type = EMOTE_AUDIBLE emote_type = EMOTE_AUDIBLE
muzzle_ignore = FALSE muzzle_ignore = FALSE
restraint_check = FALSE restraint_check = FALSE
mob_type_allowed_typecache = list(/mob/living/carbon, /mob/living/silicon/pai)
/datum/emote/living/nya/run_emote(mob/living/user, params) /datum/emote/living/nya/run_emote(mob/living/user, params)
if(!(. = ..())) if(!(. = ..()))
@@ -159,7 +150,6 @@
emote_type = EMOTE_AUDIBLE emote_type = EMOTE_AUDIBLE
muzzle_ignore = FALSE muzzle_ignore = FALSE
restraint_check = FALSE restraint_check = FALSE
mob_type_allowed_typecache = list(/mob/living/carbon, /mob/living/silicon/pai)
/datum/emote/living/weh/run_emote(mob/living/user, params) /datum/emote/living/weh/run_emote(mob/living/user, params)
if(!(. = ..())) if(!(. = ..()))
@@ -176,7 +166,6 @@
emote_type = EMOTE_AUDIBLE emote_type = EMOTE_AUDIBLE
muzzle_ignore = FALSE muzzle_ignore = FALSE
restraint_check = FALSE restraint_check = FALSE
mob_type_allowed_typecache = list(/mob/living/carbon, /mob/living/silicon/pai)
/datum/emote/living/peep/run_emote(mob/living/user, params) /datum/emote/living/peep/run_emote(mob/living/user, params)
if(!(. = ..())) if(!(. = ..()))
@@ -200,7 +189,6 @@
emote_type = EMOTE_AUDIBLE emote_type = EMOTE_AUDIBLE
muzzle_ignore = FALSE muzzle_ignore = FALSE
restraint_check = FALSE restraint_check = FALSE
mob_type_allowed_typecache = list(/mob/living/carbon, /mob/living/silicon/pai)
/datum/emote/living/mothsqueak/run_emote(mob/living/user, params) /datum/emote/living/mothsqueak/run_emote(mob/living/user, params)
if(!(. = ..())) if(!(. = ..()))
@@ -217,7 +205,6 @@
emote_type = EMOTE_AUDIBLE emote_type = EMOTE_AUDIBLE
muzzle_ignore = FALSE muzzle_ignore = FALSE
restraint_check = FALSE restraint_check = FALSE
mob_type_allowed_typecache = list(/mob/living/carbon, /mob/living/silicon/pai)
/datum/emote/living/merp/run_emote(mob/living/user, params) /datum/emote/living/merp/run_emote(mob/living/user, params)
if(!(. = ..())) if(!(. = ..()))
@@ -234,7 +221,6 @@
emote_type = EMOTE_AUDIBLE emote_type = EMOTE_AUDIBLE
muzzle_ignore = FALSE muzzle_ignore = FALSE
restraint_check = FALSE restraint_check = FALSE
mob_type_allowed_typecache = list(/mob/living/carbon, /mob/living/silicon/pai)
/datum/emote/living/bark/run_emote(mob/living/user, params) /datum/emote/living/bark/run_emote(mob/living/user, params)
if(!(. = ..())) if(!(. = ..()))
@@ -252,7 +238,6 @@
emote_type = EMOTE_AUDIBLE emote_type = EMOTE_AUDIBLE
muzzle_ignore = FALSE muzzle_ignore = FALSE
restraint_check = FALSE restraint_check = FALSE
mob_type_allowed_typecache = list(/mob/living/carbon, /mob/living/silicon/pai)
/datum/emote/living/squish/run_emote(mob/living/user, params) /datum/emote/living/squish/run_emote(mob/living/user, params)
if(!(. = ..())) if(!(. = ..()))