cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-31 07:58:22 +01:00
Code Issues Packages Projects Releases Wiki Activity
48,946 Commits 9 Branches 26 Tags
f76003e4f79327adcfdcecdb011207dc96ea485b
Commit Graph
48946 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
BlackMajor f76003e4f7 Update vorepanel_vr.dm 2019-11-18 19:41:25 +13:00
BlackMajorandGitHub 561b1c3f4a Merge pull request #3 from VOREStation/master 
Sync
 2019-11-18 19:33:22 +13:00
NovacatandGitHub e03f504067 Merge pull request #6201 from NoctuaAngelis/master 
Tucker0666 fluff
 2019-11-17 13:41:38 -05:00
Sara Elizabeth f3a2a1700a Merge remote-tracking branch 'VOREStation/master' 2019-11-17 11:20:39 -06:00
NoctuaAngelisandGitHub 79dbb8e3ae Add files via upload 2019-11-17 09:50:00 -06:00
NovacatandGitHub fc063fc450 Merge pull request #6185 from BlackMajor/master 
An extremely lazy copy paste of Cit's animal sound emotes.
 2019-11-17 10:12:40 -05:00
NoctuaAngelisandGitHub a3c599d890 Add files via upload 2019-11-17 08:51:17 -06:00
NoctuaAngelisandGitHub 0f22bd741a Add files via upload 2019-11-17 08:21:39 -06:00
NoctuaAngelisandGitHub 6db45b4d25 Add files via upload 2019-11-17 07:25:49 -06:00
BlackMajor f93d50d272 Actually lets just make a simple global emote cooldown 2019-11-17 19:41:05 +13:00
NoctuaAngelisandGitHub c2c133889a Add files via upload 2019-11-16 17:16:08 -06:00
NoctuaAngelisandGitHub 2460ec4acd Add files via upload 2019-11-16 17:14:08 -06:00
NoctuaAngelisandGitHub 14cf784d3b Add files via upload 2019-11-16 17:11:54 -06:00
NovacatandGitHub 5a2e2c6150 Merge pull request #6196 from Meghan-Rossi/monstertamerfix 
Makes Monster Tamer give nutrition
 2019-11-16 10:00:05 -05:00
Meghan-Rossi 03c82caa71 Makes Monster Tamer give nutrition 
Seems to have been intended anyway but wasn't working because the nutriment factor was zero.  Made it work similar to protein since it's made with protein
 2019-11-16 14:35:38 +00:00
NovacatandGitHub 2ee3dcbb27 Merge pull request #6136 from Heroman3003/gateway-faux-fix 
Switches to an alternative system for gateway map use.
 2019-11-15 12:46:55 -05:00
NovacatandGitHub 4b422d19e0 Merge pull request #5149 from Heroman3003/making-of-shadekin 
Big Shadekin Refactor
 2019-11-15 12:41:46 -05:00
Unknown 04b8df7d06 Icon Compatability 2019-11-15 12:16:01 -05:00
Unknown 9d7c9714f3 Merge remote-tracking branch 'VOREStation/master' into making-of-shadekin 2019-11-15 12:12:55 -05:00
NovacatandGitHub f99e631634 Merge pull request #6179 from lbnesquik/Kath-Fish-Update 
Ensure that EVERY mob give at least SOME nutrition when digested.
 2019-11-15 12:00:19 -05:00
NovacatandGitHub 4763d548ab Merge pull request #6184 from Meghan-Rossi/collartweak 
Adds a way to set the tag of loadout collars as part of the loadout
 2019-11-15 11:59:56 -05:00
NovacatandGitHub 30d11b091e Merge pull request #6191 from Sk1Tz/master 
Added neckfluff for facial hair option.
 2019-11-15 11:58:23 -05:00
NovacatandGitHub 5c3d069dca Merge pull request #6190 from KasparoVy/dope_mane 
Fix Gap in Sergal Tapered Hairstyle
 2019-11-15 11:56:37 -05:00
