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
73,749 Commits 9 Branches 0 Tags
a4a707937421c98178ee99c96a53a98dce25e882
Commit Graph

50432 Commits

Author SHA1 Message Date
Heroman3003
a4a7079374 Merge pull request #14610 from VOREStation/upstream-merge-8997 
[MIRROR] Projectiles properly set starting var.
 2023-03-09 05:16:57 +00:00
Seris02
4c629936f7 fixes a few belly bugs and improves belly color selection 2023-03-07 11:14:06 +08:00
Nadyr
71a2ad8d9c Merge pull request #5795 from CHOMPStation2/upstream-merge-14548 
[MIRROR] Character Setup Lore Option Tweaks
 2023-03-06 15:59:50 -05:00
Nadyr
9953234d79 Merge pull request #5855 from CHOMPStation2/upstream-merge-14614 
[MIRROR] Adds new unathi horns and new unathi head shape (as a marking)
 2023-03-06 13:44:45 -05: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
Nadyr
5254ae6eba Merge pull request #5781 from CHOMPStation2/upstream-merge-14546 
[MIRROR] Custom Species name in Records
 2023-03-06 13:26:34 -05:00
Heroman3003
ce5ef389b3 Custom Species name in Records 2023-03-06 12:59:00 -05:00
Casey
2d07a73b6d Adds new unathi horns and new unathi head shape (as a marking) 2023-03-05 21:37:37 +00:00
Casey
164b15584f Merge pull request #14613 from Heroman3003/wingmarks 
Adds new wing-slot marking, adjusts harpywing ones slightly
 2023-03-05 21:36:30 +00:00
Razgriz
2bbc9a7154 Merge pull request #5843 from Rykka-Stormheart/shep-dev-cozy-dozy 
Adds Sleep Music to Surgery/Cryo/Sleeper
 2023-03-05 12:18:04 -07:00
Razgriz
e13ddd428d Merge pull request #5851 from Rykka-Stormheart/shep-dev-save-boop 
Timeclock Beep
 2023-03-05 12:17:48 -07:00
Sharkmare
d5404dfe9b small typo trait not traits 2023-03-05 13:27:56 +01:00
Sharkmare
ca052b9883 Make water safe to enter in walk for aquatics 2023-03-05 13:16:58 +01:00
Rykka Stormheart
0d28b7ca94 Timeclock Beep 
Timeclocks will make a quiet beep when the card is inserted, and a similar one when the card is removed.

Demonstration [here](https://streamable.com/vk3j88).

Very lightweight. :3
 2023-03-04 18:30:48 -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
6cd9b042ed Merge pull request #5850 from Rykka-Stormheart/shep-dev-pirate-sensors-fix 
Sets sensors for clothes to 0 on Pirate/Russian/Clown by default
 2023-03-04 16:38:51 -07: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
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
60740389f2 Merge pull request #5839 from Cyrelius/Organs 
Buff Promethean limbs
 2023-03-04 16:35:48 -07:00
Razgriz
cf643fa176 Merge pull request #5837 from Sharkmare/size-circuit 
Resize circuit
 2023-03-04 16:35:31 -07:00
Razgriz
173a0bdaa8 Merge pull request #5836 from Sharkmare/patch-8 
Circuit iterator
 2023-03-04 16:35:22 -07:00
Razgriz
dcc24c4a43 Merge pull request #5835 from Sharkmare/patch-7 
Photavoltaic cell variants
 2023-03-04 16:33:25 -07:00
Razgriz
de113c2d6e Merge pull request #5834 from Sharkmare/patch-6 
Fixes #5667 VR Crash
 2023-03-04 16:32:40 -07:00
Razgriz
0e6951fc11 Merge pull request #5833 from Sharkmare/Borg-runtime-fix 
Fixes some runtimes on boot
 2023-03-04 16:32:20 -07:00
Razgriz
e34107526f Merge pull request #5830 from Sharkmare/patch-5 
Adds a blacklist that can modified in mapping for Designs
 2023-03-04 16:31:45 -07:00
Razgriz
29c81ffd00 Merge pull request #5828 from Sharkmare/patch-4 
Petrification for all
 2023-03-04 16:31:31 -07:00
Razgriz
27f5f830e0 Merge pull request #5827 from Seris02/circuitboxfix 
fixes circuit bags
 2023-03-04 16:31:21 -07:00
Razgriz
6cd076bbe7 Merge pull request #5826 from Sharkmare/patch-3 
Remove random damage on straight disposal pipes
 2023-03-04 16:31:01 -07:00
Razgriz
72807c469f Merge pull request #5825 from Sharkmare/Circuitry-Singlanguage 
Updates Translators to return a ref + Fixes Signlang Translator
 2023-03-04 16:30:47 -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
Razgriz
d1781cddc4 Merge pull request #5804 from BlackMajor/bellies 
Extra vore belly overlay options + tri colour + transparency + a fix
 2023-03-04 16:26:54 -07:00
Razgriz
af42aaa152 Merge pull request #5796 from Seris02/gunsprites2 
gun sprite chomp check
 2023-03-04 16:25:54 -07:00
Rykka Stormheart
40876d567d Sets sensors for clothes to 0 on Pirate/Russian/Clown by default 
This fixes mobs showing up on the sensors console despite not being station-affiliated.
 2023-03-04 12:23:20 -08: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
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
Cyrelius
11e40e16d8 Merge branch 'CHOMPStation2:master' into Organs 2023-03-02 22:45:46 -08:00
Cyrelius
1aa26e0d2d Update laser_vr.dm 
Revert changes that shouldn't be in this branch
 2023-03-02 22:45:24 -08:00
Cyrelius
a7cee8e0fa Makes Promethean limbs less easy to splatter 
We buffed bone breaks so they don't break as easily, and this is Promethean's version of it, but it got forgotten about.
 2023-03-02 22:42:22 -08:00
Sharkmare
927816c74f Update manipulation.dm 2023-03-02 19:34:19 +01:00
Sharkmare
a6a284f5c4 Resize circuit 
Resize circuit
 2023-03-02 16:56:32 +01:00
Sharkmare
aa678e63db forgot to rename it 2023-03-02 15:00:38 +01:00
Sharkmare
d54529899b Make iterator variable 2023-03-02 14:47:33 +01:00
Sharkmare
57d1f703be Fixing a fuckywucky i did 2023-03-02 14:32:16 +01:00
Sharkmare
82a513d8cf Circuit iterator ++ and -- 
Self modifiyng circuits that add or subtact 1 form their own internal memory.
This should simplify multiplexing
 2023-03-02 14:19:06 +01:00
Sharkmare
47de095e6a Photavoltaic cell variants 
Size variants for the photocell so we dont need to slap in multiples should make them a bit more clean to use
 2023-03-02 13:28:45 +01:00