Commit Graph

1207 Commits

Author SHA1 Message Date
Raeschen
5ecad647ba Merge pull request #6352 from CHOMPStation2/upstream-merge-15000
[MIRROR] Watch your head!
2023-06-17 23:11:45 +02:00
Raeschen
724d57c213 Merge pull request #6330 from ItsSelis/fix-14937
[MIRROR-FIX] Little Cleanup
2023-06-17 14:42:07 +02:00
Heroman3003
5e251b1868 Merge pull request #15000 from Youtubeboy139/New_Hardhats
Watch your head!
2023-06-10 04:06:14 +00:00
Nadyr
81b3ccb3a0 Merge pull request #6304 from CHOMPStation2/upstream-merge-14936
[MIRROR] Little Weakref Refactor
2023-06-09 22:27:56 -04:00
Heroman3003
fa5a718114 Little Cleanup 2023-06-03 09:22:23 +00:00
Heroman3003
3d53d2bb62 Little Weakref Refactor 2023-06-03 09:22:18 +00:00
Heroman3003
b37a023823 Merge pull request #14912 from Youtubeboy139/Thaler-Change
It's all bout that Money Money Money
2023-06-01 20:36:54 +00:00
BlackMajor
65a5644b02 Ugh 2023-04-30 21:39:18 +12:00
BlackMajor
8730bd6b0f Merge branch 'master' into matrices 2023-04-30 16:19:43 +12:00
BlackMajor
6f9f78213d Merge branch 'master' into matrices 2023-04-30 16:14:51 +12:00
BlackMajor
e3c6d74ffd Done and dusted 2023-04-30 15:49:35 +12:00
Nadyr
2466d8cdba Merge pull request #6137 from CHOMPStation2/upstream-merge-14812
[MIRROR] Ion Beam Redux
2023-04-25 22:15:41 -04:00
Nadyr
e301182ac4 Merge pull request #6127 from CHOMPStation2/upstream-merge-14807
[MIRROR] Chocolate Allergy
2023-04-25 21:06:31 -04:00
Heroman3003
317fc95a7e Ion Beam Redux 2023-04-22 05:41:47 +00:00
Verkister
a9f423aff2 merged acid act and added turbo mode 2023-04-21 15:14:35 +03:00
Heroman3003
c4f4980adf Merge pull request #14807 from SatinIsle/Chocolate-Allergy
Chocolate Allergy
2023-04-20 06:05:26 +00:00
TheGreatKitsune
e38ee2a935 Add Undergarment TF mode to vore sprites. 2023-04-14 19:13:59 -05: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
Nadyr
b582a862b9 Merge pull request #5954 from CHOMPStation2/upstream-merge-14517
[MIRROR] [MIRROR] Adds fog as a weather. It's cold.
2023-03-17 04:09:02 -04:00
Nadyr
5bbc06a4f3 Merge pull request #5937 from CHOMPStation2/upstream-merge-14616
[MIRROR] Creates framework for renaming visitable overmap objs on initialization
2023-03-17 03:24:01 -04:00
Nadyr
a0747e4d47 powder that makes you say yes 2023-03-17 02:19:01 -04:00
Heroman3003
b3806f26b7 [MIRROR] Adds fog as a weather. It's cold. 2023-03-16 05:52:23 +00:00
Heroman3003
4a44fb90ab Creates framework for renaming visitable overmap objs on initialization 2023-03-14 19:30:04 +00:00
Heroman3003
025fac4bf9 [MIRROR] /tg/ era language pass 2023-03-13 05:23:57 +00:00
Rykka Stormheart
f8bbb5790d Merge branch 'master' into shep-dev-barky-noises 2023-03-10 01:54:26 -08:00
Heroman3003
4fff3b4226 Merge pull request #14583 from Seris02/adminjumplink
more fixed admin hrefs
2023-03-09 05:08:26 +00: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
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
818f2d64e0 yeah 2023-03-02 20:41:12 +13:00
Heroman3003
916526893a Merge pull request #14547 from Runa-Dacino/SurvivorPod
Ghost pod for debris POI moved into its own separate PR
2023-02-25 03:04:16 +00:00
Casey
2071da1bf1 Merge pull request #14503 from Very-Soft/broke
Broke
2023-02-17 17:00:51 +00:00
Razgriz
d470d3fae9 Merge pull request #5715 from Seris02/newthingspls
adds more markings, ears and tails and changes the way digitigrade markings are handled
2023-02-13 14:31:57 -07:00
Seris02
8b5c0b7f12 adds more markings and changes the way digitigrade markings are handled 2023-02-13 15:43:24 +08:00
Casey
f841a10f4c Implements periodic tips for (new) players! 2023-02-12 18:19:13 +00:00
Heroman3003
3438abe012 Merge pull request #14431 from VOREStation/upstream-merge-8911
[MIRROR] fixes robo limbs setting child limbs afterwards
2023-02-04 21:04:45 +00:00
Nadyr
0093bbac01 Merge pull request #5555 from lbnesquik/kot-muffle-item
Add a mode to muffle items.
2023-02-02 20:35:44 -05:00
lbnesquik
141519b826 Add a mode to muffle items. 2023-01-18 03:27:00 +01:00
Casey
04f41aadb7 Adds fireworks and their launchers 2022-12-26 02:05:31 +00:00
Heroman3003
70923e0c22 Adds admin tokens 2022-12-11 19:41:31 +00:00
Nadyr
e7375c180c Merge pull request #5330 from CHOMPStation2/upstream-merge-14056
[MIRROR] promethean fixes and QoLs
2022-12-04 18:18:56 -05:00
Heroman3003
1ba39fee84 Merge pull request #14056 from Seris02/prometheanchanges
promethean fixes and QoLs
2022-11-28 21:51:35 +00:00
Casey
d8f8f116bf Merge pull request #14141 from Heroman3003/smite-adjust
Adjusts smite list
2022-11-26 22:40:26 +00:00
Darlantan
91fc31c6b4 Renames "non-crew" to "outsider," provides external ID
-Renames "non-crew" to "outsider."
-Provides an external ID to outsiders, allowing PDA use.
-Improves grammar in outsider job description
-Reformats outsider to use a define for the job name, replaces hard-coded uses of "non-crew" with said define.
2022-11-25 19:56:59 -05:00
Darlantan
65bfa8d415 Adds bottles, pills, patches, and fixes emergency stop 2022-11-02 22:24:30 -04:00
Nadyr
d77e4f84cb Merge pull request #3877 from TheGreatKitsune/non-crew-role
Non crew role added
2022-10-29 19:08:16 -04:00
Verkister
cccd8d45a9 Makes slow body digestion a belly mode addon
This way there was no need to add another extra button to clutter the tgui
The extra brutal version will stay as a varedit thing for now. Doesn't have enough relevancy to get an actual button tbh.
2022-10-25 17:21:20 +03:00
Nadyr
319b20c2ee Merge pull request #5119 from CHOMPStation2/upstream-merge-13881
[MIRROR] [MIRROR] Ports Diagonal Movement [READY FOR MERGE]
2022-10-11 20:40:10 -04:00
Casey
24a6d07198 Merge pull request #13881 from VOREStation/upstream-merge-8199
[MIRROR] Ports Diagonal Movement [READY FOR MERGE]
2022-10-10 03:08:39 +00:00
Casey
86ee514421 Merge pull request #13855 from Cameron653/overlay_madness
Upgrades OverlaySS. Fixes #3627
2022-10-10 03:02:27 +00:00
Razgriz
cd0e5fd00a Merge pull request #5068 from CHOMPStation2/upstream-merge-13828
[MIRROR] Blueprint Revamp.
2022-10-02 22:47:55 -07:00