cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2026-08-22 12:16:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Ports the Emote Panel

Browse Source 
This Commit does the following:
Ports the Emote Panel
Turns SPLURT's emotes into /sound/human datums to reduce redundancy in the amount of emotes.
Gives almost every emote a name for the emote panel.
Removes herobrine.
Also fixes a few errors and makes sure all files are properly tested for Pull Request
This commit is contained in:
Sim
2024-09-30 21:48:48 -03:00
parent a0d9b266b1
commit 64becded7f
9 changed files with 579 additions and 432 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modular_splurt/code/modules/mob/living/carbon/human/species_types/teshari.dm
+12 -12
View File
@@ -61,60 +61,60 @@
/datum/language/schechi
/datum/emote/living/audio/teshari/teshsqueak
/datum/emote/sound/teshari/teshsqueak
key = "surprised"
key_third_person = "surprised"
message = "chirps in surprise!"
message_mime = "lets out an <b>inaudible</b> chirp!"
emote_sound = 'modular_splurt/sound/voice/teshsqueak.ogg' // Copyright CC BY 3.0 InspectorJ (freesound.org) for the source audio.
sound = 'modular_splurt/sound/voice/teshsqueak.ogg' // Copyright CC BY 3.0 InspectorJ (freesound.org) for the source audio.
emote_cooldown = 2.1 SECONDS
/datum/emote/living/audio/teshari/teshsqueak/run_emote(mob/user, params)
/datum/emote/sound/teshari/teshsqueak/run_emote(mob/user, params)
var/datum/dna/D = user.has_dna()
if(D.species.name != "Teshari")
return
// Return normally
. = ..()
/datum/emote/living/audio/teshari/teshchirp
/datum/emote/sound/teshari/teshchirp
key = "tchirp"
key_third_person = "tchirp"
message = "chirps!"
message_mime = "lets out an <b>inaudible</b> chirp!"
emote_sound = 'modular_splurt/sound/voice/teshchirp.ogg' // Copyright CC BY 3.0 InspectorJ (freesound.org) for the source audio.
sound = 'modular_splurt/sound/voice/teshchirp.ogg' // Copyright CC BY 3.0 InspectorJ (freesound.org) for the source audio.
emote_cooldown = 2.1 SECONDS
/datum/emote/living/audio/teshari/teshchirp/run_emote(mob/user, params)
/datum/emote/sound/teshari/teshchirp/run_emote(mob/user, params)
var/datum/dna/D = user.has_dna()
if(D.species.name != "Teshari")
return
// Return normally
. = ..()
/datum/emote/living/audio/teshari/trill
/datum/emote/sound/teshari/trill
key = "trill"
key_third_person = "trill"
message = "trills!"
message_mime = "lets out an <b>inaudible</b> chirp!"
emote_sound = 'modular_splurt/sound/voice/teshtrill.ogg' // Copyright CC BY 3.0 InspectorJ (freesound.org) for the source audio.
sound = 'modular_splurt/sound/voice/teshtrill.ogg' // Copyright CC BY 3.0 InspectorJ (freesound.org) for the source audio.
emote_cooldown = 2.1 SECONDS
/datum/emote/living/audio/teshari/trill/run_emote(mob/user, params)
/datum/emote/sound/teshari/trill/run_emote(mob/user, params)
var/datum/dna/D = user.has_dna()
if(D.species.name != "Teshari")
return
// Return normally
. = ..()
/datum/emote/living/audio/teshari/teshscream
/datum/emote/sound/teshari/teshscream
key = "teshscream"
key_third_person = "teshscream"
message = "screams!"
message_mime = "lets out an <b>inaudible</b> screams!"
emote_sound = 'modular_splurt/sound/voice/teshscream.ogg' // Copyright CC BY 3.0 InspectorJ (freesound.org) for the source audio.
sound = 'modular_splurt/sound/voice/teshscream.ogg' // Copyright CC BY 3.0 InspectorJ (freesound.org) for the source audio.
emote_cooldown = 2.1 SECONDS
/datum/emote/living/audio/teshari/teshscream/run_emote(mob/user, params)
/datum/emote/sound/teshari/teshscream/run_emote(mob/user, params)
var/datum/dna/D = user.has_dna()
if(D.species.name != "Teshari")
return
modular_splurt/code/modules/mob/living/carbon/human/species_types/vox.dm
+3 -3
View File
@@ -60,15 +60,15 @@
emote_type = EMOTE_AUDIBLE
/datum/emote/living/audio/vox/shriek
/datum/emote/sound/vox/shriek
key = "shriek"
key_third_person = "shrieks"
message = "shrieks!"
message_mime = "lets out an <b>inaudible</b> shriek!"
emote_sound = 'modular_splurt/sound/voice/shriek1.ogg' // Copyright CC BY 3.0 InspectorJ (freesound.org) for the source audio.
sound = 'modular_splurt/sound/voice/shriek1.ogg' // Copyright CC BY 3.0 InspectorJ (freesound.org) for the source audio.
emote_cooldown = 2.1 SECONDS
/datum/emote/living/audio/vox/shriek/run_emote(mob/user, params)
/datum/emote/sound/vox/shriek/run_emote(mob/user, params)
var/datum/dna/D = user.has_dna()
if(D.species.name != "Vox")
return
modular_splurt/code/modules/mob/living/emotes.dm
+484 -389
View File
File diff suppressed because it is too large Load Diff