cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 03:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
74,052 Commits 10 Branches 0 Tags
cbac08888924ac8aca6a4f5dd28c9fcd3cf7cda9
Commit Graph

2711 Commits

Author SHA1 Message Date
Nadyr
b8f6168330 Merge pull request #5944 from CHOMPStation2/upstream-merge-14682 
[MIRROR] [MIRROR] Finally allows RPD to be used.
 2023-03-17 03:38:13 -04:00
Nadyr
f64b864970 Merge pull request #5921 from CHOMPStation2/upstream-merge-14667 
[MIRROR] [MIRROR] Fixes a looping sound bug, adds additional options
 2023-03-17 02:56:07 -04:00
Nadyr
d0a72ad572 powder that makes you say yes 2023-03-17 02:39:24 -04:00
Heroman3003
400fa9d46f Merge pull request #14682 from VOREStation/upstream-merge-9028 
[MIRROR] Finally allows RPD to be used.
 2023-03-14 21:54:38 +00:00
Heroman3003
6cd9f2bb83 [MIRROR] Fixes a looping sound bug, adds additional options 2023-03-13 05:27:12 +00:00
Heroman3003
025fac4bf9 [MIRROR] /tg/ era language pass 2023-03-13 05:23:57 +00:00
Nadyr
3b73100ae8 Merge pull request #5878 from CHOMPStation2/upstream-merge-14629 
[MIRROR] Adds 'vore' objective
 2023-03-09 21:19:43 -05:00
Nadyr
98feff2977 powder that makes you say yes 2023-03-09 20:59:23 -05:00
Nadyr
151fe34ba6 Merge pull request #5860 from Seris02/sockdigi 
digitigrade socks
 2023-03-09 20:36:17 -05:00
Casey
f22503b5a2 Adds 'vore' objective 2023-03-08 21:47:38 +00:00
Seris02
4d2fd463ae digitigrade socks 2023-03-07 10:08:38 +08:00
Heroman3003
62d770eafe Character Setup Lore Option Tweaks 2023-03-06 13:29:45 -05:00
Heroman3003
ce5ef389b3 Custom Species name in Records 2023-03-06 12:59:00 -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
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
Nadyr
34208c191b Merge pull request #5785 from CHOMPStation2/upstream-merge-14547 
[MIRROR] Ghost pod for debris POI moved into its own separate PR
 2023-02-27 02:08:18 -05:00
Heroman3003
916526893a Merge pull request #14547 from Runa-Dacino/SurvivorPod 
Ghost pod for debris POI moved into its own separate PR
 2023-02-25 03:04:16 +00:00
Heroman3003
993acbf556 Merge pull request #14534 from Heroman3003/art-paint-stuff 
Adjusts artistic crate orders
 2023-02-25 03:01:42 +00:00
Heroman3003
be56ab7289 Even more sprites including decent hoodies 2023-02-18 19:57:09 +00:00
Razgriz
6126a0ec69 Merge branch 'master' into shep-dev-looping-alarms 2023-02-14 15:17:33 -07:00
Rykka Stormheart
c8f8f935e3 Adds Delam warnings for SM/Engineering 2023-02-14 11:17:20 -08:00
Rykka Stormheart
f74c221b0f Makes Fire Alarms loop, replaces the old, jarring air alarm sound 
Newer sound is easier on the ears and loops better. Yes, yes, we use the airalarm.ogg as actual fire alarms in most places, but it is so loud it's usually painful.
 2023-02-13 04:52:06 -08:00
Rykka Stormheart
c4924ec8f9 Adds Alarm Effects, Makes Air alarm have decompress alarm 2023-02-13 01:06:29 -08:00
Seris02
cc01b3d297 newline + modular comment 2023-02-13 16:56:25 +08:00
Seris02
238ad9eaa2 fixes character directory 2023-02-13 16:54:23 +08:00
Razgriz
5f59585030 Merge pull request #5591 from CHOMPStation2/upstream-merge-14359 
[MIRROR] adds the ability to use mind-based character directories
 2023-02-12 20:08:48 -07:00
Razgriz
ab10846f03 Merge branch 'master' into upstream-merge-14359 2023-02-12 17:49:31 -07:00
Razgriz
d684ef18bc powder that makes you say yes 2023-02-12 17:32:28 -07:00
Heroman3003
358e8e9fa2 Cloaks, undies, the Antediluvian, and some other bits 2023-02-11 19:10:39 +00:00
Nadyr
709a282b9c Merge pull request #5563 from CHOMPStation2/upstream-merge-14348 
[MIRROR] Adds new Undergarment selections
 2023-01-27 09:42:32 -05:00
Nadyr
05407f585a Merge pull request #5551 from CHOMPStation2/upstream-merge-14330 
[MIRROR] Uplink and Pouch Tweaks
 2023-01-27 09:27:06 -05:00
Nadyr
f08f632ed4 Merge pull request #5539 from CHOMPStation2/upstream-merge-14327 
[MIRROR] Makes all carpet types orderable and gives them tile icons
 2023-01-27 09:16:47 -05:00
Razgriz
6e4c340437 Merge branch 'master' into upstream-merge-14234 2023-01-24 17:23:08 -07:00
Razgriz
b7a52881ac no 2023-01-24 17:19:09 -07:00
Razgriz
47605086f1 no 2023-01-24 17:18:37 -07:00
Razgriz
87d276be68 no 2023-01-24 17:18:19 -07:00
Razgriz
a2454795f9 no 2023-01-24 17:16:00 -07:00
Razgriz
d70cc76a45 Spelling 2023-01-21 22:26:21 -07:00
Razgriz
f79f283ed4 spelling 2023-01-21 22:25:36 -07:00
Razgriz
9197e1b95d Merge branch 'master' into upstream-merge-14220 2023-01-21 22:24:10 -07:00
Razgriz
418643dce3 unfucc exploration 
please do not the department
 2023-01-21 22:21:39 -07:00
Heroman3003
bacd229d6c adds the ability to use mind-based character directories 2023-01-22 01:42:32 +00:00
Razgriz
656f63ef1e Change out cargo frontier phasers crates to standard phaseguns 2023-01-20 18:53:29 -07:00
Heroman3003
0d71022b2a Merge pull request #14348 from squib-bot/clothes 
Adds new Undergarment selections
 2023-01-19 03:20:53 +00:00
Heroman3003
08935eea03 Merge pull request #14330 from Novacat/nova-basicfixes 
Uplink and Pouch Tweaks
 2023-01-16 08:45:22 +00:00
Heroman3003
fa1f8bb5b4 Makes all carpet types orderable and gives them tile icons 2023-01-13 22:00:36 +00:00
Verkister
c253bf1137 Makes round vore stats little more honest 
Kind of silly to report 30 individual people getting eaten if a 3 person crew simply consisted of two preds playing belly tennis with a single preything :v
 2023-01-07 17:40:08 +02:00
Heroman3003
165d947e91 Fixes autolathe, material and smartfridge issues 2022-12-28 21:48:06 +00:00
Razgriz
729c5baf1c Merge pull request #5441 from Verkister/totallytubular 
Adds some funky fresh simplemob features and a big fat bird.
 2022-12-26 13:13:01 -07:00
Razgriz
14830c8729 Merge pull request #5443 from CHOMPStation2/upstream-merge-14235 
[MIRROR] Fixes critical inventory equipment bug
 2022-12-26 12:27:42 -07:00