cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 10:21:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

46709 (#19144)

Browse Source
This commit is contained in:
ShiftyRail
2018-08-07 19:16:00 +02:00
committed by jknpj
parent 7baf485dd8
commit a79c4eb52c
5 changed files with 168 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/mob/emote.dm
View File

@@ -19,6 +19,7 @@
key_third_person = "flips" key_third_person = "flips"
restraint_check = TRUE restraint_check = TRUE
mob_type_allowed_typelist = list(/mob/living, /mob/dead/observer) mob_type_allowed_typelist = list(/mob/living, /mob/dead/observer)
mob_type_blacklist_typelist = list(/mob/living/silicon/ai, /mob/living/silicon/pai)
mob_type_ignore_stat_typelist = list(/mob/dead/observer) mob_type_ignore_stat_typelist = list(/mob/dead/observer)
/datum/emote/flip/run_emote(mob/user, params) /datum/emote/flip/run_emote(mob/user, params)
@@ -35,6 +36,7 @@
key_third_person = "spins" key_third_person = "spins"
restraint_check = TRUE restraint_check = TRUE
mob_type_allowed_typelist = list(/mob/living, /mob/dead/observer) mob_type_allowed_typelist = list(/mob/living, /mob/dead/observer)
mob_type_blacklist_typelist = list(/mob/living/silicon/ai, /mob/living/silicon/pai)
mob_type_ignore_stat_typelist = list(/mob/dead/observer) mob_type_ignore_stat_typelist = list(/mob/dead/observer)
/datum/emote/spin/run_emote(mob/user) /datum/emote/spin/run_emote(mob/user)

149
code/modules/mob/living/carbon/emote.dm
View File

@@ -84,6 +84,155 @@
key = "wink" key = "wink"
key_third_person = "winks" key_third_person = "winks"
message = "winks." message = "winks."
/datum/emote/living/carbon/twitch
key = "twitch"
key_third_person = "twitches"
message = "twitches violently."
/datum/emote/living/carbon/twitch_s
key = "twitch_s"
message = "twitches."
/datum/emote/living/carbon/wave
key = "wave"
key_third_person = "waves"
message = "waves."
/datum/emote/living/carbon/whimper
key = "whimper"
key_third_person = "whimpers"
message = "whimpers."
message_mime = "appears hurt."
/datum/emote/living/carbon/wsmile
key = "wsmile"
key_third_person = "wsmiles"
message = "smiles weakly."
/datum/emote/living/carbon/yawn
key = "yawn"
key_third_person = "yawns"
message = "yawns."
emote_type = EMOTE_AUDIBLE
/datum/emote/living/carbon/sniff
key = "sniff"
key_third_person = "sniffs"
message = "sniffs."
emote_type = EMOTE_AUDIBLE
/datum/emote/living/carbon/snore
key = "snore"
key_third_person = "snores"
message = "snores."
message_mime = "sleeps soundly."
emote_type = EMOTE_AUDIBLE
stat_allowed = UNCONSCIOUS
/datum/emote/living/carbon/pout
key = "pout"
key_third_person = "pouts"
message = "pouts."
emote_type = EMOTE_AUDIBLE
/datum/emote/living/carbon/scowl
key = "scowl"
key_third_person = "scowls"
message = "scowls."
emote_type = EMOTE_AUDIBLE
/datum/emote/living/shake
key = "shake"
key_third_person = "shakes"
message = "shakes their head."
emote_type = EMOTE_AUDIBLE
/datum/emote/living/carbon/shiver
key = "shiver"
key_third_person = "shiver"
message = "shivers."
emote_type = EMOTE_AUDIBLE
/datum/emote/living/carbon/kiss
key = "kiss"
key_third_person = "kisses"
message = "blows a kiss."
message_param = "blows a kiss to %t."
emote_type = EMOTE_AUDIBLE
/datum/emote/living/carbon/laugh
key = "laugh"
key_third_person = "laughs"
message = "laughs."
message_mime = "laughs silently!"
emote_type = EMOTE_AUDIBLE
/datum/emote/living/carbon/gag
key = "gag"
key_third_person = "gags"
message = "gags."
emote_type = EMOTE_AUDIBLE
/datum/emote/living/carbon/gasp
key = "gasp"
key_third_person = "gasps"
message = "gasps!"
emote_type = EMOTE_AUDIBLE
stat_allowed = UNCONSCIOUS
/datum/emote/living/carbon/giggle
key = "giggle"
key_third_person = "giggles"
message = "giggles."
message_mime = "giggles silently!"
emote_type = EMOTE_AUDIBLE
/datum/emote/living/carbon/grin
key = "grin"
key_third_person = "grins"
message = "grins."
/datum/emote/living/carbon/groan
key = "groan"
key_third_person = "groans"
message = "groans!"
message_mime = "appears to groan!"
/datum/emote/living/carbon/grimace
key = "grimace"
key_third_person = "grimaces"
message = "grimaces."
/datum/emote/living/carbon/cough
key = "cough"
key_third_person = "coughs"
message = "coughs!"
emote_type = EMOTE_AUDIBLE
/datum/emote/living/carbon/burp
key = "burp"
key_third_person = "burps"
message = "burps."
emote_type = EMOTE_AUDIBLE
/datum/emote/living/carbon/choke
key = "choke"
key_third_person = "chokes"
message = "chokes!"
emote_type = EMOTE_AUDIBLE
/datum/emote/living/carbon/chuckle
key = "chuckle"
key_third_person = "chuckles"
message = "chuckles."
emote_type = EMOTE_AUDIBLE
/datum/emote/living/carbon/blush
key = "blush"
key_third_person = "blushes"
message = "blushes."
/datum/emote/living/carbon/scream /datum/emote/living/carbon/scream
key = "scream" key = "scream"

192
code/modules/mob/living/emote.dm
View File

@@ -1,13 +1,7 @@
/* EMOTE DATUMS */ /* EMOTE DATUMS */
/datum/emote/living /datum/emote/living
mob_type_allowed_typelist = list(/mob/living) mob_type_allowed_typelist = list(/mob/living)
mob_type_blacklist_typelist = list(/mob/living/simple_animal/slime, /mob/living/carbon/brain) mob_type_blacklist_typelist = list(/mob/living/simple_animal/slime, /mob/living/carbon/brain, /mob/living/silicon/ai, /mob/living/silicon/pai)
/datum/emote/living/blush
key = "blush"
key_third_person = "blushes"
message = "blushes."
/datum/emote/living/bow /datum/emote/living/bow
key = "bow" key = "bow"
@@ -15,21 +9,6 @@
message = "bows." message = "bows."
message_param = "bows to %t." message_param = "bows to %t."
restraint_check = TRUE restraint_check = TRUE
mob_type_blacklist_typelist = list(/mob/living/silicon/pai, /mob/living/simple_animal/slime, /mob/living/carbon/brain)
/datum/emote/living/burp
key = "burp"
key_third_person = "burps"
message = "burps."
emote_type = EMOTE_AUDIBLE
mob_type_blacklist_typelist = list(/mob/living/silicon, /mob/living/simple_animal/slime, /mob/living/carbon/brain)
/datum/emote/living/choke
key = "choke"
key_third_person = "chokes"
message = "chokes!"
emote_type = EMOTE_AUDIBLE
mob_type_blacklist_typelist = list(/mob/living/silicon, /mob/living/simple_animal/slime, /mob/living/carbon/brain)
/datum/emote/living/cross /datum/emote/living/cross
key = "cross" key = "cross"
@@ -37,20 +16,20 @@
message = "crosses their arms." message = "crosses their arms."
message_mommi = "crosses their utility arms." message_mommi = "crosses their utility arms."
restraint_check = TRUE restraint_check = TRUE
mob_type_blacklist_typelist = list(/mob/living/silicon/pai)
/datum/emote/living/chuckle
key = "chuckle"
key_third_person = "chuckles"
message = "chuckles."
emote_type = EMOTE_AUDIBLE
/datum/emote/living/collapse /datum/emote/living/collapse
key = "collapse" key = "collapse"
key_third_person = "collapses" key_third_person = "collapses"
message = "collapses!" message = "collapses!"
emote_type = EMOTE_AUDIBLE emote_type = EMOTE_AUDIBLE
mob_type_blacklist_typelist = list(/mob/living/silicon/pai, /mob/living/simple_animal/slime, /mob/living/carbon/brain)
/datum/emote/living/glare
key = "glare"
key_third_person = "glares"
message = "glares."
message_mommi = "glares as best a robot spider can glare."
message_param = "glares at %t."
emote_type = EMOTE_AUDIBLE
/datum/emote/living/collapse/run_emote(mob/user, params) /datum/emote/living/collapse/run_emote(mob/user, params)
. = ..() . = ..()
@@ -58,19 +37,11 @@
var/mob/living/L = user var/mob/living/L = user
L.Knockdown(10) L.Knockdown(10)
/datum/emote/living/cough
key = "cough"
key_third_person = "coughs"
message = "coughs!"
emote_type = EMOTE_AUDIBLE
mob_type_blacklist_typelist = list(/mob/living/silicon/pai, /mob/living/simple_animal/slime, /mob/living/carbon/brain)
/datum/emote/living/dance /datum/emote/living/dance
key = "dance" key = "dance"
key_third_person = "dances" key_third_person = "dances"
message = "dances around happily." message = "dances around happily."
restraint_check = TRUE restraint_check = TRUE
mob_type_blacklist_typelist = list(/mob/living/silicon/pai, /mob/living/simple_animal/slime, /mob/living/carbon/brain)
/datum/emote/living/deathgasp /datum/emote/living/deathgasp
key = "deathgasp" key = "deathgasp"
@@ -83,23 +54,22 @@
message_monkey = "lets out a faint chimper as it collapses and stops moving..." message_monkey = "lets out a faint chimper as it collapses and stops moving..."
message_simple = "stops moving..." message_simple = "stops moving..."
stat_allowed = UNCONSCIOUS stat_allowed = UNCONSCIOUS
mob_type_blacklist_typelist = list(/mob/living/carbon/brain) // Everyone can deathgasp
/datum/emote/living/deathgasp/run_emote(mob/user, params) /datum/emote/living/deathgasp/run_emote(mob/user, params)
. = ..() . = ..()
if(. && isalienadult(user)) if(. && isalienadult(user))
playsound(user.loc, 'sound/voice/hiss6.ogg', 80, 1, 1) playsound(user.loc, 'sound/voice/hiss6.ogg', 80, 1, 1)
/datum/emote/living/drool /datum/emote/living/carbon/drool
key = "drool" key = "drool"
key_third_person = "drools" key_third_person = "drools"
message = "drools." message = "drools."
mob_type_blacklist_typelist = list(/mob/living/silicon, /mob/living/simple_animal/slime, /mob/living/carbon/brain)
/datum/emote/living/faint /datum/emote/living/faint
key = "faint" key = "faint"
key_third_person = "faints" key_third_person = "faints"
message = "faints." message = "faints."
mob_type_blacklist_typelist = list(/mob/living/silicon/pai, /mob/living/simple_animal/slime, /mob/living/carbon/brain)
/datum/emote/living/faint/run_emote(mob/user, params) /datum/emote/living/faint/run_emote(mob/user, params)
. = ..() . = ..()
@@ -133,73 +103,11 @@
key_third_person = "frowns" key_third_person = "frowns"
message = "frowns." message = "frowns."
/datum/emote/living/gag
key = "gag"
key_third_person = "gags"
message = "gags."
emote_type = EMOTE_AUDIBLE
mob_type_blacklist_typelist = list(/mob/living/silicon, /mob/living/simple_animal/slime, /mob/living/carbon/brain)
/datum/emote/living/gasp
key = "gasp"
key_third_person = "gasps"
message = "gasps!"
emote_type = EMOTE_AUDIBLE
stat_allowed = UNCONSCIOUS
mob_type_blacklist_typelist = list(/mob/living/silicon, /mob/living/simple_animal/slime, /mob/living/carbon/brain)
/datum/emote/living/giggle
key = "giggle"
key_third_person = "giggles"
message = "giggles."
message_mime = "giggles silently!"
emote_type = EMOTE_AUDIBLE
/datum/emote/living/glare
key = "glare"
key_third_person = "glares"
message = "glares."
message_mommi = "glares as best a robot spider can glare."
message_param = "glares at %t."
emote_type = EMOTE_AUDIBLE
/datum/emote/living/grin
key = "grin"
key_third_person = "grins"
message = "grins."
/datum/emote/living/groan
key = "groan"
key_third_person = "groans"
message = "groans!"
message_mime = "appears to groan!"
mob_type_blacklist_typelist = list(/mob/living/silicon, /mob/living/simple_animal/slime, /mob/living/carbon/brain)
/datum/emote/living/grimace
key = "grimace"
key_third_person = "grimaces"
message = "grimaces."
/datum/emote/living/jump /datum/emote/living/jump
key = "jump" key = "jump"
key_third_person = "jumps" key_third_person = "jumps"
message = "jumps!" message = "jumps!"
restraint_check = TRUE restraint_check = TRUE
mob_type_blacklist_typelist = list(/mob/living/silicon/pai, /mob/living/simple_animal/slime, /mob/living/carbon/brain)
/datum/emote/living/kiss
key = "kiss"
key_third_person = "kisses"
message = "blows a kiss."
message_param = "blows a kiss to %t."
emote_type = EMOTE_AUDIBLE
/datum/emote/living/laugh
key = "laugh"
key_third_person = "laughs"
message = "laughs."
message_mime = "laughs silently!"
emote_type = EMOTE_AUDIBLE
/datum/emote/living/laugh/can_run_emote(mob/living/user, var/status_check = TRUE) /datum/emote/living/laugh/can_run_emote(mob/living/user, var/status_check = TRUE)
. = ..() . = ..()
@@ -227,30 +135,6 @@
message_param = "points at %t." message_param = "points at %t."
restraint_check = TRUE restraint_check = TRUE
/datum/emote/living/pout
key = "pout"
key_third_person = "pouts"
message = "pouts."
emote_type = EMOTE_AUDIBLE
/datum/emote/living/scowl
key = "scowl"
key_third_person = "scowls"
message = "scowls."
emote_type = EMOTE_AUDIBLE
/datum/emote/living/shake
key = "shake"
key_third_person = "shakes"
message = "shakes their head."
emote_type = EMOTE_AUDIBLE
/datum/emote/living/shiver
key = "shiver"
key_third_person = "shiver"
message = "shivers."
emote_type = EMOTE_AUDIBLE
/datum/emote/living/sigh /datum/emote/living/sigh
key = "sigh" key = "sigh"
key_third_person = "sighs" key_third_person = "sighs"
@@ -261,14 +145,13 @@
key = "sit" key = "sit"
key_third_person = "sits" key_third_person = "sits"
message = "sits down." message = "sits down."
mob_type_blacklist_typelist = list(/mob/living/silicon/pai, /mob/living/simple_animal/slime, /mob/living/carbon/brain)
/datum/emote/living/smile /datum/emote/living/smile
key = "smile" key = "smile"
key_third_person = "smiles" key_third_person = "smiles"
message = "smiles." message = "smiles."
/datum/emote/living/sneeze /datum/emote/living/carbon/sneeze
key = "sneeze" key = "sneeze"
key_third_person = "sneezes" key_third_person = "sneezes"
message = "sneezes." message = "sneezes."
@@ -279,21 +162,6 @@
key_third_person = "smugs" key_third_person = "smugs"
message = "grins smugly." message = "grins smugly."
/datum/emote/living/sniff
key = "sniff"
key_third_person = "sniffs"
message = "sniffs."
emote_type = EMOTE_AUDIBLE
mob_type_blacklist_typelist = list(/mob/living/silicon, /mob/living/simple_animal/slime, /mob/living/carbon/brain)
/datum/emote/living/snore
key = "snore"
key_third_person = "snores"
message = "snores."
message_mime = "sleeps soundly."
emote_type = EMOTE_AUDIBLE
stat_allowed = UNCONSCIOUS
/datum/emote/living/stare /datum/emote/living/stare
key = "stare" key = "stare"
key_third_person = "stares" key_third_person = "stares"
@@ -304,7 +172,6 @@
key = "stretch" key = "stretch"
key_third_person = "stretches" key_third_person = "stretches"
message = "stretches their arms." message = "stretches their arms."
mob_type_blacklist_typelist = list(/mob/living/silicon/pai, /mob/living/simple_animal/slime, /mob/living/carbon/brain)
/datum/emote/living/sulk /datum/emote/living/sulk
key = "sulk" key = "sulk"
@@ -327,49 +194,18 @@
key = "sway" key = "sway"
key_third_person = "sways" key_third_person = "sways"
message = "sways around dizzily." message = "sways around dizzily."
mob_type_blacklist_typelist = list(/mob/living/silicon/pai, /mob/living/simple_animal/slime, /mob/living/carbon/brain)
/datum/emote/living/tremble /datum/emote/living/tremble
key = "tremble" key = "tremble"
key_third_person = "trembles" key_third_person = "trembles"
message = "trembles in fear!" message = "trembles in fear!"
/datum/emote/living/twitch
key = "twitch"
key_third_person = "twitches"
message = "twitches violently."
/datum/emote/living/twitch_s
key = "twitch_s"
message = "twitches."
/datum/emote/living/wave
key = "wave"
key_third_person = "waves"
message = "waves."
/datum/emote/living/whimper
key = "whimper"
key_third_person = "whimpers"
message = "whimpers."
message_mime = "appears hurt."
mob_type_blacklist_typelist = list(/mob/living/silicon/pai, /mob/living/simple_animal/slime, /mob/living/carbon/brain)
/datum/emote/living/wsmile
key = "wsmile"
key_third_person = "wsmiles"
message = "smiles weakly."
/datum/emote/living/yawn
key = "yawn"
key_third_person = "yawns"
message = "yawns."
emote_type = EMOTE_AUDIBLE
/datum/emote/living/custom /datum/emote/living/custom
key = "custom" key = "custom"
message = null message = null
mob_type_blacklist_typelist = list() // Everyone can custom emote.
/datum/emote/living/custom/proc/check_invalid(mob/user, input) /datum/emote/living/custom/proc/check_invalid(mob/user, input)
. = TRUE . = TRUE
if(copytext(input,1,5) == "says") if(copytext(input,1,5) == "says")

2
code/modules/mob/living/silicon/emote.dm
View File

@@ -12,6 +12,8 @@
/datum/emote/sound/silicon/can_run_emote(var/mob/user, var/status_check = TRUE) /datum/emote/sound/silicon/can_run_emote(var/mob/user, var/status_check = TRUE)
. = ..() . = ..()
if (. && isAI(user) && !module_quirk_required)
return TRUE
var/mob/living/silicon/pai/the_pai = user var/mob/living/silicon/pai/the_pai = user
if (. && istype(the_pai) && (!pai_software_required || (pai_software_required in the_pai.software))) if (. && istype(the_pai) && (!pai_software_required || (pai_software_required in the_pai.software)))
return TRUE return TRUE

2
code/modules/organs/internal/lungs/lung_gasses.dm
View File

@@ -212,5 +212,5 @@
H.sleeping = min(H.sleeping+2, 10) H.sleeping = min(H.sleeping+2, 10)
if(pp > min_giggle_pp) // There is sleeping gas in their lungs, but only a little, so give them a bit of a warning if(pp > min_giggle_pp) // There is sleeping gas in their lungs, but only a little, so give them a bit of a warning
if(prob(20)) if(prob(20))
H.emote(pick("giggle", "laugh")) H.emote(pick("giggle", "laugh"), ignore_status = TRUE)
set_moles(0) set_moles(0)