Commit Graph

79 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
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
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
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
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
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
Nadyr
259d1fd47d Merge pull request #4549 from CHOMPStation2/upstream-merge-13319
[MIRROR] Adds roulette balls
2022-07-19 20:55:00 -04:00
Nadyr
38f0f6355e powder that makes you say yes 2022-07-19 20:41:45 -04:00
Nadyr
78ffd7f32a Merge pull request #4448 from CHOMPStation2/upstream-merge-13201
[MIRROR] Fixes positive and negative traits being unsavable for non-custom species
2022-07-19 20:32:24 -04:00
Nadyr
7f2936e816 Merge branch 'master' into upstream-merge-13193 2022-07-19 20:17:40 -04:00
Nadyr
5a7ae556cd powder that makes you say yes 2022-07-19 19:53:21 -04:00
Nadyr
7538f6481c powder that makes you say yes 2022-06-29 19:04:37 -04:00
Nadyr
03de2b7388 powder that makes you say yes 2022-06-29 19:01:45 -04:00
Nadyr
1f3090bcc6 powder that makes you say yes 2022-06-29 18:59:51 -04:00
Casey
dc4253f86c Merge pull request #13201 from Heroman3003/traitfix1
Fixes positive and negative traits being unsavable for non-custom species
2022-06-29 20:37:23 +00:00
Casey
6ab64ba666 Implements all-species positive and negative traits 2022-06-29 06:01:30 +00:00
Razgriz
72a172464a powder that makes you say yes 2022-06-27 16:06:14 -07:00
Casey
ecf834c452 Adds Linguist and Polyglot traits 2022-06-26 18:02:51 +00:00
Casey
b0802ce267 More TGUI Input Conversions 2022-06-19 11:09:42 +00:00
Casey
0b734943a3 Merge pull request #12763 from KillianKirilenko/kk-feedback
Verb Reset Buttons
2022-04-17 21:40:01 +00:00
Rykka
25eed899d7 Trait Tweak - Positives capped at 6, Negatives Uncapped
As above.
Traits now have an unlimited amount for negatives, given they are intended to harm you.
Positives have a cap of 6 total.
Prior to this, one could do 6 positives and two extremely expensive negatives, but no other 'fun' negatives.

Now, one can still do 6 strong positives, but as many negatives as they like.
IDEALLY this will allow for custom setups with a lot of small-cost negatives for higher cost positives.

Assuming Tankiness PR comes in before this, it will need adjusting to account for this, but, assuming one powergames to get the ABSOLUTE best traits possible (using the tankiness PR):

Positive:
High Endurance - 3
Burn Resist, Major - 3
Brute Resist, Major - 3
Increased Pain Tolerance - 2
Extreme Hardy - 3
Sharp Melee - 1

Traits Left: 0
Points Left: -15

Negative:
Reduced Biocompatability, Major - -8
Conductive Major - -3
Haemophilia - -2
Extreme Photosensitivity - -2

Points Left: 0

Extremely low healing (30% effective heals, meaning a heal for 10 will only heal 3)
Double incoming taser/electrical damage
Bleed 2x as fast
Flashes stun 2x as long. (This trait in particular is badly in need of an overhaul so it's not free points on 99% of rounds).
2022-03-29 15:35:18 -06:00
Casey
b2348a672b Merge pull request #11875 from Heroman3003/synthtrait
Fixes bugs related to organic/synthetic exclusive traits disappearing
2021-12-08 22:49:09 +00:00
Aronai Sieyes
891650aeea Merge pull request #11712 from KillianKirilenko/kk-misc2
Customverb tweak
2021-10-27 18:17:48 +00:00
Verkister
d8eb8f4efa Fixes tiny oversight on the language fix
Fixes the removal of linguist trait slapping that returnable number 0 that likes to override the species value in prefs numlanguage()
2021-08-27 15:46:42 +03:00
Aronai Sieyes
ec8cc6e795 Merge pull request #11136 from VOREStation/Arokha/synthtemp
Prevent synths from taking temp traits
2021-07-19 21:17:22 +00:00
Nadyr
e5f3ca6219 powder that makes you say yes 2021-07-01 19:39:04 -04:00
Chompstation Bot
b6e1989a01 The One Where I Port Modals 2021-06-30 19:29:34 +00:00
Nadyr
4cd3b97bc9 Update 07_traits.dm 2021-04-11 06:13:12 -04:00
CHOMPStationBot
d1de7d60b0 [MIRROR] Species cleanup (#1792)
* Merge pull request #10127 from Nyksia/species-cleanup

Species cleanup

* Species cleanup

Co-authored-by: Novacat <35587478+Novacat@users.noreply.github.com>
2021-04-10 22:17:26 -07:00
Chompstation Bot
2a5c21c8f5 [MIRROR] Kaleidoscope 2: The Retabbening 2021-03-21 01:24:14 -04:00
Sharkmare
234bfbb791 Update hard override file and downports Vorestation changes of kin
This updates our override file to no longer override the functions that are now just default handling
2021-03-09 22:55:53 +01:00
Nadyr
f38596b023 Merge pull request #1499 from Sharkmare/kin-rework
Shadekin Content Update + Whitelists for traits
2021-03-06 23:32:39 -05:00
Sharkmare
546b39a395 Putting whitie and black togehter apparently breaks
So its a code block of its own
2021-03-06 17:54:16 +01:00
Sharkmare
06d969a967 Species whitelist for traits
Tunes up the trait system to have a whitelist AND a blacklist so you can choose whichever makes you have to write the lowest amount of code
2021-03-06 17:23:41 +01:00
Novacat
d9a0ad4732 Merge pull request #9848 from Sharkmare/patch-5
Fixing traits left display
2021-03-04 18:52:08 +00:00
Novacat
de16303003 Merge pull request #9710 from KillianKirilenko/kk-misc4
Go [Verb] Yourself!
2021-03-03 16:09:37 +00:00
cadyn
52695407cc Merge branch 'master' into upstream-merge-9804 2021-02-27 15:39:43 -08:00
cadyn
e9dbe2b585 Update 07_traits.dm 2021-02-27 15:00:16 -08:00
cadyn
6ccc54e3a1 Update 07_traits.dm 2021-02-27 14:58:55 -08:00
Chompstation Bot
f097111c56 Improved Trait Exclusion Logic v2 2021-02-27 00:21:13 +00:00