Commit Graph
1815 Commits
Author SHA1 Message Date
NovacatandGitHub 89ed203456 Merge pull request #10635 from PastelPrinceDan/pandoracoat
Pandora029 fluff item
2021-06-20 13:39:20 -04:00
izac112 ffc6a2a369 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2021-06-18 17:01:47 +02:00
klaasjared bc497ca372 Adds EVERYTHING
I never did any other commits so here is all the code stuffs
2021-06-16 02:09:29 -04:00
PastelPrinceDan d9e3b432dd removes lines 2021-06-14 23:06:25 +01:00
izac112 784ecd5cd7 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2021-06-10 20:14:41 +02:00
klaasjared 313c3a7a2a Adds in fix and comments
Fixes loadout to include new explo duffle and adds organizational comments to `backpack_vr.dm` to make it look nice.
2021-06-09 06:36:57 -04:00
izac112 fe13bef10b Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2021-06-06 16:13:57 +02:00
Aronai Sieyes 0a41b57595 Fix mistake made in 04625a5 2021-06-06 01:05:55 -04:00
izac112 70e8ea4205 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2021-06-02 23:51:27 +02:00
Aronai Sieyes 04625a59ed Fixes #10321 2021-06-01 21:32:42 -04:00
izac112 cb882173a1 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2021-05-31 02:28:47 +02:00
Aronai Sieyes ea42ee2303 Port Runechat 2021-05-30 15:45:11 -04:00
izac112 b9034ce50b Merge branch 'izac' of https://github.com/Yawn-Wider/YWPolarisVore; branch 'release' of https://github.com/VOREStation/VOREStation into izac 2021-05-28 06:15:01 +02:00
NeertiandVirgoBot 767e655310 Linter Introduction + Cleanup 2021-05-25 23:19:34 -04:00
izac112 4fce6a03ac Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2021-05-23 18:26:00 +02:00
Unknown 21d5da0f1b Manual port Polaris Fixes
Ports https://github.com/PolarisSS13/Polaris/pull/8099 and https://github.com/PolarisSS13/Polaris/pull/8101
2021-05-22 16:02:13 -04:00
Lunaball fe3f63b423 Adding an approved custom item
Adds Antoinette's ritual supplies. One glass knife, one harness, one bottle of ground poppy reagents.
2021-05-18 13:13:47 -06:00
izac112 07b3fb6ccd Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2021-05-18 18:58:03 +02:00
NovacatandGitHub a17321ae02 Merge branch 'master' into wintercoats 2021-05-17 18:28:41 -04:00
Killian 74612eaedd loadout tweaks 2021-05-17 00:24:34 +01:00
izac112 8f126e9386 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2021-05-15 20:04:55 +02:00
TheFurryFeline 93b8773530 AR Visor
Close https://github.com/CHOMPStation2/CHOMPStation2/issues/96

This adds something from pre-rebase Chompstation I always meant to add back in. Yay for motivation! Note: this is purely a cosmetic addition and a variation of a regular pair of AR glasses but you can change the tint in Char Setup. :3
2021-05-15 08:59:17 -04:00
PastelPrinceDan b6e92da360 more winter coats
adds winter coats, moves some that were in weird files
2021-05-14 10:37:19 +01:00
izac112 2c70038623 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2021-05-12 16:30:06 +02:00
Aronai SieyesandGitHub cd16f636e9 Merge branch 'master' into Arokha/removeoldnifmenu 2021-05-12 10:12:17 -04:00
Aronai Sieyes d712732f7a Fix mystery characters in character setup screen 2021-05-11 23:43:35 -04:00
Aronai Sieyes 327cb7219f Update emotes at the end of setting up body 2021-05-11 21:06:19 -04:00
izac112 fdff893613 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2021-05-11 00:22:20 +02:00
Unknown 4fdf2a1897 Fluff items
https://forum.vore-station.net/viewtopic.php?f=27&t=1960

https://forum.vore-station.net/viewtopic.php?f=27&t=1958
2021-05-10 17:17:56 -04:00
Unknown e627c03ff0 Fixes Wing/Tail/Ear Sanitation
Basically it forgot to account for species that can select their icon base.
2021-05-10 10:00:41 -04:00
AtermoneraandVirgoBot a347843d02 Merge pull request #8064 from MistakeNot4892/styles
Fixes Virgo #10254.
2021-05-07 03:16:50 -04:00
NovacatandGitHub e861d8707f Merge pull request #10236 from dwinters99/toys
Toys expansion
2021-05-06 10:42:19 -04:00
NovacatandGitHub 5c29ed9a57 Update 03_body.dm 2021-05-02 23:58:07 -04:00
AtermoneraandVirgoBot f0913e3013 Body style selection and sanitizing refactor. 2021-05-02 23:57:07 -04:00
izac112 4171b0b903 Fixes Talon pre-round prefs 2021-05-02 22:52:34 +02:00
David Winters 0d224d9d00 Update loadout_general_vr.dm 2021-04-29 19:58:41 -04:00
David Winters 4415f05959 Merge branch 'master' into toys 2021-04-29 14:35:52 -04:00
NovacatandGitHub 7ee3781614 Merge pull request #10219 from VOREStation/upstream-merge-8055
[MIRROR] Adds config option to control loadout whitelist strictness
2021-04-28 12:45:38 -04:00
Unknown 7137e0aa84 Compile fix 2021-04-28 12:36:31 -04:00
Unknown 20022b560b Compatibility Fixes 2021-04-28 11:47:17 -04:00
Unknown 56626c527f Compatibility Fixes 2021-04-28 11:43:26 -04:00
AtermoneraandVirgoBot 0956e2794e Sanitizes languages, ears/wings/tail prefs on login 2021-04-27 16:48:26 -04:00
David Winters d0a8ce7ca3 file loss recovery 2021-04-27 06:41:57 -04:00
AtermoneraandVirgoBot 74902a6544 Adds config option to control loadout whitelist strictness 2021-04-27 03:16:06 -04:00
NovacatandGitHub 8b8c3c55eb Merge pull request #10217 from ResidentCody/Personal-Fork
Add LUNA's Medals
2021-04-27 00:18:59 -04:00
ResidentCody c312aac93c Update loadout_fluffitems_vr.dm 2021-04-26 22:02:02 -06:00
Little-119 7f961dd4aa Update loadout_fluffitems_vr.dm 2021-04-26 19:47:06 -04:00
izac112 bca4f5806e Voreupdate 2021-04-26 21:42:13 +02:00
Heroman 2bee350ae3 Both fixes and comments out WL check 2021-04-27 04:36:32 +10:00
AtermoneraandVirgoBot 48a6baff4b Merge pull request #8047 from Verkister/patch-70
Makes xenowear species WL check for species instead of ckey
2021-04-25 14:24:51 -04:00