mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-01-03 13:32:17 +00:00
6b82dc3de6
<!-- 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 Have you ever wanted to bonk someone on the head? Well now you can with the [*bonk emote](https://www.youtube.com/watch?v=C0XF57pK67g). Just aim at someone's head and hit them with the hand. I'd advise against doing it to borgs or synthetics though.. that sounds painful. <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> <!-- Please make sure to actually test your PRs. If you have not tested your PR mention it. --> ## Why It's Good For The Game More variety of emotes. <!-- Argue for the merits of your changes and how they benefit the game, especially if they are controversial and/or far reaching. If you can't actually explain WHY what you are doing will improve the game, then it probably isn't good for the game in the first place. --> ## Proof Of Testing It compiled and ran on my end without any runtimes or errors. Everything has been tested to work. <!-- Compile and run your code locally. Make sure it works. This is the place to show off your changes! We are not responsible for testing your features. --> <details> <summary>Screenshots/Videos</summary> https://github.com/user-attachments/assets/8e1ca604-4bd5-4300-adf6-23b194eea623 </details> ## Changelog <!-- If your PR modifies aspects of the game that can be concretely observed by players or admins you should add a changelog. If your change does NOT meet this description, remove this section. Be sure to properly mark your PRs to prevent unnecessary GBP loss. You can read up on GBP and its effects on PRs in the tgstation guides for contributors. Please note that maintainers freely reserve the right to remove and add tags should they deem it appropriate. You can attempt to finagle the system all you want, but it's best to shoot for clear communication right off the bat. --> 🆑 add: added a bonk emote sound: added the coconut hit 01 sound effect to the code /🆑 <!-- 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. --> <!-- By opening a pull request. You have read and understood the repository rules located on the main README.md on this project. --> --------- Co-authored-by: LT3 <83487515+lessthnthree@users.noreply.github.com> Co-authored-by: Waterpig <49160555+Majkl-J@users.noreply.github.com>
170 lines
5.0 KiB
Plaintext
170 lines
5.0 KiB
Plaintext
//Very important modifications for the bird communication, also new emote files for bubber EXCLUSIVE emote list!
|
|
|
|
/datum/emote/living/chirp
|
|
key = "chirp"
|
|
key_third_person = "chirps"
|
|
message = "chirps!"
|
|
emote_type = EMOTE_AUDIBLE
|
|
vary = TRUE
|
|
sound = 'modular_zubbers/code/modules/emotes/sound/voice/chirp.ogg'
|
|
|
|
/datum/emote/living/caw
|
|
key = "caw"
|
|
key_third_person = "caws"
|
|
message = "caws!"
|
|
emote_type = EMOTE_AUDIBLE
|
|
vary = TRUE
|
|
sound = 'modular_zubbers/code/modules/emotes/sound/voice/caw.ogg'
|
|
|
|
/datum/emote/living/caw2
|
|
key = "caw2"
|
|
key_third_person = "caws twice"
|
|
message = "caws twice!"
|
|
emote_type = EMOTE_AUDIBLE
|
|
vary = TRUE
|
|
sound = 'modular_zubbers/code/modules/emotes/sound/voice/caw2.ogg'
|
|
|
|
/datum/emote/living/mrrp //you play like a cat
|
|
key = "mrrp"
|
|
key_third_person = "mrrps"
|
|
message = "mrrps!"
|
|
emote_type = EMOTE_AUDIBLE
|
|
vary = TRUE
|
|
sound = 'modular_zubbers/code/modules/emotes/sound/voice/mrrp.ogg'
|
|
|
|
/datum/emote/living/fpurr
|
|
key = "fpurr"
|
|
key_third_person = "fpurrs"
|
|
message = "purrs!"
|
|
emote_type = EMOTE_AUDIBLE
|
|
vary = TRUE
|
|
sound = 'modular_zubbers/code/modules/emotes/sound/voice/fox_purr.ogg'
|
|
|
|
/datum/emote/living/prbt //all tesh players will love me
|
|
key = "prbt"
|
|
key_third_person = "prbts"
|
|
message = "prbts!"
|
|
emote_type = EMOTE_AUDIBLE
|
|
vary = TRUE
|
|
sound = 'modular_zubbers/code/modules/emotes/sound/voice/prbt.ogg'
|
|
|
|
/datum/emote/living/gecker
|
|
key = "gecker"
|
|
key_third_person = "geckers"
|
|
message = "geckers!"
|
|
emote_type = EMOTE_AUDIBLE
|
|
vary = TRUE
|
|
sound = 'modular_zubbers/code/modules/emotes/sound/voice/foxgecker.ogg'
|
|
|
|
/datum/emote/living/mar //all shadekin players will love me
|
|
key = "mar"
|
|
key_third_person = "mars"
|
|
message = "lets out a mar!"
|
|
emote_type = EMOTE_AUDIBLE
|
|
vary = TRUE
|
|
sound = 'modular_zubbers/sound/emotes/sound_voice_mar.ogg' // Credit to vorestation
|
|
|
|
//Silicons can snap now
|
|
/datum/emote/living/snap
|
|
key = "snap"
|
|
key_third_person = "snaps"
|
|
message = "snaps their fingers."
|
|
message_param = "snaps their fingers at %t."
|
|
emote_type = EMOTE_AUDIBLE | EMOTE_VISIBLE
|
|
sound = 'sound/mobs/humanoids/human/snap/fingersnap1.ogg'
|
|
|
|
/datum/emote/living/meow_alt
|
|
key = "meow1"
|
|
key_third_person = "meowalt"
|
|
message = "meows!"
|
|
emote_type = EMOTE_AUDIBLE
|
|
vary = TRUE
|
|
sound = 'modular_zubbers/sound/emotes/meow1.ogg'
|
|
|
|
/datum/emote/living/mrowl
|
|
key = "mrowl"
|
|
key_third_person = "mrowls"
|
|
message = "mrowls!"
|
|
emote_type = EMOTE_AUDIBLE
|
|
vary = TRUE
|
|
sound = 'modular_zubbers/sound/emotes/mrowl.ogg'
|
|
|
|
/datum/emote/living/flutter //Moth flutter
|
|
key = "flutter"
|
|
key_third_person = "flutters"
|
|
message = "rapidly flutters their wings!"
|
|
emote_type = EMOTE_AUDIBLE
|
|
vary = TRUE
|
|
sound = 'sound/mobs/humanoids/moth/moth_flutter.ogg'
|
|
|
|
/datum/emote/living/sigh_exasperated
|
|
key = "esigh" // short for exasperated sigh
|
|
key_third_person = "esighs"
|
|
message = "lets out an exasperated sigh."
|
|
emote_type = EMOTE_AUDIBLE
|
|
|
|
/datum/emote/living/sigh_exasperated/get_sound(mob/living/user)
|
|
if(iscarbon(user))
|
|
if(user.gender == MALE)
|
|
return 'modular_zubbers/code/modules/emotes/sound/voice/male_sigh_exasperated.ogg'
|
|
return 'modular_zubbers/code/modules/emotes/sound/voice/female_sigh_exasperated.ogg'
|
|
return
|
|
|
|
/datum/emote/living/tail_thump
|
|
key = "tailthump"
|
|
key_third_person = "tailthumps"
|
|
message = "thumps their tail!"
|
|
emote_type = EMOTE_AUDIBLE
|
|
vary = TRUE
|
|
sound = 'modular_zubbers/code/modules/emotes/sound/voice/tailthump.ogg' // See https://github.com/shiptest-ss13/Shiptest/pull/2159
|
|
|
|
/datum/emote/living/tail_thump/can_run_emote(mob/user, status_check, intentional, params)
|
|
var/obj/item/organ/external/tail/tail = user.get_organ_slot(ORGAN_SLOT_EXTERNAL_TAIL)
|
|
if(isnull(tail))
|
|
return FALSE
|
|
return ..()
|
|
|
|
|
|
/datum/emote/living/squeal
|
|
key = "squeal"
|
|
key_third_person = "squeals"
|
|
message = "squeals!"
|
|
emote_type = EMOTE_AUDIBLE
|
|
vary = TRUE
|
|
sound = 'modular_zubbers/code/modules/emotes/sound/voice/squeal.ogg' // See https://github.com/shiptest-ss13/Shiptest/pull/2159
|
|
|
|
/datum/emote/living/yipyip
|
|
key = "yipyip"
|
|
key_third_person = "yips twice"
|
|
message = "yips twice!"
|
|
emote_type = EMOTE_AUDIBLE
|
|
vary = TRUE
|
|
sound = 'modular_zubbers/code/modules/emotes/sound/voice/yip.ogg'
|
|
|
|
/datum/emote/living/yip
|
|
key = "yip"
|
|
key_third_person = "yips"
|
|
message = "yips!"
|
|
emote_type = EMOTE_AUDIBLE
|
|
vary = TRUE
|
|
mob_type_allowed_typecache = list(/mob/living/carbon, /mob/living/silicon/pai)
|
|
|
|
/datum/emote/living/yip/get_sound(mob/living/user)
|
|
return pick('modular_zubbers/code/modules/emotes/sound/voice/yip1.ogg',
|
|
'modular_zubbers/code/modules/emotes/sound/voice/yip2.ogg',
|
|
'modular_zubbers/code/modules/emotes/sound/voice/yip2.ogg')
|
|
|
|
/datum/emote/living/carbon/bonk
|
|
key = "bonk"
|
|
key_third_person = "bonks"
|
|
hands_use_check = TRUE
|
|
|
|
/datum/emote/living/carbon/bonk/run_emote(mob/user, params, type_override, intentional)
|
|
. = ..()
|
|
if(!length(user.get_empty_held_indexes()))
|
|
to_chat(user, span_warning("You don't have any free hands to bonk someone with."))
|
|
return
|
|
var/obj/item/hand_item/bonkinghand/bonk = new(user)
|
|
if(user.put_in_hands(bonk))
|
|
to_chat(user, span_notice("You ready your hand to bonk someone."))
|