cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 03:33:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
70,451 Commits 5 Branches 0 Tags
1b4cc6b555d310b51e59c24e382eb18e3d94a280
Commit Graph

1558 Commits

Author SHA1 Message Date
Razgriz
54e632ebf2 September 2020 Upstream Merge 2020-09-25 23:07:08 -07:00
ShadowLarkens
bf73137818 Add Shadow Larkens laptop fluff item 2020-09-20 03:35:28 -07:00
Izac Joof Forsgren
4e7b4df749 Merge branch 'master' into izac 2020-09-14 14:11:02 +02:00
izac112
5fbb0b16b9 Voreupdate 2020-09-13 15:06:19 +02:00
izac112
4b051c23fc Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-09-13 15:05:53 +02:00
Braiden
0ca81bcdc2 another letter 2020-09-10 03:29:12 -05:00
Braiden
5e1b471925 A gift for Jeanne and an upgrade for Strix 2020-09-09 19:43:50 -05:00
listerla
2b600cbe85 Changes default skin tone from 35 to 110 2020-09-05 11:09:18 -04:00
Atermonera
f612958f0c Merge pull request #7603 from Greenjoe12345/customloadout 
adds the ability to give loadout items a custom name/description
 2020-09-04 22:31:18 -04:00
Atermonera
2a3a5483b0 Merge pull request #7589 from listerla/toelessjackboots 
Adds toe-less jackboots to xenowear
 2020-08-31 23:37:18 -04:00
Novacat
1fcb6bf337 Merge pull request #8896 from Rykka-Stormheart/shep-dev-airlock-sound-prefs 
Adds Toggles to Revert to Legacy Door Sounds and Enable Department Doors
 2020-08-31 15:29:13 -04:00
Braiden
9415302551 again 2020-08-30 00:09:37 -05:00
Braiden
789f9afeed case sensetive and path fix 2020-08-30 00:09:06 -05:00
MrSign
f490bec8e2 adds toeless jackboots to loadout 2020-08-30 09:15:16 +10:00
MrSign
e0486dc479 Update loadout_shoes.dm 2020-08-30 09:00:50 +10:00
Braiden
eb40f1d483 adjustments and loadout addition 2020-08-29 16:31:04 -05:00
Rykka
9841414da6 Adds Toggles to Revert to Legacy Door Sounds and Enable Department Doors 
Self-explanatory.

Adds toggle to go back to the old-school SS13 legacy airlock sounds, including the glass windoor airlock sounds, and a toggle to disable the per-department door sounds, which some found jarring/unrealistic.

If Per-Department sounds are disabled, the department doors will use hall1o/c for open/close respectively, following maintainer-requested behavior for these doors.

This also relocates the following sounds to be inside machines/door for more consistency:
- airlock.ogg
- airlockclose.ogg
- airlockforced.ogg
- airlock_creaking.ogg
- boltsup.ogg
- boltsdown.ogg
- blastdoorclose.ogg
- blastdooropen.ogg
- windowdoor.ogg
 2020-08-29 03:04:34 -04:00
Novacat
81967dff01 Merge pull request #8887 from Heroman3003/xenobotany-remember 
Allows xenobotanist to actually take research's loadout items.
 2020-08-28 16:08:02 -04:00
Heroman
0a496c40ad Allows xenobotanist to actually take research's loadout items. 2020-08-29 05:31:01 +10:00
Heroman
ffdd8de3ce Site Management lookover for _vr stuff 2020-08-29 05:22:52 +10:00
Novacat
28c19ee066 Merge pull request #8868 from VOREStation/upstream-merge-7571 
[MIRROR] Colony Director -> Site Manager
 2020-08-28 13:17:58 -04:00
Novacat
bd4d0e78d4 Merge pull request #8833 from VOREStation/upstream-merge-7456 
[MIRROR] The great Aurora shoe heist
 2020-08-28 13:04:33 -04:00
Atermonera
21c1b12ef1 Colony Director -> Site Manager 2020-08-27 20:43:04 -04:00
Rykka
d2fb9a7691 Rebase onto Master for Volume Control Panel, Squash Commits 2020-08-27 19:47:38 -04:00
Rykka
82a8a9487b Hotfix for Ambience Freq Overwriting Ambience Chance on Save 
I accidentally had ambience_freq being written to ambience_chance, oops.
 2020-08-27 18:16:57 -04:00
