Skip to content

Commit

Permalink
Add default return for robotic emotes (#2955)
Browse files Browse the repository at this point in the history
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request

PR fixes this bug


![image](https://github.com/shiptest-ss13/Shiptest/assets/32931701/1e7a4f99-e2d6-49a3-bdbc-2953d90a892e)


## Why It's Good For The Game

Bugfixes are good

## Changelog

🆑SuhEugene
fix: Fixed a bug when robotic emote would say that emote is unusable
even if it has been successfully used.
/🆑

<!-- Both 🆑's are required for the changelog to work! You can put
your name to the right of the first 🆑 if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
  • Loading branch information
SuhEugene authored May 5, 2024
1 parent c8cb79c commit 440571b
Showing 1 changed file with 18 additions and 9 deletions.
27 changes: 18 additions & 9 deletions code/modules/mob/living/carbon/human/emote.dm
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,8 @@
message_param = "beeps at %t."

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

/datum/emote/living/carbon/human/robot_tongue/buzz
Expand All @@ -249,15 +250,17 @@
message_param = "buzzes at %t."

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

/datum/emote/living/carbon/human/robot_tongue/buzz2
key = "buzz2"
message = "buzzes twice."

/datum/emote/living/carbon/human/robot_tongue/buzz2/run_emote(mob/user, params)
if(..())
. = ..()
if(.)
playsound(user.loc, 'sound/machines/buzz-two.ogg', 50)

/datum/emote/living/carbon/human/robot_tongue/chime
Expand All @@ -266,7 +269,8 @@
message = "chimes."

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

/datum/emote/living/carbon/human/robot_tongue/no
Expand All @@ -275,7 +279,8 @@
message = "emits an negative blip."

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

/datum/emote/living/carbon/human/robot_tongue/ping
Expand All @@ -285,7 +290,8 @@
message_param = "pings at %t."

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

/datum/emote/living/carbon/human/robot_tongue/warn
Expand All @@ -294,7 +300,8 @@
message = "blares an alarm!"

/datum/emote/living/carbon/human/robot_tongue/warn/run_emote(mob/user, params)
if(..())
. = ..()
if(.)
playsound(user.loc, 'sound/machines/warning-buzzer.ogg', 50)

/datum/emote/living/carbon/human/robot_tongue/yes
Expand All @@ -303,7 +310,8 @@
message = "emits an affirmative blip."

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

// the following emote were originally clown-locked and synthetic exclusive
Expand All @@ -315,7 +323,8 @@
message = "plays a sad trombone..."

/datum/emote/living/carbon/human/robot_tongue/sad/run_emote(mob/user, params)
if(..())
. = ..()
if(.)
playsound(user.loc, 'sound/misc/sadtrombone.ogg', 50)

//kepi (plus one vox i guess)
Expand Down

0 comments on commit 440571b

Please sign in to comment.