Commit Graph

1743 Commits

Author SHA1 Message Date
Heroman3003
feebcbac94 Merge pull request #14886 from KillianKirilenko/kk-fashion
New Poncho Style
2023-05-25 02:11:24 +00:00
Casey
c0093930a5 Merge pull request #14857 from BonniePandora/CustomItem-NameChange
Small custom-item changes
2023-05-15 00:18:21 +00:00
Nadyr
7200a5e85a Merge pull request #6164 from CHOMPStation2/upstream-merge-14823
[MIRROR] Added striped dungarees and tiny tophat
2023-04-30 22:49:59 -04:00
Heroman3003
d1460c5713 Added striped dungarees and tiny tophat 2023-05-01 00:58:13 +00:00
BlackMajor
65a5644b02 Ugh 2023-04-30 21:39:18 +12:00
Fluff
669570d26c Added the synthsizer
Added the synthsizer
2023-04-18 20:50:59 -04:00
Fluff
ca6f42e694 Added instruments to load out.
Added the following instruments to the loudout
2023-04-18 19:48:11 -04:00
Nadyr
3439bbe48e Merge pull request #6065 from CHOMPStation2/upstream-merge-14772
[MIRROR] Adds Mira's health services medal
2023-04-11 01:09:46 -04:00
Nadyr
6c0584ab5b Merge pull request #6050 from Sharkmare/patch-27
More efficient ShoesDel()
2023-04-11 00:51:52 -04:00
Nadyr
45e1fbd0c5 Merge pull request #5924 from TheGreatKitsune/loadout-crystals
Adds loadout capture crystals!
2023-04-10 17:13:47 -04:00
Casey
790e2cbd81 Merge pull request #14772 from Runa-Dacino/mirafluff
Adds Mira's health services medal
2023-04-10 00:55:12 +00:00
Sharkmare
b78302161c More efficient ShoesDel()
hints at deletion on init instead of manually calling deletion
2023-04-07 16:56:54 +02:00
Heroman3003
bfd45cf2d0 Merge pull request #14750 from Cyantime/ftextreset
Stop 'cancel' button from wiping flavor text
2023-04-02 20:23:32 +00:00
TheGreatKitsune
99d9295bc3 Merge master into loadout-crystals 2023-04-01 08:56:27 -05:00
Heroman3003
bde7b77bab Crop Jackets 2023-03-31 01:23:22 +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
Nadyr
e3e765c599 Merge pull request #5957 from Sharkmare/patch-18
No shoes shoe option
2023-03-17 04:01:26 -04:00
Nadyr
7dae5957cb Merge pull request #5920 from CHOMPStation2/upstream-merge-14675
[MIRROR] Removes warcrimes from boots
2023-03-17 02:34:13 -04:00
Nadyr
d6048bd409 powder that makes you say yes 2023-03-17 02:12:55 -04:00
Sharkmare
79619dddcb Update loadout_shoes_vr.dm 2023-03-16 14:41:12 +01:00
Sharkmare
0f3870d9b9 oh right dreamchecker doesnt like this 2023-03-16 14:37:11 +01:00
Sharkmare
b100c26c11 unrelative the path 2023-03-16 14:34:29 +01:00
Sharkmare
ef4a4c2006 null paths dont work, big sad 2023-03-16 10:56:17 +01:00
Sharkmare
6a87c1df2c I mean, maybe it works 2023-03-16 10:34:28 +01:00
TheGreatKitsune
97701e8b3f Adds loadout capture crystals! 2023-03-13 16:58:03 -05:00
Heroman3003
d60ea6ffd2 Merge pull request #14675 from Heroman3003/boot-no-kill
Removes warcrimes from boots
2023-03-13 05:26:05 +00:00
Heroman3003
b8ed862f96 Relaxes Sanitization 2023-03-13 04:11:26 +00: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
Nadyr
0cb04f7a19 Merge pull request #5890 from CHOMPStation2/upstream-merge-14519
[MIRROR] [MIRROR] allows animations to be toggled in preferences
2023-03-09 22:18:05 -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
Heroman3003
0af4214f61 Merge pull request #14519 from VOREStation/upstream-merge-8944
[MIRROR] allows animations to be toggled in preferences
2023-03-09 05:22:26 +00:00
Casey
33b59118ef Start With Backup Implant setting 2023-03-08 19:09:49 +00:00
Heroman3003
62d770eafe Character Setup Lore Option Tweaks 2023-03-06 13:29:45 -05:00
Rykka Stormheart
da9c38b689 Merge remote-tracking branch 'upstream/master' into shep-dev-barky-noises 2023-03-04 16:01:30 -08:00
Rykka Stormheart
2982a7ca85 Adds Sleep Music to Surgery/Cryo/Sleeper
Plays quiet music when you have;
- An anesthetic mask on your face.
- Been put into a cryopod
- Been put into a sleeper

TBD: Maybe make sleeping do it, but iirc even dying does sleep.

There is a pref toggle for these under Preferences: "Sleeping Music"

Example [here](https://streamable.com/pls63y) of surgery being done. Volume is higher than normal, was adjusted down to 40%.
2023-03-04 15:56:56 -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
Razgriz
e73ae22a39 Merge pull request #5821 from Sharkmare/Talk-voice-Global
Globalize the Voice list and fetching
2023-03-04 16:28:52 -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
Seris02
7e95080868 missed that 2023-03-04 15:17:28 +08:00
Seris02
af1152c21a runtime fixes for tf spawn 2023-03-04 15:15:45 +08:00
Kassc
edb59bd4a3 Merge pull request #5812 from TheGreatKitsune/item-tf-spawn
Item TF spawnpoints
2023-03-03 21:18:08 -05: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