Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New silicon emote, slowclap + emotes for MMIs #12043

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
+16 −1
Open

New silicon emote, slowclap + emotes for MMIs #12043

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
04073e1
initial
mrmanlikesbt Dec 16, 2024
98ae438
IPCs can slowclap, MMIs can use silicon emotes
mrmanlikesbt Dec 16, 2024
c0cac6e
Merge branch 'BeeStation:master' into slowclap
mrmanlikesbt Dec 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions code/modules/mob/living/carbon/human/emote.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,6 +335,16 @@
if(..())
playsound(user.loc, 'sound/emotes/dwoop.ogg', 50)

/datum/emote/living/carbon/human/robot_tongue/slowclap
key = "slowclap"
key_third_person = "activates their slow clap processor."
message = "activates their slow clap processor."
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
message = "activates their slow clap processor."
key_third_person = "plays a slow clapping sound."

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://youtu.be/wcnpZYmNAuI?si=YJVf7qHxVUBysXR6

Copy link
Contributor

@ClownMoff ClownMoff Dec 17, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I just updated my original review with a more extensive opinion while you were responding if you want to read it. I did not remember that Portal phrase, but even though its a funny nod to a beloved franchise I still think it does not translate well into the game worded this way

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess I can agree about why a borg would have a slow clap processor in the first place, but if you used that logic elsewhere half the game would be removed + this isn't a HRP server. As for the wording of the emote, I disagree. I think how it is now is funnier and the only problem I see with it because of it's length it doesn't fully display in runechat (you can see this in the testing evidence). Thanks for the feedback though!

emote_type = EMOTE_AUDIBLE

/datum/emote/living/carbon/human/robot_tongue/slowclap/run_emote(mob/user, params)
if(..())
playsound(user.loc, 'sound/machines/slowclap.ogg', 50)

// Clown Robotic Tongue ONLY. Henk.

/datum/emote/living/carbon/human/robot_tongue/clown/can_run_emote(mob/user, status_check = TRUE , intentional)
Expand Down
7 changes: 6 additions & 1 deletion code/modules/mob/living/silicon/robot/emote.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/datum/emote/silicon
mob_type_allowed_typecache = list(/mob/living/silicon, /mob/living/simple_animal/hostile/mining_drone)
mob_type_allowed_typecache = list(/mob/living/brain, /mob/living/silicon, /mob/living/simple_animal/hostile/mining_drone)
emote_type = EMOTE_AUDIBLE

/datum/emote/silicon/boop
Expand Down Expand Up @@ -55,3 +55,8 @@
key = "warn"
message = "blares an alarm!"
sound = 'sound/machines/warning-buzzer.ogg'

/datum/emote/silicon/slowclap
key = "slowclap"
message = "activates its slow clap processor."
sound = 'sound/machines/slowclap.ogg'
Loading