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-23 20:56:47 +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
code/modules/mob/living/carbon/emote.dm
+1
View File
@@ -10,6 +10,7 @@
/datum/emote/living/carbon/blink_r
key = "blink_r"
name = "blink rapidly"
message = "blinks rapidly."
/datum/emote/living/carbon/clap
code/modules/mob/living/carbon/human/emote.dm
+2 -2
View File
@@ -99,7 +99,7 @@
else
H.dna.species.stop_wagging_tail(H)
/datum/emote/living/carbon/human/wag/can_run_emote(mob/user, status_check = TRUE)
/datum/emote/living/carbon/human/wag/can_run_emote(mob/user, status_check = TRUE, intentional = FALSE)
if(!..() || !ishuman(user))
return FALSE
var/mob/living/carbon/human/H = user
@@ -135,7 +135,7 @@
else
. = "closes " + message
/datum/emote/living/carbon/human/wing/can_run_emote(mob/user, status_check = TRUE)
/datum/emote/living/carbon/human/wing/can_run_emote(mob/user, status_check = TRUE, intentional = FALSE)
if(!..() || !ishuman(user))
return FALSE
var/mob/living/carbon/human/H = user
code/modules/mob/living/emote.dm
+1 -1
View File
@@ -216,7 +216,7 @@
/datum/emote/living/audio_emote
emote_type = EMOTE_AUDIBLE
/datum/emote/living/audio_emote/can_run_emote(mob/living/user, status_check = TRUE)
/datum/emote/living/audio_emote/can_run_emote(mob/living/user, status_check = TRUE, intentional = FALSE)
. = ..()
if(. && iscarbon(user))
var/mob/living/carbon/C = user