cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 19:22:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
79,149 Commits 9 Branches 0 Tags
f7e9f8d12bddd3183ee87a4e02ff9c5935b51a5c
Commit Graph

2818 Commits

Author SHA1 Message Date
Casey
c0093930a5 Merge pull request #14857 from BonniePandora/CustomItem-NameChange 
Small custom-item changes
 2023-05-15 00:18:21 +00:00
Verkister
1bebca2c03 Fixes char setup tail layering. 
Guess we aint goin a bit elephant style for much longer.
 2023-05-02 16:53:01 +03: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
61453b8e93 powder that makes you say yes 2023-04-16 00:15:51 -04:00
Heroman3003
0d5f21d733 Preferred Language + Autohiss Default Options 2023-04-14 05:32:03 +00: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
1a68f73406 Merge pull request #5915 from CHOMPStation2/upstream-merge-14670 
[MIRROR] Relaxes Sanitization
 2023-03-17 02:30:12 -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
Heroman3003
8ab9a847d0 cleans up so many to_chats so they use vchat filters, unsorted chat filter for everything else 2023-03-10 06:51:22 +00: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
Nadyr
8e87297f90 Merge pull request #5883 from CHOMPStation2/upstream-merge-14583 
[MIRROR] more fixed admin hrefs
 2023-03-09 21:23:50 -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
Heroman3003
4fff3b4226 Merge pull request #14583 from Seris02/adminjumplink 
more fixed admin hrefs
 2023-03-09 05:08:26 +00:00
Casey
33b59118ef Start With Backup Implant setting 2023-03-08 19:09:49 +00:00
Nadyr
abef271360 powder that makes you say yes 2023-03-06 13:29:45 -05: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
Razgriz
d47863601e Merge pull request #5815 from Rykka-Stormheart/shep-dev-staff-login-notice 
Admin QOL Logs
 2023-03-04 16:28:27 -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