NovacatandGitHub a89d7f8310 Merge pull request #6192 from Heroman3003/riftwalker-vision 
Fixes riftwalkers not having darksight
 2019-11-14 23:24:04 -05:00
Heroman d313f4d7ac Fixes tails and fine manipulation 2019-11-15 13:46:40 +10:00
Heroman 871305583d Fixes riftwalkers not having darksight 2019-11-15 13:15:56 +10:00
Sk1Tz 3ba8cf4403 Added neckfluff for facial hair option 2019-11-14 21:13:42 -05:00
Heroman3003 7f4979e1a3 Fixes lack of proper restriction 2019-11-15 11:49:20 +10:00
Heroman3003 ab603cffa4 Finishes up the main shadekin features 2019-11-15 11:13:31 +10:00
KasparoVy 007151b855 Fix Wack Gap in Sergal Tapered Hairstyle 
Fills in the couple pixel gap at the lower part of the Sergal Tapered hairstyle from the east and west directions.
 2019-11-14 20:08:32 -05:00
Heroman3003 62889c39d9 Removes deprecated code 2019-11-15 08:38:53 +10:00
NovacatandGitHub 780e8d037a Merge pull request #6189 from TheFurryFeline/TFF-Xenobio_Fixes_Yet_Again 
Xenobio Tweaks. Again.
 2019-11-14 16:41:18 -05:00
TheFurryFeline 57277d3207 Run Mapmerge 2019-11-14 11:37:42 -05:00
NovacatandGitHub df255b432e Merge pull request #6188 from Meghan-Rossi/solarsensorfix 
Fix solars powernet sensors
 2019-11-14 10:52:27 -05:00
Meghan-Rossi 67191cb6b5 Fix solars powernet sensors 2019-11-14 15:18:22 +00:00
Heroman a3c037df08 Runs mapmerge 2019-11-14 12:30:52 +10:00
Heroman3003 96fd2bf748 Fixes 3 maps 2019-11-14 12:09:20 +10:00
TheFurryFeline 7b7b25bb29 Xenobio Tweaks 
- Removes extra lightbulbs in pen area.
- Add air alarms where needed.
- - Adjust switches and other things as needed.
- - Missing scrubbers and air vents added as well.
 2019-11-13 19:32:55 -05:00
BlackMajor 4a3581b91a Why do I keep forgetting virgo does weird modular things despite not being a downstream 2019-11-14 12:02:18 +13:00
Heroman e953a4002b Attempt at zoo implement 2019-11-14 06:47:37 +10:00
NovacatandGitHub f60b2094a0 Merge pull request #6173 from Very-Soft/vendortime 
New vending machines
 2019-11-13 13:42:19 -05:00
NovacatandGitHub 99f2964f73 Merge pull request #6129 from Rykka-Stormheart/shep-dev-chat-update 
Earlyport of Chat Refactor from Polaris
 2019-11-13 13:33:22 -05:00
NovacatandGitHub a750453598 Merge pull request #6187 from Rykka-Stormheart/shep-dev-xenobio-fixes 
Multiple Xenobiology Fixes
 2019-11-13 11:30:43 -05:00
Rykka b7f995a11e Readd jackboots 2019-11-13 08:32:04 -07:00
NovacatandGitHub 4167797532 Merge pull request #6186 from Rykka-Stormheart/shep-dev-airpump-volume-tuning 
Reduce Air Pump Volume and mid loop time
 2019-11-13 09:42:47 -05:00
Rykka 3276f08a69 Multiple Xenobiology Fixes, Remove Dhaeleena's Jackboots 2019-11-13 05:54:58 -07:00
Rykka 581e7c7764 Reduce volume, reduce loop time 2019-11-13 05:31:33 -07:00
Rykka 2aeaad8c71 Merge branch 'master' into shep-dev-chat-update 2019-11-13 05:02:33 -07:00
Rykka 45abd9ae01 Testfix/reset filediff 2019-11-13 05:00:38 -07:00
Heroman 8889b68d03 Adds hairs properly 2019-11-13 17:48:31 +10:00