Commit Graph

50358 Commits

Author SHA1 Message Date
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
BlackMajor
89f9657ac7 Merge pull request #5822 from Darlantanis/DemonGibsNerf
Removes gibspawning from rift walkers
2023-02-28 20:35:05 +13:00
Nadyr
f51941336d Removes gibspawning from AI demon, makes new gibspam type 2023-02-28 01:57:21 -05:00
Seris02
e41a824496 better observe messages 2023-02-28 14:03:40 +08:00
Razgriz
84ab7c421d Merge pull request #4176 from BlackMajor/protean-rework
Protean rework part 2 (WIP)
2023-02-27 19:09:14 -07:00
Nadyr
333428e7cc Merge pull request #5810 from CHOMPStation2/upstream-merge-14570
[MIRROR] Enables Testing Character Voices in Setup
2023-02-27 20:32:09 -05:00
Razgriz
ada3e13709 Make ticket printer smaller
Because something so small, trivial, and used for silly RP should not be practically gigantic.
2023-02-27 16:54:21 -07:00
Nadyr
13e4159fa6 Merge branch 'master' into upstream-merge-14570 2023-02-27 18:43:39 -05:00
Nadyr
50fe69148e Merge pull request #5808 from CHOMPStation2/upstream-merge-14564
[MIRROR] Allows speech bubbles to be selected in char setup and saved
2023-02-27 18:41:00 -05:00
Razgriz
55585cca29 Merge pull request #5817 from CHOMPStation2/upstream-merge-14577
[MIRROR] fixes a small typo on the slime fertility agent
2023-02-27 12:20:09 -07:00
Casey
beb3423544 Merge pull request #14575 from Screemonster/mineminemine
Makes mining drones have a smarter IFF
2023-02-27 18:58:23 +00:00
Casey
582aaee6d9 Merge pull request #14577 from PastelPrinceDan/extract-fix
fixes a small typo on the slime fertility agent
2023-02-27 18:58:19 +00:00
Rykka Stormheart
f959ea3d9b Updates Transfer Message for Clarity
Fixes the sentence to (OOC Notice: Transfer votes must have a majority (70%) of all votes to initiate transfer.)
2023-02-27 08:04:05 -08:00
Rykka Stormheart
6ff7a4c176 Adds clarity to Transfer Vote
States in the vote question that transfer must exceed extend by 70% in order to transfer. Simple as that.
2023-02-27 04:50:39 -08:00
Nadyr
516ec1ee73 powder that makes you say yes 2023-02-27 02:19:50 -05:00
Nadyr
8f2312988b Merge pull request #5807 from CHOMPStation2/upstream-merge-14566
[MIRROR] Makes SD wall lockers properly visible
2023-02-27 02:17:07 -05:00
Nadyr
7abf6b1ac8 Merge pull request #5800 from CHOMPStation2/upstream-merge-14556
[MIRROR] [MIRROR] Lava Damage Adjustment
2023-02-27 02:14:50 -05:00
Nadyr
180ca117dc Merge pull request #5799 from CHOMPStation2/upstream-merge-14565
[MIRROR] Fixes hull-made items putting hull materials in my autolathe
2023-02-27 02:11:49 -05:00
Nadyr
34208c191b Merge pull request #5785 from CHOMPStation2/upstream-merge-14547
[MIRROR] Ghost pod for debris POI moved into its own separate PR
2023-02-27 02:08:18 -05:00
Nadyr
50e06b5bdc Merge pull request #5780 from CHOMPStation2/upstream-merge-14535
[MIRROR] makes Process belly button call death() on target
2023-02-27 02:06:55 -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
Casey
594ec63a8b Makes SD wall lockers properly visible 2023-02-26 18:10:04 +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
BlackMajor
59766b720c Merge pull request #5790 from CHOMPStation2/upstream-merge-14536
[MIRROR] Makes speech bubbles manually selectable, adds a whole bunch of new ones
2023-02-27 00:01:40 +13:00
Seris02
c121d589c8 resolve it 2023-02-26 18:21:49 +08:00
Heroman3003
d13fc550dc adds more drake plushies, and changes scidrake lights to match sci colors 2023-02-26 09:46:20 +00:00
Heroman3003
910a4eb7e8 Merge pull request #14556 from VOREStation/upstream-merge-8983
[MIRROR] Lava Damage Adjustment
2023-02-26 09:46:15 +00:00
Heroman3003
7717c49c87 Merge pull request #14565 from Heroman3003/atuolaathe
Fixes hull-made items putting hull materials in my autolathe
2023-02-26 09:46:09 +00:00
Razgriz
e966a01446 Merge pull request #5789 from CHOMPStation2/upstream-merge-14393
[MIRROR] Makes cooldown between pain messages a pre-set global preference
2023-02-26 01:06:29 -07:00
Razgriz
681328604a Merge pull request #5791 from CHOMPStation2/upstream-merge-14561
[MIRROR] adds the bladerunner coat to loadout
2023-02-26 01:05:58 -07:00
Razgriz
0586917341 Merge pull request #5797 from Seris02/atomcheck
better safety with the radio atom lists
2023-02-26 01:03:56 -07:00
Razgriz
3b0f59cea1 Merge pull request #5794 from CHOMPStation2/upstream-merge-14533
[MIRROR] [MIRROR] Suit kits no longer set item_state on hooded clothes
2023-02-26 01:02:56 -07:00
Razgriz
cef0668717 Merge pull request #5793 from CHOMPStation2/upstream-merge-14554
[MIRROR] [MIRROR] Safes Move Objects In Late Initialize.
2023-02-26 01:02:42 -07:00
Razgriz
d9327eb1f4 Merge pull request #5792 from Raeschen/master
Remove ghost join/leave notifications
2023-02-26 01:01:27 -07:00
Razgriz
77001e49cf Merge pull request #5787 from CHOMPStation2/upstream-merge-14555
[MIRROR] [MIRROR] Menthol doesn't kill you at 7 units
2023-02-26 01:00:57 -07:00
Razgriz
b1f4a090a8 Merge pull request #5783 from CHOMPStation2/upstream-merge-14544
[MIRROR] Fixes 2 runtimes
2023-02-26 00:59:19 -07:00
Razgriz
8cfbecfa58 Merge pull request #5782 from CHOMPStation2/upstream-merge-14543
[MIRROR] Allows ore processors to start collecting ore pieces again
2023-02-26 00:59:01 -07:00
Razgriz
6c60fc108f powder that makes you say yes 2023-02-26 00:57:19 -07:00
Razgriz
89440c6d2e Merge pull request #5779 from CHOMPStation2/upstream-merge-14534
[MIRROR] Adjusts artistic crate orders
2023-02-26 00:56:08 -07:00
Razgriz
b8e285e002 Merge pull request #5777 from CHOMPStation2/upstream-merge-14537
[MIRROR] dotted orange mushroom cap sprite in ear slot, non-colorable
2023-02-26 00:55:23 -07:00
Razgriz
79d2c49ff7 Merge pull request #5773 from CHOMPStation2/upstream-merge-14539
[MIRROR] [MIRROR] Adds const to holodeck copy bypass list.
2023-02-26 00:54:29 -07:00
Razgriz
024f962f2f Merge pull request #5770 from CHOMPStation2/upstream-merge-14530
[MIRROR] prevents persistent dirt (and other filth) from spawning in spess and walls
2023-02-26 00:53:29 -07:00
Razgriz
dea240e56d Merge pull request #5769 from CHOMPStation2/upstream-merge-14532
[MIRROR] [MIRROR] Fix AI hologram sprites.
2023-02-26 00:53:03 -07:00
Razgriz
08e5af4a80 Merge pull request #5768 from CHOMPStation2/upstream-merge-14527
[MIRROR] Fixes runtime from mobs without minds
2023-02-26 00:52:45 -07:00
Razgriz
f3850dad4e Merge pull request #5767 from CHOMPStation2/upstream-merge-14497
[MIRROR] cap crystal ooc escape fix
2023-02-26 00:52:14 -07:00
Razgriz
108bbb1e52 Merge pull request #5771 from Seris02/extrastuff
synthnaga tail, four ears ears, updated digi guilmon markings
2023-02-25 22:25:28 -07:00
Seris02
95cad26e01 better safety with the radio atom entering 2023-02-26 10:30:32 +08:00
Heroman3003
558d6e2431 Merge pull request #14533 from VOREStation/upstream-merge-8965
[MIRROR] Suit kits no longer set item_state on hooded clothes
2023-02-26 00:58:49 +00:00