Commit Graph

296 Commits

Author SHA1 Message Date
Sharkmare
c28d87a1e7 Damage and Health theft 2023-03-08 22:46:15 +01:00
Sharkmare
bc516a407e fix filename and restructure for mapping ease 2023-03-08 22:36:29 +01:00
Sharkmare
073af35176 Fleshtaker mimicry mob
A simple concept of a mob taking over other mindless mobs to strengthen and protect itself

Work in progress,
2023-03-08 15:10:07 +01: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
2afa319f09 Merge pull request #5842 from Rykka-Stormheart/shep-dev-ear-ringing
Adds Deafened Feedback, enhances looping sounds further
2023-03-04 16:37:29 -07:00
Razgriz
3f5f46ba0f Merge pull request #5831 from FluffMedic/Mouse
Mouse Army Works
2023-03-04 16:32:03 -07:00
Fluff
190e4a0cb6 Balancing mobs slightly
Mostly made the tesharis more zoomy with their guns.
2023-03-03 12:05:21 -05:00
Rykka Stormheart
640a73cb06 Adds Deafened Feedback, enhances looping sounds further
Adds deafened ear ring that plays any time you're deafened, and fades back in once you can hear again.

Example of deafened feedback [here](https://streamable.com/8s8vlu). 

Worry not, if you're deafened via mutation or other, you'll simply go deaf, and only hear the fade-in once you regain hearing. 

It will also only play **once** when you are deafened. Further deafening effects while you are already deaf will not force you to hear it again.
2023-03-03 04:08:08 -08:00
Fluff
9bfb9f008a Fixing things
-Removed the EMP grenade thing
-Made is so the pummler and hound are a bit bigger then their sprites
-Added names.
2023-03-02 08:42:14 -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
Fluff
b2387a7dbf Swapping two sprites
Opps, shotgun wuff and shotgun tesh sprites are wrong
2023-03-01 23:33:13 -05:00
Fluff
26b7ca68a5 Eclipse mobs
Adding a new little group of mobs.
2023-03-01 23:18:10 -05:00
Fluff
d6a20ce664 Mouse Army Works
The icons for the mouse army tiny mice is some weird jank code that clearly doesn't work.
I just added the normal way of the sprites working.
2023-03-01 23:13:08 -05:00
Seris02
f95ae5a000 why do I do this to myself 2023-03-01 10:52:27 +08:00
Seris02
fba91c6afd stops proteans from selecting promethean 2023-03-01 09:17:04 +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
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
Fluff
90eccca7a2 More Xenomoprhs from Mexcio
A new variety of Xenomoprhs.
All of them made by Kassc.
They had a map of var edited xenomorphs.
I officially coded them in.
2023-02-24 19:24:04 -05:00
Seris02
9ec91ba026 moar stuff - synthnaga tail, four ears ears, updated digi guilmon markings 2023-02-23 11:44:43 +08:00
BlackMajor
382d8694f0 Merge pull request #5738 from Seris02/digiunbad
makes tails/wings show underneath bodyparts (makes more difference on digitigrades)
2023-02-23 14:41:50 +13:00
BlackMajor
2cf320e897 Merge branch 'master' into protean-rework 2023-02-23 14:31:09 +13:00
BlackMajor
a6491b8d6f Merge pull request #5753 from Seris02/swoopiewhy
stops swoopies attacking prommies and proteans
2023-02-18 16:26:50 +13:00
Seris02
c62e242e8e stops swoopies attacking prommies and proteans 2023-02-18 10:33:30 +08:00
Razgriz
07e912186d Merge pull request #5740 from FluffMedic/Gygaxes
Gygaxes Mob Nerf
2023-02-17 03:31:28 -07:00
Fluff
2881c71330 Fixes AADG
Double checked the speed, should be fine on normal gygaxes, won't outspeed teshies anymore but are still zoomy. But also gave the AADG meme speed because poor thing needs to keep it.
2023-02-16 18:32:56 -05:00
Fluff
857d1ab5c7 Gygaxes Mob Nerf
Tried to nerf the gygax mob's insane freaking speed. They're way too fast, and need curbing. Well, so do player mechas but that is an issue for a more skilled coder or when I have less active projects and more frustration on their stronkness.
2023-02-16 14:03:19 -05:00
Bib Bob
3c8c3982a8 Makes robust guts pickable by non-customs 2023-02-16 09:21:14 -06:00
Seris02
2954f6d674 update modular_chomp human/update_icons to be correct 2023-02-16 14:27:21 +08:00
Nadyr
c2308a7693 Merge pull request #4811 from Kazzc/DesertTiles
Desert tiles, walls, cliffs, plants, mobs.
2023-02-13 18:43:45 -05:00
Seris02
9490a5b69c puts dsi prosthetics back to normal in favor of dsi - adaptive skipping icon 2023-02-11 11:48:26 +08:00
Seris02
ef41901455 makes the vanity copy copy size changing traits as well 2023-02-11 11:07:12 +08:00
Seris02
260488f924 protean - few runtime/bug fixes, tesh suit sprites, digi suit sprites 2023-02-09 16:45:26 +08:00
Seris02
369e1bdcc5 adds the ability to turn into other people for proteans, and gives protean blobs their robot emotes back 2023-02-09 11:53:23 +08:00
Fluff
858e6b6adc Hivebot and Home Update
Soo I love the hivebots but oh dear they're so freaking easy. They are so weak, and die so easily. The radiation and Ion bots feel like the biggest threat.

So added a new purple branch called Precursor.
All have a nice shield, and hopefully pack someform off high offense.
Machine Gun - Should be a stream of bullets. 
Laser - Fires a precursor beam.
Lobber - Lobs a special 'precursor' version of the energy artillery shot.

Also turned the tank class of thinks into blue, similar to ablative/durasteel although a darker color.

Might add loot tables to the precusor ones when I figure that out. And might have spelled precursor wrong somewhere.

And with the new hivebots, just plopped them into the derelict engine.
2023-02-08 19:21:57 -05:00
Seris02
ce0eeb66b5 direction persistence and resize runtime fix + no resize animation 2023-02-05 13:26:49 +08:00
Seris02
e37832dbf1 gives protean blobs their emotes back 2023-02-05 11:52:33 +08:00
Seris02
103a9db0dc protean and prommie blobs not having real_name set 2023-02-05 11:02:12 +08:00
Seris02
7621731489 stops protean rigs getting deleted by explosions 2023-02-05 10:59:55 +08:00
Seris02
3cf60e9c19 vanity copy to 2023-02-05 10:58:11 +08:00
BlackMajor
c72ab8fffe Merge branch 'master' into protean-rework 2023-02-05 13:56:08 +13:00
Nadyr
8ec3e3c9c1 Merge pull request #5624 from TheGreatKitsune/fatsergal-fixes
Fixes for sprites and cleaning up code things
2023-02-02 20:34:52 -05:00
Nadyr
d829d8c8d7 Merge pull request #5611 from Seris02/simplemobchardir
simple mob species for certain simple mobs in character directory
2023-02-02 20:24:06 -05:00
TheGreatKitsune
3c861646bc Fixes for sprites and cleaning up code things 2023-01-30 10:37:39 -06:00
BlackMajor
d05b31a73c Unga bunga me fix code before sleep 2023-01-30 00:28:27 +13:00
BlackMajor
828a5b135f Merge branch 'master' into protean-rework 2023-01-30 00:21:50 +13:00
BlackMajor
6e218f4b6f more fixes 2023-01-28 22:11:25 +13:00
Nadyr
39b5432bbc Merge pull request #5599 from Seris02/teshshapedrage
allows teshari shaped things to be picked always picked up along with teshari
2023-01-27 10:33:41 -05:00