cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
73,750 Commits 6 Branches 0 Tags
d7f7b0fec1c3fba28b875375b0b60bb22443ff9e
Commit Graph

73750 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
CHOMPStation2
d7f7b0fec1 [MIRROR] Projectiles properly set starting var. 2023-03-09 05:16:57 +00:00
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
BlackMajor
ba25f3c417 Merge pull request #5861 from Seris02/belleh 
fixes a few belly bugs and improves belly color selection
 2023-03-08 17:10:16 +13: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
Darlantan
0b16aa5d3f bundle that makes you say yes 2023-03-06 13:36:12 -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
Nadyr
09992d2953 powder that makes you say yes 2023-03-06 13:20:27 -05:00
Nadyr
bd1978029b Merge pull request #5854 from CHOMPStation2/upstream-merge-14613 
[MIRROR] Adds new wing-slot marking, adjusts harpywing ones slightly
 2023-03-06 13:18:42 -05:00
Darlantan
2c1652bfe3 bundle that makes you say yes 2023-03-06 13:08:48 -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
CHOMPStation2
5fbf0a1f79 Adds new wing-slot marking, adjusts harpywing ones slightly 2023-03-05 21:36:30 +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
Razgriz
bcd24d365d Merge pull request #5852 from Sharkmare/patch-9 
Make water safe to enter in walk for aquatics
 2023-03-05 12:17:22 -07:00
Razgriz
d86f205862 Merge pull request #5853 from Seris02/linterfixc 
fix linters
 2023-03-05 12:16:41 -07:00
Seris02
73a79c68f7 fix linters 2023-03-06 00:58:14 +08: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
75dc3b1f62 Merge pull request #5849 from Rykka-Stormheart/shep-dev-sensors-fix-live 
Fixes Sensors for Skyland
 2023-03-04 16:38:37 -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
f7acd0bd6f Merge pull request #5845 from Kazzc/SuperPoseFixes 
Various Survival Pod Fixes
 2023-03-04 16:38:12 -07:00
Razgriz
1e4c3c729f Merge pull request #5844 from tacoguy7765093/VR-commms 
The VR Realm Now has T-Comms and Camera Drones
 2023-03-04 16:38:05 -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
2afc98a27b Merge pull request #5841 from Sharkmare/La-Creature 
Space Dragon, SMPSpider
 2023-03-04 16:36:39 -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
3f5f46ba0f Merge pull request #5831 from FluffMedic/Mouse 
Mouse Army Works
 2023-03-04 16:32:03 -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
3bbd048355 Merge pull request #5806 from FluffMedic/Mob 
Precursor Rigsuit updates
 2023-03-04 16:27:13 -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