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.

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 lizard emote. #11936

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 17 additions & 0 deletions code/modules/mob/living/emote.dm
Original file line number Diff line number Diff line change
Expand Up @@ -739,6 +739,23 @@
/datum/emote/living/whistle/get_sound(mob/living/user)
return 'sound/emotes/whistle1.ogg'

/datum/emote/living/tail
key = "swipe"
key_third_person = "swipes"
message = "swipes their tail!"
emote_type = EMOTE_AUDIBLE

/datum/emote/living/tail/get_sound(mob/living/user)
if(islizard(user))
return pick('sound/effects/tail_swipe1.ogg', 'sound/effects/tail_swipe2.ogg')

/datum/emote/living/tail/can_run_emote(mob/user, status_check = TRUE , intentional)
if(!..())
return FALSE
if(islizard(user))
var/mob/living/carbon/human/H = user
return istype(H?.getorganslot(ORGAN_SLOT_TAIL), /obj/item/organ/tail)

/// Breathing required + audible emotes

/datum/emote/living/must_breathe
Expand Down
3 changes: 2 additions & 1 deletion sound/attributions.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ sound/items/handling/standard_stamp.ogg is adapted from tom_woysky's "Stamp.wav"
sound/ambience/antag/abductee.ogg is from "Warp SFX" https://freesound.org/people/Breviceps/sounds/453391 (CC0)
sound/ambience/antag/brainwash.ogg is from "nog.wav" https://freesound.org/people/_NOMINAL_/sounds/124602 (CC-BY 3.0)
sound/ambience/antag/hypnosis.ogg is from "Flashback.wav" https://freesound.org/people/Sclolex/sounds/342103 (CC0)

sound/effects/tail_swipe1.ogg is from TGMC https://github.com/tgstation/TerraGov-Marine-Corps (CC-BY-NC-3.0)
sound/effects/tail_swipe2.ogg is from TGMC https://github.com/tgstation/TerraGov-Marine-Corps (CC-BY-NC-3.0)

modified by grungussuss:
male_sneeze2.ogg: https://freesound.org/people/InspectorJ/sounds/352177/ , license: CC BY 4.0 DEED
Expand Down
Binary file added sound/effects/tail_swipe1.ogg
Binary file not shown.
Binary file added sound/effects/tail_swipe2.ogg
Binary file not shown.
Loading