Commit Graph

471 Commits

Author SHA1 Message Date
Razgriz
e8b8e80e92 MW4 BB sound filesfor medichines
Bitching betty sounds from MW4 for synth medichines
2020-10-08 14:16:37 -07:00
Razgriz
63d6e1145b HEV sound files 2020-10-08 13:35:36 -07:00
Cadyn
07775449d7 Fixing conflicts 2020-10-05 18:10:53 -07:00
Razgriz
54e632ebf2 September 2020 Upstream Merge 2020-09-25 23:07:08 -07:00
Razgriz
b74a3b62e4 Merge branch 'master' of https://github.com/CHOMPStation2/CHOMPStation2 into September2020UpstreamPull
Pull from Master
2020-09-22 00:59:03 -07:00
Cerebulon
95ff8c2080 Tweaks to pickup/equip sounds. 2020-09-20 06:57:07 -04:00
BlackMajor
70645b91dd he screm 2020-09-16 14:26:44 +12:00
izac112
4b051c23fc Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-09-13 15:05:53 +02:00
Razgriz
f40da6b2fb Merge branch 'master' of https://github.com/CHOMPStation2/CHOMPStation2 into metroid
Master pull
2020-09-11 13:31:45 -07:00
Darlantan
c6862558c8 Commit for new sound and icons 2020-09-05 07:15:05 -04:00
Darlantan
1b220d1cd4 Revert "Check-out commit"
This reverts commit dc957fe40b.
2020-09-02 03:16:25 -04:00
Darlantan
dc957fe40b Check-out commit
Committing now so I can work on other things
2020-09-02 03:10:18 -04:00
Atermonera
87221b5e66 Adds hailer gas (face) masks. 2020-08-31 18:10:57 -04:00
Razgriz
21fa15c4c0 Metroids WIP
Some base files.
2020-08-31 00:38:54 -07:00
Rykka
9841414da6 Adds Toggles to Revert to Legacy Door Sounds and Enable Department Doors
Self-explanatory.

Adds toggle to go back to the old-school SS13 legacy airlock sounds, including the glass windoor airlock sounds, and a toggle to disable the per-department door sounds, which some found jarring/unrealistic.

If Per-Department sounds are disabled, the department doors will use hall1o/c for open/close respectively, following maintainer-requested behavior for these doors.

This also relocates the following sounds to be inside machines/door for more consistency:
- airlock.ogg
- airlockclose.ogg
- airlockforced.ogg
- airlock_creaking.ogg
- boltsup.ogg
- boltsdown.ogg
- blastdoorclose.ogg
- blastdooropen.ogg
- windowdoor.ogg
2020-08-29 03:04:34 -04:00
Rykka
d2fb9a7691 Rebase onto Master for Volume Control Panel, Squash Commits 2020-08-27 19:47:38 -04:00
izac112
48af4c881c Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-08-22 20:07:45 +02:00
Kassc
d6c106392d Merge pull request #499 from LunarFleet/Lun-Lego
Kassc's death lego
2020-08-22 02:01:24 -04:00
Atermonera
3c67a19a20 Ports borg petting from CHOMPStation 2020-08-21 23:32:15 -04:00
Novacat
a6efe9acbb Merge pull request #8756 from VOREStation/upstream-merge-7449
[MIRROR] Flavour Enhancement: Vending
2020-08-21 13:32:37 -04:00
Novacat
d63f0b2c3e Merge pull request #8665 from Rykka-Stormheart/shep-dev-mech-combat
Adds Mech Toy Battles!
2020-08-21 01:14:42 -04:00
Atermonera
1e9e8c2c60 Flavour Enhancement: Vending 2020-08-20 21:25:31 -04:00
Atermonera
a826af32d1 Merge pull request #7477 from listerla/servosound
Replaces bolt sounds for rigs with servo sounds
2020-08-17 18:25:13 -04:00
LunarFleet
c33314eadf Kassc's death lego 2020-08-17 10:05:47 -04:00
izac112
5c02633707 Merge branch 'izac' of https://github.com/Yawn-Wider/YWPolarisVore; branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-08-13 20:01:22 +02:00
Novacat
29ab96e84c Merge pull request #8681 from VOREStation/upstream-merge-7461
[MIRROR] Ports Bastion of Hestia rig sounds
2020-08-12 15:05:21 -04:00
Atermonera
d61cf8be05 Merge pull request #7461 from listerla/rigsounds
Ports Bastion of Hestia rig sounds
2020-08-12 14:46:17 -04:00
Atermonera
d8f64ec8b2 Merge pull request #7448 from Rykka-Stormheart/shep-dev-shower-volume-reduction
Shower Audio Reduction - Replaces audio files with quieter versions of them!
2020-08-12 14:25:40 -04:00
Rykka
a5fc9d81ce Adds Mech Toy Battles!
Port of https://github.com/tgstation/tgstation/pull/51817

