juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
28,407 Commits 57 Branches 0 Tags
2cb094372c8e5c2ba0423b0e2da3bd7e4e6f4c7a
Commit Graph

64 Commits

Author SHA1 Message Date
Ed
ca656b3c10 Merge remote-tracking branch 'upstream/master' into ed-29-08-2024 
# Conflicts:
#	Content.Server/Station/Systems/StationSpawningSystem.cs
#	Resources/Prototypes/Maps/reach.yml
 2024-08-29 14:32:09 +03:00
lzk
ff3d79797d Fix-Resprite emote icons (#31447) 
* Fix-Resprite emote icons

* change scream
 2024-08-26 12:20:58 +10:00
Ed
c82b17a65e Merge remote-tracking branch 'upstream/master' into ed-19-08-2024-upstream 
# Conflicts:
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
#	Content.Server/Damage/Systems/DamageOtherOnHitSystem.cs
#	Content.Shared/Clothing/Components/ClothingComponent.cs
#	Resources/Prototypes/Accents/word_replacements.yml
#	Resources/Prototypes/Maps/Pools/default.yml
#	Resources/Prototypes/Maps/atlas.yml
#	Resources/Prototypes/Maps/bagel.yml
#	Resources/Prototypes/Maps/cluster.yml
#	Resources/Prototypes/Maps/europa.yml
#	Resources/Prototypes/Maps/omega.yml
#	Resources/Prototypes/Maps/origin.yml
#	Resources/Prototypes/Traits/speech.yml
#	Resources/Prototypes/Voice/disease_emotes.yml
#	Resources/Prototypes/Voice/speech_emotes.yml
#	Resources/Prototypes/game_presets.yml
#	Resources/Prototypes/secret_weights.yml
 2024-08-19 19:06:38 +03:00
geraeumig
c48a96ac15 Trim punctuation marks in the chat emote system (#28612) 
Co-authored-by: geraeumig <alfenos@proton.me>
 2024-08-18 16:49:07 -06:00
Unkn0wn_Gh0st
73331416e3 Coughing and coughing changes (#30893) 
* Coughing

* Merge branch 'space-wizards:master' into coughing

* Coughing

* Coughing
 2024-08-18 12:00:42 -04:00
Ed
3a910a7f7f Merge remote-tracking branch 'upstream/master' into ed-21-06-2024-upstream-sync 
# Conflicts:
#	Resources/Prototypes/Maps/europa.yml
#	Resources/Prototypes/Maps/train.yml
 2024-06-21 18:30:31 +03:00
Mr. 27
82c4db67bc Fix female reptilians not having gasp sounds (#29143) 
inital
 2024-06-18 13:56:37 +10:00
Ed
04d29b6268 Merge remote-tracking branch 'upstream/master' into ed-17-06-2024-upstream 
# Conflicts:
#	Resources/Prototypes/Maps/oasis.yml
 2024-06-17 14:20:38 +03:00
Tabitha
c52073f542 Add chicken speech sound (#28948) 2024-06-13 19:43:02 -07:00
Deserty0
d1af83c72a fixed ru emote sound v2 (#240) 
* ultrafixxxxx

* Update speech_emotes.yml

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
 2024-06-13 13:39:55 +03:00
RenQ
3e2eb6cc7a "Death gasp" for a moth (#28409) 2024-06-03 14:48:01 -04:00
Cojoke
a0b49116be Adds Chat Triggers to the Gasp Emote (#28466) 2024-06-03 08:10:24 -04:00
lzk
a2f4540cb5 Remake gasp popup to emote (#27736) 2024-05-28 19:56:41 -04:00
Ty Ashley
b8144df7a5 Added new icons for the emote wheel (#27541) 
* Added new icons for the emote wheel

* Corrected weh path

* Changed whistle to better match other vocal emotes. Modified honk icon to match dimensions of box. Corrected chirp and chitter emote icons.

* Cleaned up edges of icons

* Added attributions.yml to emotes folder
 2024-05-05 20:12:30 -05:00
Mr. 27
6680bd4c60 emote wheel fixes (#27545) 
* cheese

* Update disease_emotes.yml
 2024-05-02 15:33:51 +03:00
no
81e553401c Make female reptilians use female cry sound instead of male (#27563) 2024-05-01 13:09:31 +10:00
Mr. 27
a7bf9583dd monkeys get a different deathgasp emote (#27497) 
a
 2024-04-30 00:14:45 -04:00
MilenVolf
7ee18433c8 New borg sounds (#27205) 
* New borg sounds

* Add manic laughter of an assault borg

Never wanted, but needed

* Fix wrong attribution

* Some requested changes

* Change borgwalk sounds

* Forgor
 2024-04-28 21:38:31 -07:00
Morb
16b3e2233a Emotes Menu (#26702) 
* Basic emote radial menu

* Move out from corvax

* Move to UI controller & add to top menu bar and key bind

* Make emote play

* Add name localization for emotes

* Localize chat messages

* Fix emote menu

* Add categories localization

* Fixes

* Fix

* Add emotes entity blacklist

* Fix entity whitelist required all logic

* Remove unused wagging emote

* Revert sprite

* Set default texture for emote icon

* Update Resources/keybinds.yml

---------

Co-authored-by: Kara <lunarautomaton6@gmail.com>
 2024-04-28 21:38:23 -07:00
Keer-Sar
cf7567d073 Add Cyborg Emote Sounds (#26594) 
* Hal 9000's first emote

* Add Chime emote & Change variation to 0.05

* Modify Buzz emote

* Add Buzz-two emote

* modified Horn

* add ping emote

* add slowclap emote

* Convert slowclap.ogg to mono, reflect change in attribution.yml

* fix capitalization for all chatMessages && change all catagory to category

* remove all traces of slowclap.ogg

* forgor one file smh

* collating copywrite

* spelling mistakes will be the death of me

* more spelling mistakes

* change yml string to list
 2024-04-01 15:35:21 +11:00
metalgearsloth
bbe08c0bfb Fix master (#26501) 
* Fix master

* this

* messages

* Fix missing verb name parrot

* Fix messagePack for blockgame and spacevillain

---------

Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
 2024-03-28 04:12:36 -07:00
deltanedas
d13da2837d voicemask can select speech verb (#25768) 
* add Name field to SpeechVerbPrototype

* extra locale for voice mask ui

* SpeechVerb ui and handling

* raaaaaaaaa

* reeeeeeeeal

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>

* fix sort

* did you hear john syndicate died of ligma

* Update Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
 2024-03-28 17:36:43 +11:00
Tayrtahn
cd4eda44b8 Make parrots talk like parrots (#26340) 2024-03-24 18:26:41 -07:00
Whisper
30e09af2a4 Add weh to: Anomalies, Artifacts, random puddles (#25611) 
* Add weh to: Anomalies, Artifacts, random puddles

* also change weh to wehs!
 2024-02-26 15:59:15 -07:00
Whisper
1de102d08e Juice that makes you Weh! (but real!) (#25132) 
* Juice that makes you Weh!

* Remove dupe

* updated the localization files

* try to fix error
 2024-02-26 00:54:07 +11:00
LankLTE
1d7167b95b Small Nymph Changes (#25363) 
* Emote sounds, accent & doorbump

* Oops

* Only non-brains can't talk
 2024-02-19 09:11:20 -08:00
Errant
5a9ab3b315 Vox names, species prototype cleanup, some cosmetic changes (#24994) 
* voxnames

* New generator parameters, names are more readable

* bunch of missing vox stuff

* more names

* sad
 2024-02-14 14:08:45 +11:00
themias
f25093e85e Add Diona salute sound (#24836) 2024-02-02 09:34:09 +11:00
Wertan
507c39d445 Adds emote "Buzz" for moth (#24556) 
* Buzzing moth

* Update speech_emotes.yml
 2024-02-01 19:20:53 +11:00
Hmeister-real
f511f60fb4 Add a few new ways to laugh and cry with emotes (#24585) 
* Add a few new speech emoted for Cry and Laugh

* Remove Pouting

me dumb and silly
 2024-01-31 22:26:46 +11:00
Tayrtahn
b4046bc2bb Fix sloshing electricity & enable SpeechVerb masking (#24238) 
* Implemented electricity speech verb masking

* Handle speech verb override elsewhere in the system, even though we're not using it

* Fix that protoId business

* No nullable component fields

* Use ProtoId, and try going back to a nullable.
Specifiy DataFields on VoiceMaskComponent.
 2024-01-23 17:12:18 -05:00
Morb
9063cfe454 Tail wagging (#19573) 
* MVP

* Uncomment animated prototypes

* Disable wagging on death

* Move component to server

* Looped tail animation

* Apply front tail template

* Disable animated markings globally

* Add emote sending

* Update documentation

* Move locale

* Use static instantAction & remove action on comp del

* Use fluent POSS-ADJ

* Update docs

* Add copyright

* Update copyright

* Update license & copyright

* Move to main directory & format meta.json

* Fix path

* Change namespace

* Remove empty meta.json

* Update

* REMOVE unnecessary IsNullOrWhiteSpace check

Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>

* Move animated markings to main file

* Use emotes

* new

* fix

* fix

* Tests, pls

* fix dixel

* Remove networked from wagging comp

* Remove unused import

* Remove unused imports

* Move wagging comp to shared

* Revert the emotes

If we're getting it the action is better.

---------

Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
 2024-01-14 18:52:07 +11:00
Mr. 27
4dc0a5f6ae More arachnid emote noises (#23548) 
* inital

* add click

* aaaa

* Create arachnid_click.ogg

* attributions

* hu

* actually fix attributions
 2024-01-05 20:32:11 -05:00
Ed
088d39f7ac Bread dog (#22548) 
* add content

* add new bark accent
 2023-12-16 01:30:20 -07:00
metalgearsloth
269c93245d Unrevert audio (#21330) 
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
 2023-11-27 22:12:34 +11:00
Ed
d6870f4a49 Cak Upgrade (#21678) 
* added fun

* change recipe, add OwO

* fix?

* upgrade
 2023-11-16 01:12:56 -07:00
metalgearsloth
5b8f3c48c4 Revert "Update submodule to 175.0.0 (#21318)" (#21319) 2023-10-29 15:29:30 +11:00
metalgearsloth
9b1b3e03ed Content audio (#20862) 2023-10-29 14:58:23 +11:00
brainfood1183
b7d96c6538 Honk reagent now makes you Honk. (#20838) 2023-10-11 19:43:54 +03:00
Nairod
44b166788b More Speech Verbs (#19626) 2023-08-31 20:15:31 -07:00
Kara
7db8c781e7 Speech verbs & conditional markup modification (#18980) 2023-08-15 13:03:05 -07:00
Kara
7b51cebfea Deathgasp + last words / succumbing / fake deathgasp as crit actions (#18993) 2023-08-11 22:56:34 -07:00
LankLTE
6b2fef1ac8 small moth changes (#18810) 
* changes

* fix test fail hopefully

* disallow eating containers

* no more eating stored stuff
 2023-08-08 22:05:05 -06:00
LankLTE
70545f4873 Moths. (#18593) 2023-08-04 15:21:28 +10:00
lzk
9e8c2f27f4 comit (#17532) 2023-06-28 14:13:31 -06:00
lzk
02c8544d45 Update speech_emote_sounds.yml (#17627) 2023-06-28 14:01:41 -06:00
Kevin Zheng
704b908f73 Give female dwarves female laughs (#17362) 2023-06-15 13:19:25 -06:00
justproggramer
608ddf0ab8 Emotion (#17187) 2023-06-08 16:22:02 +10:00
lzk228
9492fd7b2f Sigh sound (#16223) 
* comit1

* Create attributions.yml

* Update Resources/Audio/Voice/Human/license.txt

* Update attributions.yml

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
 2023-05-11 03:17:24 -06:00
PixelTK
8269a500b3 Arachnid species (#13945) 2023-04-30 02:19:06 +10:00