Commit Graph

202 Commits

Author SHA1 Message Date
Aroliacue
c20ab697ba New Xeno SFX (#7252) 2023-11-20 15:17:55 +01:00
CHOMPStation2
d12da443e6 [MIRROR] Scaling Center Up-port (#7232)
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Selis <selis@xynolabs.com>
2023-11-17 23:47:30 +01:00
Verkister
b65a5f746b Adds vorgan-specific belly noise freq/pitch settings (#7006) 2023-09-19 13:28:33 +02:00
CHOMPStation2
a69fe76a7b [MIRROR] Blood Reagents Refactor (#6980)
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Raeschen <rycoop29@gmail.com>
2023-09-18 17:41:12 +02:00
CHOMPStation2
a7d7ec8d87 [MIRROR] Char Setup: Reset Buttons (#6828)
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
2023-08-17 23:40:37 +02:00
Raeschen
d4992917ce Fix merge conflicts 2023-06-17 13:07:51 +02:00
Heroman3003
0d5f21d733 Preferred Language + Autohiss Default Options 2023-04-14 05:32:03 +00:00
Rykka Stormheart
e601048e13 Fixes error with Species Sounds
Unset ran into an error that did not occur during testing - select_default_species_sound was changed to use pref instead of user, and the testing calls were not updated.

Unathi had no species sounds.
2023-03-23 05:10:29 -07:00
Razgriz
c057f9f0f8 Merge pull request #5813 from Rykka-Stormheart/shep-dev-barky-noises
Sound Update: Mob Species Sounds (Gasp/Scream/Pain/Death/Cough/Sneeze)
2023-03-22 14:32:04 -07:00
Seris02
fb677ceee1 better gargoyle code 2023-03-18 19:56:35 +08:00
Rykka Stormheart
f8bbb5790d Merge branch 'master' into shep-dev-barky-noises 2023-03-10 01:54:26 -08:00
Nadyr
f09fd02e6e Merge pull request #5894 from CHOMPStation2/upstream-merge-14641
[MIRROR] Fixes some admin perms not being properly checked
2023-03-09 22:23:21 -05:00
Casey
96a7facbb6 Merge pull request #14641 from Heroman3003/admin-perm-fixes-also-sound
Fixes some admin perms not being properly checked
2023-03-09 21:05:11 +00:00
Casey
33b59118ef Start With Backup Implant setting 2023-03-08 19:09:49 +00:00
Rykka Stormheart
da9c38b689 Merge remote-tracking branch 'upstream/master' into shep-dev-barky-noises 2023-03-04 16:01:30 -08:00
Razgriz
c95c11d08d Merge pull request #5847 from Rykka-Stormheart/shep-dev-def-langhiss
Preferred Language + Autohiss Default Options
2023-03-04 16:38:26 -07:00
Rykka Stormheart
7d2027bbde Preferred Language + Autohiss Default Options
Autohiss can now be set to Full from the character menu, and by default, it is assumed Full. It will respect save/load and client connect/disconnect, meaning you no longer have to constantly toggle autohiss.

Preferred Language can now be set. This allows a default spoken language other than Common to be set from spawn, allowing characters to simply join with the language they'd prefer speaking, rather than having to fiddle with "Set Default Language" every time they spawn.
Server rules do still apply, ofc. You must be able to speak Common or at least +understand+ it capably enough to do your job.

See Preferred Language Setting here;
![](https://i.imgur.com/NnGw3hx.png)
Menu for it here:
![](https://i.imgur.com/PSS3PPf.png)

See Autohiss Settings here:
![](https://i.imgur.com/L36Hw5N.png)

Yes, Autohiss is set underneath Egg Type. I wanted to use some of the space there. I can move it up under the Size/etc panels and speech verbs if requested.
2023-03-04 01:56:08 -08:00
Rykka Stormheart
9c80b225aa Update 2.0
- Technical: All sounds are now using a masterlist that is indexed via keypairs, saving on overhead and copypaste.
- Technical continued: Rather than defining sounds per species, go to sound.dm, add a define, following the above, then add your key + pair to species_sounds_map - for instance, `"Mouse" = mouse_sounds`. Easy as that.
- All mobs refer to this list rather than defining their own pain/etc sounds.
- All mobs can override death sounds with death_sound_override set to the sound (or sounds) of their choice.
- Added the following sound options: Lizard, Metroid, Mouse, Raccoon, Slime, Spider, Teshari, Vox, Vulpine, Xeno
- If Species Sound is set to "Unset", it will automatically grab the correct sounds for your gender *and* species, if those exist.
- For developers: set `gender_specific_species_sounds` to TRUE on your species, and set `species_sounds_[gender]` (fill in gender with your chosen gender) for it to fetch these sounds.
- Species can now control the volume that their emote sounds play at. Refer to the added variables in `species.dm` for details.
- Cough/Sneeze/Scream/Pain/Gasp/Death sounds are all now standardized and use the same procs to fetch sounds, cutting down on copy/paste and reducing changes for things to go wrong.
- Fixed multiple smaller bugs, the details of which elude me, in regards to 1.0/Original
- Ported Xeno scream/roar/pain/death sounds from TGMC.
- Deathgasp actually plays your death sound (TBD if this is too spammy).
2.1
- Technical: Fixed a runtime in get_default_species_sounds where it was trying to fetch from dummy mob rather than the player's preferences.
- Fixed an error where chat would not display the "this set does not have 'x' sounds!" message.
2023-03-01 23:55:19 -08:00
Rykka Stormheart
2940d67c4d Update 1.0
Refactors lists into #defines, promptly cries. This part is agony and still worked on.

Simplemobs can play injury sounds as well, selecting a sound based off a global list.
Pain emotes occur based on updatehealth(), with respect to silicons and such.
Pain emotes also occur at a 60% chance on traumatic shock.
Simplemobs can also play death sounds based off the species sounds lists.
Add Mouse, Robotic, Spider, None as options to the voice list.
Fixes runtime/bug with Silicons (borgs) trying to get species var.
2023-03-01 23:55:19 -08:00
Rykka Stormheart
6a837244da Sound Update: Pain/Scream/Gasp/Death Sounds
This PR adds the following sounds;
Death sounds
Scream sounds
Pain sounds
Gasp sounds

The sounds are organized into a category under character setup - navigate to the VORE tab and select one based on your preference. If Unset, or not chosen, it will default to whatever the icon base is for your species - for instance, Vulpkanin will get the Canine sounds.

Sounds are grouped into 4 major lists so far, with plans for more once I get more files;
Canine (Scream/Gasp/Death/Pain)
Feline (Scream/Gasp/Death/Pain)
Cervine (Scream/Death only)
Generic/Human (Scream/Gasp/Death/Pain)

Vulpkanin use Canine sounds. Tajaran use Feline. Humans get Generic/Human. Cervine is unset on any species, allowed to be taken by customs.
Vox have a pain sound.

This also enables **pain** emotes. These can be manually done with *pain, or triggered automatically on taking an injury. The pain trigger respects species pain mods - for instance, if you have Major Pain Tolerance, you'll hear yourself growl in pain far less than someone who has Intolerance.

Pain is **not** triggered by spicy food or hallucinations, as those two add halloss on directly. Only effects that apply damage will add on pain.

You can test out these sounds in the Character Setup panel. See [here](https://streamable.com/o9wr9g), and here:
![](https://i.imgur.com/JhbH6r3.png)

A demonstration of human sounds is available [here](https://streamable.com/hqwpel).
Canine sounds [here](https://streamable.com/41d0oj)
Demonstrations of it during combat [here](https://streamable.com/y4nxea) and [here](https://streamable.com/gj2gl3).

These can be muted by navigating to Sound and setting the Mob Injury Sounds variable, seen here:
![](https://i.imgur.com/4zblNmd.png)

Species that currently lack sounds have had their audible sounds disabled to prevent jarring human noises from playing on non-human species. This can be overridden upon request, but for now, it will serve as hopeful inspiration to encourage additional files.
2023-03-01 23:54:52 -08:00
Sharkmare
68dd41276d Globalize the Voice list and fetching 2023-02-28 08:02:38 +01:00
Nadyr
13e4159fa6 Merge branch 'master' into upstream-merge-14570 2023-02-27 18:43:39 -05:00
Nadyr
516ec1ee73 powder that makes you say yes 2023-02-27 02:19:50 -05:00
Casey
3c0afc385c Enables Testing Character Voices in Setup 2023-02-26 18:54:32 +00:00
Casey
3c878714b8 Allows speech bubbles to be selected in char setup and saved 2023-02-26 18:10:11 +00:00
Rykka Stormheart
e26e3e821d Enables Testing Character Voices in Setup
As title;
This function was WIP, @blackmajor didn't have time to finish it.
I went ahead and finished this up, and realized it was worth PR'ing separately for speedmerge, because this is MASSIVELY convenient.

TL;DR:
You can hit "Test Character Voice" in setup, to play a preview of what your voice will sound like with the selected type and frequency.

See demonstration here: https://streamable.com/m6u9vc
2023-02-26 03:52:24 -08:00
Heroman3003
7e8b8bf3f2 Merge pull request #14506 from Seris02/nofreenifs
no free nifs from switching species from protean
2023-02-18 19:10:45 +00:00
Razgriz
cd9f69570b Merge pull request #5702 from CHOMPStation2/upstream-merge-14472
[MIRROR] adds trait preferences and removes a bug
2023-02-12 19:12:11 -07:00
Razgriz
a5037f3180 Revert "[MIRROR] Runtime fixes" 2023-02-12 19:03:56 -07:00
Razgriz
cd05f4c7e4 Merge pull request #5704 from CHOMPStation2/upstream-merge-14476
[MIRROR] Runtime fixes
2023-02-12 19:01:40 -07:00
Razgriz
9229e66b90 powder that makes you say yes 2023-02-12 18:56:11 -07:00
Razgriz
0b1059963b comments that make you say yes 2023-02-12 17:59:01 -07:00
Casey
2891dc3ea7 Merge pull request #14476 from Heroman3003/runtime-17
Runtime fixes
2023-02-12 18:21:37 +00:00
Casey
ffd8251f24 adds trait preferences and removes a bug 2023-02-12 18:20:26 +00:00
Rykka Stormheart
cc135c3d33 Fixes Custom Cold messages being uneditable/editing the wrong list
As described. Prior to this, clicking this would bring up the custom_heat list, and fail to set messages correctly.

This corrects that.
2023-02-08 08:01:31 -08:00
Nadyr
ccc3101516 powder that makes you say yes 2023-02-07 16:45:46 -05:00
Casey
ac099a732b proper sanitization of cold and heat messages 2023-02-07 19:19:18 +00:00
Rykka Stormheart
e25aeb10d1 Indent oopsies in github copy 2023-02-07 09:27:21 -08:00
Rykka Stormheart
f8fe0768b0 Earlyports #14459 from VORE, properly sanitizes heat/cold messages
Credit goes to Seris, not me, just earlyporting.
https://github.com/VOREStation/VOREStation/pull/14459
2023-02-07 09:19:15 -08:00
Nadyr
0e4960fc88 Merge pull request #5619 from CHOMPStation2/upstream-merge-14384
[MIRROR] Adds ability to customize discomfort
2023-02-02 20:45:58 -05:00
Nadyr
6945894ad7 Merge pull request #5633 from CHOMPStation2/upstream-merge-14386
[MIRROR] sanitizes selection of custom bases in prefs
2023-02-02 20:38:26 -05:00
Heroman3003
16008d3571 Merge pull request #14386 from Seris02/shapeshiftersanitization
sanitizes selection of custom bases in prefs
2023-02-01 21:42:39 +00:00
Heroman3003
515e92e594 Adds ability to customize discomfort 2023-01-28 22:12:59 +00:00
Heroman3003
de1e7c527c Merge pull request #14394 from Cyantime/patch-2
Hitting cancel when setting character ad no longer blanks it in setup
2023-01-28 19:53:00 +00:00
Nadyr
3b259e189d Merge pull request #5589 from CHOMPStation2/upstream-merge-14355
[MIRROR] few small fixes and improvements for proteans
2023-01-27 10:21:37 -05:00
Rykka
dbb639fc59 Removes BDSM and Furry/Human Preference Toggles 2023-01-23 12:56:13 -08:00
Rykka
5ed802978f Adds CHOMPStation Comments
Just-in-case.
2023-01-23 12:56:00 -08:00
Rykka
87482853ea Character Directory Update - Adds Four Additional Tags
This will be ported upstream to VOREStation momentarily, hence the lack of // CHOMPStation comments.
If upstream makes any changes or rejects the PR, I will add comments on as needed.

Adds four new preferences + tags, shown here!
![](https://cdn.discordapp.com/attachments/404660884531707906/1041243283373948978/azcYOMj.png)

Gender, Sexuality, BDSM Role, and Furry/Human Preference.

The latter two may be unnecessary, particularly the BDSM role, but I figured it was an easy addition, and just as easy to remove on request!

The intent for these additions is to make perusing for scenes ever-so-slightly easier, and lay out important keynotes such as gender more clearly.
2023-01-23 12:56:00 -08:00
Heroman3003
cb32a65c87 few small fixes and improvements for proteans 2023-01-22 01:35:08 +00:00
Heroman3003
1ba39fee84 Merge pull request #14056 from Seris02/prometheanchanges
promethean fixes and QoLs
2022-11-28 21:51:35 +00:00