Adds a mech vs mech combat system for the toy mechs earned from arcades and found around the station. You can initiate combat with yourself by hitting a toy mech with another toy mech, or fight another player if you attack a player holding a mech with a mech.

Each mech has its own health stat and special ability that they'll use in combat against each other. How exciting!

Also slightly refactors toy locations and changes toy mechs from being JUST prizes to their own proper toy subtype!
2020-08-12 04:31:00 -04:00
Rykka
c748d7dcf8 Adds Hyena Cackle Emote - Standalone
This allows for merging this separately/earlier than #8658.

Adds a hyena cackle emote for all our yeen friends out there.

YEENS ARE NOT ALL STIMKY. :U
2020-08-11 08:25:52 -04:00
Rykka
4b4eaa428f Adds Hyena Cackle Emote - Standalone
This allows for merging this separately/earlier than #8658.

Adds a hyena cackle emote for all our yeen friends out there.

YEENS ARE NOT ALL STIMKY. :U
2020-08-11 08:25:09 -04:00
Razgriz
8986897454 Fix Hz rate for arrivals4.ogg
Was 22k, now 44k.
2020-08-10 17:33:51 -07:00
CHOMPStation2
be68a5d71a New Ambient Sounds 2020-08-10 03:26:43 -07:00
Razgriz
b2eb1b4b2f New Ambient Sounds 2020-08-10 03:06:57 -07:00
Razgriz
f00fdebbb9 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into August2020UpstreamPull
August2020UpstreamPull
2020-08-09 02:58:18 -07:00
Razgriz
f1e2ff6cd1 Merge pull request #438 from LunarFleet/Lun-Demons
Kassc's demon changes
2020-08-04 18:15:29 -07:00
izac112
50834e4a7b Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-08-02 23:52:01 +02:00
Novacat
d14549b362 Merge pull request #8566 from VOREStation/upstream-merge-7387
[MIRROR] Teshari sneeze fix
2020-08-02 02:06:04 -04:00
Atermonera
e144bd2628 Merge pull request #7387 from listerla/teshsneeze
Teshari sneeze fix
2020-08-02 00:06:45 -04:00
Atermonera
3f3bf073e0 Merge pull request #7366 from Rykka-Stormheart/shep-dev-soundstuff
Ambiance and Sound Updates
2020-08-01 23:47:22 -04:00
LunarFleet
725e5d1ea6 Forgot the sounds 2020-07-29 17:50:37 -04:00
izac112
601a155b30 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-07-25 15:22:42 +02:00
Rykka
21f64e40fd Merge branch 'master' into shep-dev-aurora-cooking 2020-07-22 23:25:41 -04:00
Razgriz
575b1f4f33 Merge branch 'master' into shep-dev-aurora-cooking-port 2020-07-22 18:51:09 -07:00
Novacat
8b7d087259 Merge pull request #8437 from Tenryumi/dragon-stuff
Adds dragon-y language and "*gao" emote
2020-07-21 18:12:43 -04:00
Novacat
709d926e33 Merge pull request #8422 from ShadowLarkens/tgui
TGUI-V4 w/ Camera Console
2020-07-21 18:09:40 -04:00
Rykka
5e8f30edea Port Medibot Tipping!
Ethics memes aside, the idea off people being caught off guard at their guilt for causing harm to inanimate objects is really funny to me, and feels extra relevant to SS13. Considering people already regularly get in fights and maim each other over harming station pets, I picture this being a great source of arguments and fights ICly over what torturing a cute lil' medbot says about you.

tl;dr this PR lets you tip over medbots which prevents them from moving or healing, and they'll slowly get more and more distressed and desperate asking for help from people around them. After a few minutes, if no one helps right them, they'll manage to right themselves up and snitch on whoever tipped them over to medical so the psychologist can keep an eye on them.
2020-07-20 01:56:12 -04:00
Amy
51d2c98e33 Adds dragon language, gao emote w/ sound 2020-07-20 00:49:05 -05:00
Rykka
e868d61994 Port Medibot Tipping!
Ethics memes aside, the idea off people being caught off guard at their guilt for causing harm to inanimate objects is really funny to me, and feels extra relevant to SS13. Considering people already regularly get in fights and maim each other over harming station pets, I picture this being a great source of arguments and fights ICly over what torturing a cute lil' medbot says about you.

tl;dr this PR lets you tip over medbots which prevents them from moving or healing, and they'll slowly get more and more distressed and desperate asking for help from people around them. After a few minutes, if no one helps right them, they'll manage to right themselves up and snitch on whoever tipped them over to medical so the psychologist can keep an eye on them.
2020-07-20 01:44:24 -04:00
Rykka
de2c80c628 Commit 4
Bugfixing for ChompStation errors will now happen
2020-07-19 16:29:26 -04:00