Atermonera
ac824e6bfc The great Aurora shoe heist 2020-08-25 19:17:10 -04:00
Novacat
8301f7832d Merge pull request #8363 from KillianKirilenko/kk-misc 
AR Glasses Tweaks
 2020-08-23 13:14:37 -04:00
ShadowLarkens
6d4adf0764 Allows you to right click to lower job preference 2020-08-23 08:27:55 -04:00
izac112
48af4c881c Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-08-22 20:07:45 +02:00
Novacat
9e60838354 Update occupation.dm 2020-08-22 01:48:52 -04:00
Atermonera
4097a3c765 Allows you to right click to lower job preference 2020-08-22 01:41:52 -04:00
Novacat
84f16fecc2 Update 01_ui.dm 2020-08-21 23:32:07 -04:00
Atermonera
325afb857e Adds Repeating Ambience and Ambience Chance Preferences! 2020-08-21 23:30:59 -04:00
Novacat
6dd814c4d6 Merge pull request #8725 from dwinters99/flintlock_jacket 
Flintlock's jacket
 2020-08-21 17:12:31 -04:00
Novacat
ab88747252 Merge pull request #8755 from VOREStation/upstream-merge-7452 
[MIRROR] Gives FBP's a proc to change their monitor display without using a mask item.
 2020-08-21 13:32:51 -04:00
ShadowLarkens
7aaa40b62c Beginnings of a global volume control system 2020-08-21 04:42:47 -04:00
SplinterGP
cf491a56b7 Gives FBP's a proc to change their monitor display without using a mask item. 2020-08-20 21:25:20 -04:00
Novacat
4b44d10d34 Merge pull request #8366 from lbnesquik/Kot-Traits-Addition 
Bring back hemophilia. No, it's not a crime!
 2020-08-18 20:49:44 -04:00
Novacat
b52cf2b991 Merge branch 'master' into kk-misc 2020-08-18 09:27:06 -04:00
David Winters
d97dd42464 Flintlock's jacket 2020-08-17 06:11:58 -04:00
izac112
5c02633707 Merge branch 'izac' of https://github.com/Yawn-Wider/YWPolarisVore; branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-08-13 20:01:22 +02:00
Rykka
9690f85ec3 Adds Repeating Ambience and Ambience Chance Preferences! 
Adds a Random Ambience Frequency and Ambience Chance Setting under Global, underneath Client FPS. Images here:

![](https://i.imgur.com/381HPGH.png)
![](https://i.imgur.com/tWuff1W.png)
![](https://i.imgur.com/smEtoQ9.png)

Self-explanatory. Random-Ambience-Frequency controls how long before it checks if it can play ambience to you again. Setting it to 0 disables the random re-play of ambience.

Ambience Chance affects the % chance to play ambience to your client. It defaults to 35%, but can be set from 0 to 100 to disable it or always play every time you move into an area or have the Random Ambience check called.
 2020-08-13 01:40:23 -04:00
Greenjoe12345
ba3505fbd2 ports a whole lot of Teshari stuff from Arkstation (#7431) 2020-08-12 14:17:08 -04:00
izac112
81871a960e Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-08-10 21:50:42 +02:00
Razgriz
f00fdebbb9 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into August2020UpstreamPull 
August2020UpstreamPull
 2020-08-09 02:58:18 -07:00
Repede
74ee6f30f2 new white gearharness and redid yw xion sprites, added new gear harness to loadout for public use 2020-08-07 19:25:27 -04:00
Unknown
3aae040622 Removes Reagent Implants 
As per a decision by staff, all whitelists for Reagent Implants (both milk and egg) have been rescinded, these are to be replaced by a generic 'Feeder' neutral trait that is now available as per this PR.

If you have any questions, concerns, or comments about this PR, it would be far better (for both yourself and my sanity) to direct those to the Head Staff.
 2020-08-06 14:52:49 -04:00
Rykka
62e9c9c609 Earlyports Hair Gradients + Fixes for them! 
Earlyports: https://github.com/VOREStation/VOREStation/pull/8445 and https://github.com/VOREStation/VOREStation/pull/8353 and https://github.com/VOREStation/VOREStation/pull/8360

Example image:
![](https://user-images.githubusercontent.com/31356648/86080653-6b1edc00-ba61-11ea-9225-ddd021ff3bcc.png)
 2020-08-04 16:35:01 -04:00
izac112
50834e4a7b Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-08-02 23:52:01 +02:00
Novacat
8e79488e0c Update loadout_head.dm 2020-07-31 16:47:36 -04:00