cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-23 05:00:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes borg emotes FOR REAL THIS TIME. (#9666)

Browse Source 
* fix

* fixes
This commit is contained in:
nikothedude
2021-11-28 14:17:21 -05:00
committed by GitHub
parent 5d611b3afd
commit 7feb7341f0
2 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/emote.dm
+4 -2
View File
@@ -554,14 +554,16 @@
/datum/emote/living/custom/replace_pronoun(mob/user, message)
return message
/datum/emote/living/beep
//SKYRAT EDIT REMOVAL BEGIN - SYNTH EMOTES, NOW HANDLED IN SYNTH_EMOTES.DM
/* /datum/emote/living/beep
key = "beep"
key_third_person = "beeps"
message = "beeps."
message_param = "beeps at %t."
sound = 'sound/machines/twobeep.ogg'
mob_type_allowed_typecache = list(/mob/living/brain, /mob/living/silicon)
emote_type = EMOTE_AUDIBLE
emote_type = EMOTE_AUDIBLE */
//SKYRAT EDIT REMOVAL END
/datum/emote/living/inhale
key = "inhale"
modular_skyrat/modules/emotes/code/synth_emotes.dm
+11 -1
View File
@@ -48,13 +48,23 @@
allowed_species = list(/datum/species/robotic/ipc, /datum/species/synth, /datum/species/synth/military, /datum/species/robotic/synthliz, /datum/species/robotic/synthetic_human, /datum/species/robotic/synthetic_mammal)
cooldown = 2 SECONDS
/datum/emote/living/human/beep
key = "beep"
key_third_person = "beeps"
message = "beeps."
message_param = "beeps at %t."
emote_type = EMOTE_AUDIBLE
sound = 'sound/machines/twobeep.ogg'
silicon_allowed = TRUE
allowed_species = list(/datum/species/robotic/ipc, /datum/species/synth, /datum/species/synth/military, /datum/species/robotic/synthliz, /datum/species/robotic/synthetic_human, /datum/species/robotic/synthetic_mammal)
cooldown = 2 SECONDS
/datum/emote/living/human/beep2
key = "beep2"
key_third_person = "beeps sharply"
message = "beeps sharply."
message_param = "beeps sharply at %t."
emote_type = EMOTE_AUDIBLE
vary = TRUE
sound = 'modular_skyrat/modules/emotes/sound/emotes/twobeep.ogg'
silicon_allowed = TRUE