cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
73,821 Commits 5 Branches 0 Tags
97701e8b3f85a01744616d2541d08a8a22decd7a
Commit Graph

1710 Commits

Author SHA1 Message Date
TheGreatKitsune
97701e8b3f Adds loadout capture crystals! 2023-03-13 16:58:03 -05: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
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
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
TheGreatKitsune
1d36a4215d Item TF spawnpoints 2023-02-26 15:43:47 -06:00
Casey
3c0afc385c Enables Testing Character Voices in Setup 2023-02-26 18:54:32 +00:00
Casey
3c878714b8 Allows speech bubbles to be selected in char setup and saved 2023-02-26 18:10:11 +00:00
Rykka Stormheart
e26e3e821d Enables Testing Character Voices in Setup 
As title;
This function was WIP, @blackmajor didn't have time to finish it.
I went ahead and finished this up, and realized it was worth PR'ing separately for speedmerge, because this is MASSIVELY convenient.

TL;DR:
You can hit "Test Character Voice" in setup, to play a preview of what your voice will sound like with the selected type and frequency.

See demonstration here: https://streamable.com/m6u9vc
 2023-02-26 03:52:24 -08:00
Heroman3003
d13fc550dc adds more drake plushies, and changes scidrake lights to match sci colors 2023-02-26 09:46:20 +00:00
Razgriz
e966a01446 Merge pull request #5789 from CHOMPStation2/upstream-merge-14393 
[MIRROR] Makes cooldown between pain messages a pre-set global preference
 2023-02-26 01:06:29 -07:00
Casey
bb4b1835e7 Merge pull request #14561 from peeesh/HES-LITERALLY-ME 
adds the bladerunner coat to loadout
 2023-02-25 19:32:38 +00:00
Heroman3003
ebe81811db Merge pull request #14393 from Runa-Dacino/pain-frequency 
Makes cooldown between pain messages a pre-set global preference
 2023-02-25 18:33:49 +00:00
Razgriz
26da7eca95 Merge pull request #5748 from CHOMPStation2/upstream-merge-14493 
[MIRROR] Voxxy clothing
 2023-02-20 16:32:53 -07:00
Razgriz
c0d2768edb Merge pull request #5758 from CHOMPStation2/upstream-merge-14505 
[MIRROR] Even more sprites including decent hoodies
 2023-02-20 16:32:45 -07:00
Heroman3003
be56ab7289 Even more sprites including decent hoodies 2023-02-18 19:57:09 +00:00
Heroman3003
7e8b8bf3f2 Merge pull request #14506 from Seris02/nofreenifs 
no free nifs from switching species from protean
 2023-02-18 19:10:45 +00:00
Heroman3003
223af2747b Voxxy clothing 2023-02-17 18:51:12 +00:00
Rykka Stormheart
c4924ec8f9 Adds Alarm Effects, Makes Air alarm have decompress alarm 2023-02-13 01:06:29 -08:00
Razgriz
cd9f69570b Merge pull request #5702 from CHOMPStation2/upstream-merge-14472 
[MIRROR] adds trait preferences and removes a bug
 2023-02-12 19:12:11 -07:00
Razgriz
31cfabd3c6 Merge pull request #5700 from CHOMPStation2/upstream-merge-14456 
[MIRROR] Implements periodic tips for (new) players!
 2023-02-12 19:04:32 -07:00
Razgriz
a5037f3180 Revert "[MIRROR] Runtime fixes" 2023-02-12 19:03:56 -07:00
Razgriz
cd05f4c7e4 Merge pull request #5704 from CHOMPStation2/upstream-merge-14476 
[MIRROR] Runtime fixes
 2023-02-12 19:01:40 -07:00
Razgriz
ec57252f19 Merge pull request #5703 from CHOMPStation2/upstream-merge-14477 
[MIRROR] fix default proteans being technically organic shift start
 2023-02-12 19:01:04 -07:00
Razgriz
6b79bc97a7 Merge pull request #5697 from CHOMPStation2/upstream-merge-14470 
[MIRROR] Cloaks, undies, the Antediluvian, and some other bits
 2023-02-12 18:59:42 -07:00
Razgriz
9229e66b90 powder that makes you say yes 2023-02-12 18:56:11 -07:00
Razgriz
6d51b51abb Merge pull request #5695 from Sharkmare/patch-1 
Reroute Teshwraps to just use Footwraps
 2023-02-12 18:22:31 -07:00
Razgriz
4a52255262 Merge pull request #5689 from Rykka-Stormheart/shep-dev-temp-message-custom-fix 
Fixes Custom Cold messages being uneditable/editing the wrong list
 2023-02-12 18:16:05 -07:00
Razgriz
0b1059963b comments that make you say yes 2023-02-12 17:59:01 -07:00
Razgriz
71cc3901a1 Merge pull request #5684 from Echopsychotic/Clothing 
witch hat and cyborg mask added
 2023-02-12 17:55:42 -07:00
Casey
2891dc3ea7 Merge pull request #14476 from Heroman3003/runtime-17 
Runtime fixes
 2023-02-12 18:21:37 +00:00
Casey
c34feccac3 Merge pull request #14477 from Seris02/proteandefaultfix 
fix default proteans being technically organic shift start
 2023-02-12 18:21:32 +00:00
Casey
ffd8251f24 adds trait preferences and removes a bug 2023-02-12 18:20:26 +00:00
Casey
f841a10f4c Implements periodic tips for (new) players! 2023-02-12 18:19:13 +00:00
Heroman3003
358e8e9fa2 Cloaks, undies, the Antediluvian, and some other bits 2023-02-11 19:10:39 +00:00
Sharkmare
34dfd9b6f5 Reroute Teshwraps to just use Footwraps 
This mainly only matters for shapeshifters who thought tesh have to use this.

Yes, this is a self-callout.
 2023-02-11 06:37:28 +01:00
Fire Hazard
f0b0736bbd missing text 2023-02-09 07:42:18 -06:00
Rykka Stormheart
cc135c3d33 Fixes Custom Cold messages being uneditable/editing the wrong list 
As described. Prior to this, clicking this would bring up the custom_heat list, and fail to set messages correctly.

This corrects that.
 2023-02-08 08:01:31 -08:00