Commit Graph

463 Commits

Author SHA1 Message Date
Sharkmare
cb088f5704 forgot to toggle the flesh_mimic flag 2023-03-10 01:22:26 +01:00
Sharkmare
bd21e73270 armor theft 2023-03-10 00:37:26 +01:00
Sharkmare
50ec79f9cc Fixing some Icon issuees 2023-03-10 00:29:40 +01:00
Sharkmare
99188fda93 update icon on revert and theft 2023-03-08 23:08:02 +01:00
Sharkmare
32394ec3c1 faction addition 2023-03-08 23:05:29 +01:00
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
f7acd0bd6f Merge pull request #5845 from Kazzc/SuperPoseFixes
Various Survival Pod Fixes
2023-03-04 16:38:12 -07: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
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
Kassc
828f56e928 Various Survival Pod Fixes
*Pirate Ship.
-Gun cabinet is now unlocked.
-All rooms can now be bolted.
*Broadcasting Pod.
-Fixed some typos.
-Added an entertainment channel.
-Added extra press gear.
*Hill Outpost
-Gun cabinet is now unlocked.
-Fixed the railings.
-Minor tile fixes
*MechFab
-Machines are now unlocked.
*Survival SecurityV2
-Fixed airless tiles.
-Stripped access requirements
2023-03-03 22:20:22 -05:00
Kassc
edb59bd4a3 Merge pull request #5812 from TheGreatKitsune/item-tf-spawn
Item TF spawnpoints
2023-03-03 21:18:08 -05: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
Sharkmare
476af4b90b Update preferences.dm 2023-03-03 01:08:48 +01: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
Sharkmare
68dd41276d Globalize the Voice list and fetching 2023-02-28 08:02:38 +01:00
Razgriz
84ab7c421d Merge pull request #4176 from BlackMajor/protean-rework
Protean rework part 2 (WIP)
2023-02-27 19:09:14 -07:00
TheGreatKitsune
1d36a4215d Item TF spawnpoints 2023-02-26 15:43:47 -06:00
Razgriz
34cffc0887 Merge pull request #5774 from Kazzc/MoreSuperPoseShelters
Additional SuperPose Maps and fixes.
2023-02-26 00:54:59 -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
Kassc
5403f039f7 Additional SuperPose Maps and fixes.
*LargeAlienShip-57x25
-Should spawn properly now.
-Food vending machines nerfed.
-Various item nerfs.
*TradingShip-40x22
-Food vending machines nerfed.
-Various item nerfs. (removed combat pod. Oof)
*Thanks for SlaysInDutch#4302 we now have more pods!
BrodcastingPod-11x9
DemonPoolV2-43x28
PirateShip-13x30
SurvivalHomeV2-9x9
SurvivalMechFab-9x9
SurvivalMethLab-9x10
SurvivalScience2-9x9
SurvivalSecurity2-9x9
HillOutpost-15x11
2023-02-23 17:25:49 -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
Nadyr
27658df697 Merge branch 'master' into OvermapDynamicPOIs 2023-02-21 20:03:22 -05:00
Darlantan
1048eaecd2 Adds comments for mappers 2023-02-21 19:47:54 -05:00
Razgriz
af042bb8b4 Merge pull request #5763 from CHOMPStation2/upstream-merge-14512
[MIRROR] Expands player tip lists with some new ones. Changes some weights
2023-02-20 16:49:25 -07:00
Razgriz
c3b2c5bd60 picking and choosing 2023-02-20 16:30:54 -07:00
Razgriz
d83309714e Merge pull request #5761 from Seris02/digishoeblood
digitigrade shoe blood overlay
2023-02-20 16:19:54 -07:00
Seris02
0e27736307 digitigrade shoe blood overlay 2023-02-19 18:02:33 +08:00
Fluff
863a499caf Precursor Rigsuit
Adds a precursor rigsuit called the Xenotech rig, assuming I did the non-code name changes correctly. It's rather resource intensive but overall worth the research and materials.
2023-02-18 13:11:37 -05: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
3d9a5c3dd9 Merge pull request #5742 from Seris02/resizefixer
fixes double stepping on laying people
2023-02-17 03:31:52 -07:00
Razgriz
07e912186d Merge pull request #5740 from FluffMedic/Gygaxes
Gygaxes Mob Nerf
2023-02-17 03:31:28 -07:00
Seris02
1fb785ccde fixes double stepping on laying people 2023-02-17 16:03:58 +08:00