Skip to content

Commit

Permalink
Adds two emotes for Sarathi (shiptest-ss13#2159)
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
*squeal from Bay
*thump mildly edited from
https://freesound.org/people/TylerAM/sounds/389665/
<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game
meep meep

https://github.com/shiptest-ss13/Shiptest/assets/81882910/2700cb33-5232-43c0-97c2-0e3c08060ba0

<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

## Changelog

:cl:
add: *thump and *squeal emotes for sarathi
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: 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
thgvr authored and MarkSuckerberg committed Aug 11, 2023
1 parent 38036fe commit 69bb223
Show file tree
Hide file tree
Showing 5 changed files with 32 additions and 10 deletions.
2 changes: 1 addition & 1 deletion code/datums/emotes.dm
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
var/vary = FALSE //used for the honk borg emote
var/only_forced_audio = FALSE //can only code call this event instead of the player.
var/cooldown = 0.8 SECONDS
var/static/regex/stop_bad_mime = regex(@"says|exclaims|yells|asks") //WS Edit
var/static/regex/stop_bad_mime = regex(@"says|exclaims|yells|asks")

/datum/emote/New()
if (ispath(mob_type_allowed_typecache))
Expand Down
38 changes: 30 additions & 8 deletions code/modules/mob/living/carbon/human/emote.dm
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
else if(islizard(H))
return pick('sound/voice/lizard/lizard_scream_1.ogg', 'sound/voice/lizard/lizard_scream_2.ogg', 'sound/voice/lizard/lizard_scream_3.ogg', 'sound/voice/lizard/lizard_scream_4.ogg')

/datum/emote/living/carbon/human/hiss
/datum/emote/living/carbon/human/hiss //lizard
key = "hiss"
key_third_person = "hisses"
message = "hisses!"
Expand All @@ -80,11 +80,36 @@
/datum/emote/living/carbon/human/hiss/get_sound(mob/living/user)
if(!ishuman(user))
return
var/mob/living/carbon/human/H = user
if (islizard(H))
if(islizard(user))
return 'sound/voice/lizard/hiss.ogg'

/datum/emote/living/carbon/human/weh
/datum/emote/living/carbon/human/squeal //lizard
key = "squeal"
key_third_person = "squeals"
message = "squeals!"
emote_type = EMOTE_AUDIBLE
vary = TRUE

/datum/emote/living/carbon/human/squeal/get_sound(mob/living/user)
if(!ishuman(user))
return
if(islizard(user))
return 'sound/voice/lizard/squeal.ogg' //This is from Bay

/datum/emote/living/carbon/human/tailthump //lizard
key = "thump"
key_third_person = "thumps their tail"
message = "thumps their tail!"
emote_type = EMOTE_AUDIBLE
vary = TRUE

/datum/emote/living/carbon/human/tailthump/get_sound(mob/living/user)
if(!ishuman(user))
return
if(islizard(user))
return 'sound/voice/lizard/tailthump.ogg' //https://freesound.org/people/TylerAM/sounds/389665/

/datum/emote/living/carbon/human/weh //lizard
key = "weh"
key_third_person = "lets out a weh"
message = "lets out a weh!"
Expand All @@ -94,8 +119,7 @@
/datum/emote/living/carbon/human/weh/get_sound(mob/living/user)
if(!ishuman(user))
return
var/mob/living/carbon/human/H = user
if (islizard(H))
if(islizard(user))
return 'sound/voice/lizard/weh.ogg'

/datum/emote/living/carbon/human/pale
Expand Down Expand Up @@ -199,8 +223,6 @@
var/turf/T = loc
T.Entered(src)

//Ayy lmao

// Robotic Tongue emotes. Beep!

/datum/emote/living/carbon/human/robot_tongue/can_run_emote(mob/user, status_check = TRUE , intentional)
Expand Down
2 changes: 1 addition & 1 deletion shiptest.dme
Original file line number Diff line number Diff line change
Expand Up @@ -3062,9 +3062,9 @@
#include "code\modules\reagents\reagent_containers\chem_pack.dm"
#include "code\modules\reagents\reagent_containers\dropper.dm"
#include "code\modules\reagents\reagent_containers\glass.dm"
#include "code\modules\reagents\reagent_containers\jug.dm"
#include "code\modules\reagents\reagent_containers\hypospray.dm"
#include "code\modules\reagents\reagent_containers\hypovial.dm"
#include "code\modules\reagents\reagent_containers\jug.dm"
#include "code\modules\reagents\reagent_containers\maunamug.dm"
#include "code\modules\reagents\reagent_containers\medigel.dm"
#include "code\modules\reagents\reagent_containers\mortar.dm"
Expand Down
Binary file added sound/voice/lizard/squeal.ogg
Binary file not shown.
Binary file added sound/voice/lizard/tailthump.ogg
Binary file not shown.

0 comments on commit 69bb223

Please sign in to comment.