cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-06-12 17:04:22 +01:00
Code Issues Packages Projects Releases Wiki Activity
55,446 Commits 9 Branches 26 Tags
8daaff8fe32097aaa27cbd8f8a1bb10b8ec48664
Commit Graph

1596 Commits

Author SHA1 Message Date
Amy 5d0d3bb38d Merge branch 'master' of https://github.com/VOREStation/VOREStation into nikki-fluff 2020-11-14 12:55:04 -06:00
Amy ae991c1fb2 Oh god it actually works yes but now it doesn't render in your icons WHY 2020-11-12 17:12:36 -06:00
ArgobargSoup 45d6a36fb0 Adds the entry for Felina's witch hat to fluff item loadout 2020-11-09 22:32:09 -08:00
Atermonera 9a596f0e45 Merge pull request #7751 from Greenjoe12345/clothesporting 
Ports some clothing from uristcode
 2020-11-07 15:32:07 -05:00
Verkister dbeaa0e183 Merge pull request #9241 from VOREStation/upstream-merge-7733 
[MIRROR] 5 new clothes & 1 headdress
 2020-10-18 16:20:47 +03:00
Schnayy 8f9edf0e57 5 new clothes & 1 headdress (#7733) 2020-10-17 06:15:54 -04:00
Rykka c39ee6c2f3 Updates File to match current Virgo-Erigone Lore at Dragor's Request 2020-10-07 16:17:59 -04:00
Rykka f8a3e91178 Adds Virgo-Erigone, Virgo 3b Colony and Virgo 4 NT Compound as home/citizenship options 2020-10-07 15:56:25 -04:00
Heroman 7d1828f2b4 Fixes = typo 2020-10-04 19:50:30 +10:00
Heroman bd8e240211 Standartizes gear_tweaks on _vr only items 2020-10-04 19:47:42 +10:00
Riley ec42a286d0 Clara's Vacuum Flask 
Accepted Fluff Request: https://forum.vore-station.net/viewtopic.php?f=26&t=1831

Load out cost is one, the same as a standard vacuum flask, no freebies here!
Big thanks to everyone who put up with my confused screaming, especially Heroman :)
 2020-09-29 18:01:07 -04:00
Heroman c9a019ee01 Adds Charles' Tophat 2020-09-28 04:54:23 +10:00
Novacat 65c677ba30 Merge pull request #9088 from ShadowLarkens/shadow_fluff 
Add Shadow Larkens laptop fluff item
 2020-09-26 21:16:21 -04:00
Atermonera 123a0fd115 Merge pull request #7685 from Greenjoe12345/teshstuff-and-eyepatch 
Teshari sprites and white eyepatch
 2020-09-26 16:58:44 -04:00
ShadowLarkens bf73137818 Add Shadow Larkens laptop fluff item 2020-09-20 03:35:28 -07:00
Novacat 549d875f53 Update preferences.dm 2020-09-05 12:16:09 -04: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
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
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
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
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
Novacat 34eb1ba0f7 Merge pull request #8679 from VOREStation/upstream-merge-7457 
[MIRROR] Adds second confirmation to character slot reset
 2020-08-12 15:04:47 -04:00
Atermonera 8ceeff6e81 Merge pull request #7457 from Cyantime/patch-4 
Adds second confirmation to character slot reset
 2020-08-12 14:41:33 -04:00
Greenjoe12345 ba3505fbd2 ports a whole lot of Teshari stuff from Arkstation (#7431) 2020-08-12 14:17:08 -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