cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-17 00:57:51 +01:00
Code Issues Packages Projects Releases Wiki Activity
50,328 Commits 9 Branches 26 Tags
2eae0fdecbcf435b4e8978e3b3e842afa5fd1178
Commit Graph
453 Commits
Author SHA1 Message Date
NovacatandGitHub 6e23c5f45a Merge pull request #6709 from VOREStation/aro-mistake 
Fix way too many vorestation edits
 2020-03-05 19:03:58 -05:00
SchnayyandVirgoBot 7bee18a2d7 Let them finally eat cake 2020-03-03 15:57:10 -05:00
NovacatandGitHub b44f8e0911 Merge pull request #6592 from VOREStation/vchat-rebase 
VChat: Redone chat output in Vue.js
 2020-03-01 10:51:29 -05:00
Aronai Sieyes f475ecbdc6 Replace a bunch of VOREStation edits that can be sent to Polaris 2020-02-29 19:45:58 -05:00
NovacatandGitHub 4298fd39eb Merge pull request #6619 from VOREStation/fix-seeds-runtime 
Fix Sundry Runtime Errors
 2020-02-25 10:42:09 -05:00
Leshana 8d8284a2b3 Resolved conflicts 2020-02-24 19:09:53 -05:00
AtermoneraandVirgoBot 7006fc6fb1 Implements blacklist for specific plant sprites for random seeds 2020-02-24 16:02:21 -05:00
Leshana 2d05b084d2 Fix Runtime in seed.dm,102: Cannot read null.len 2020-02-23 22:00:36 -05:00
Arokha Sieyes 1d9e5be122 Replace \image macro with bicon() 2020-02-19 19:55:01 -05:00
Arokha SieyesandLeshana 47ccc655db Deprecate the stream operator 2020-02-12 19:38:43 -05:00
Heroman ead75dbace Switches comments back to block edit 2020-02-10 15:52:29 +10:00
Heroman 8822a40adf adjust comments 2020-02-10 13:06:43 +10:00
Heroman 3e5d2abb43 Removes magic dust from random reagents accessible via randomized seeds 2020-02-10 12:53:15 +10:00
AtermoneraandVirgoBot 66b7793d25 Merge pull request #6661 from LeighKnapenberger/patch-1 
Fixes killer tomato mutation
 2020-02-01 18:08:47 -05:00
TheFurryFelineandGitHub 0b10c316cc Aaa 
Typo fix to comment, ree.
 2020-01-24 11:17:30 -05:00
TheFurryFelineandGitHub 41ce1ae13f No More Vines That Shrink Thee 
Changelog Notes: 

- Blacklist Macro/micro/normal cillins from list of spawnable chems in vines that can get injected into your body. This is purely for pref reasons if you don't actually like having your size changed.
 2020-01-24 10:26:11 -05:00
AtermoneraandVirgoBot 5bcb9cc934 Fix various syntactic problems 2020-01-21 01:06:04 -05:00
drexample 5e01ad45a5 coding standards are my passion 2020-01-11 06:59:33 +03:00
drexample 1be4fe8b3c hooh 2020-01-11 06:42:54 +03:00
Heroman c693bf558d Does virgo-side of xenoflora expansion 2020-01-09 08:30:42 +10:00
NovacatandGitHub 09e10e2901 Merge pull request #6406 from VOREStation/upstream-merge-6592 
[MIRROR] Xenoflora expansion take2
 2020-01-08 17:18:49 -05:00
KetraiVirgoBotKitKetKetrai
 		85667c2a9b adds gnomes. (#6595) 
* adds gnomes

* Makes the house nice and bright.

* copypasta error

* Odd

* makes gnomes adminspawn only.

Co-authored-by: KitKetKetrai <49008286+KitKetKetrai@users.noreply.github.com>
 2020-01-08 13:47:41 -05:00
MechoidandVirgoBot ec5e851399 Xenoflora expansion take2 2020-01-08 13:46:25 -05:00
Unknown 9d7c9714f3 Merge remote-tracking branch 'VOREStation/master' into making-of-shadekin 2019-11-15 12:12:55 -05:00
SchnayyandVirgoBot cf0344d059 Merge pull request #6522 from Mechoid/BotanyAgain2 
Botany Fix, again? [Why]
 2019-11-12 16:18:35 -05:00
AtermoneraandVirgoBot 20ee2c0ed2 Merge pull request #6519 from Mechoid/BotanyBugs 
Fix Fruit Runtime
 2019-11-10 18:52:11 -05:00
AtermoneraandVirgoBot dda52e4410 Merge pull request #6499 from Mechoid/Dangit_reagents 
Fixfix Grown.dm runtime
 2019-10-29 17:25:25 -04:00
Heroman3003 a3fb3e3950 Merge branch 'master' of https://github.com/VOREStation/VOREStation into making-of-shadekin 2019-10-29 09:33:48 +10:00
MechoidandVirgoBot 169d8acedd Medical Expansion 2019-10-19 23:28:38 -04:00
Heroman 283c913d95 Adds missing seeds to seed storage 2019-09-19 07:54:25 +10:00
AtermoneraandVirgoBot 0469a309cc Adds NOCONDUCT to Some Items 2019-08-08 16:07:50 -04:00
AtermoneraandVirgoBot a78cdc85cc Merge pull request #6308 from Heroman3003/kitchenfixes 
Fixes some kitchen screwery
 2019-07-22 00:43:05 -04:00
AnewbeandVirgoBot 3c21b379f6 Merge pull request #6298 from Nalarac/patch-12 
Fixes Plant Produced Stacks
 2019-07-13 15:58:19 -04:00
AnewbeandVirgoBot 19fd2bbab1 Merge pull request #6277 from Mechoid/ActuallyAddTheSeeds 
Actually adds the new seeds to the vendors.
 2019-07-09 14:00:39 -04:00
Heroman3003andVirgoBot 864704565c Returns logs from plants (#6274) 
* Returns logs from plants

* Returns production of planks from fruit with wood pulp
 2019-07-08 17:33:01 -04:00
AtermoneraandVirgoBot 1472642b88 Merge pull request #6262 from Mechoid/CivilianExpansion1 
Civilian Expansion 1: The Plantening
 2019-07-07 17:29:32 -04:00
AnewbeandVirgoBot 02e1db9dfd Merge pull request #6261 from Heroman3003/botanfix 
Fixes atmosphere targeted mutation editing wrong plant traits
 2019-07-03 13:09:46 -04:00
AtermoneraandVirgoBot 88df3de3e6 Merge pull request #6195 from TheFurryFeline/TFF-Infinite-Frame-Fixy 
Infinite Frame Fixy
 2019-06-06 13:11:59 -04:00
AtermoneraandVirgoBot ea2860eeb3 Merge pull request #6148 from Verkister/patch-22 
Removes melee damage from snacks.
 2019-05-03 21:56:22 -04:00
Heroman 703c27da7e Refactors shadekin 2019-04-28 15:10:06 +10:00
NovacatandGitHub 466516b066 Revert "Un-kevinzes nanoui and chemistry subsystems back into processes for greater good" 2019-04-08 15:24:27 -04:00
Heroman b11015107c REVERT of nanoui/chemistry becoming subsystems (temp) 2019-04-05 13:30:32 +10:00
Unknown d24cef8c0a Hardsyncs Icons 
...It seems like the mirrorbot is not porting icon changes over properly...
 2019-03-30 15:40:06 -04:00
AnewbeandNovacat 8ed384b38c Rewrites Atmospherics 2019-03-28 19:25:11 -04:00
kevinz000andNovacat 6415e4193f [READY]Makes a bunch of processes subsystems instead 2019-03-27 16:03:51 -04:00
NeertiandNovacat 86174593bf Replaces GoonPS scheduled_tasks and obj processing with SMC processing subsystems and timer 2019-03-26 23:58:26 -04:00
AtermoneraandNovacat 131636b1d2 Capitalizes initialize() to Initialize() because Destroy() is capitalized and this is pretty nerve-grinding 2019-03-26 13:21:08 -04:00
AtermoneraandVirgoBot 2df5e9fe0e Merges AI Branch into Master 2018-12-01 00:06:38 -05:00
NeertiandVirgoBot 68d1d5cce9 Merge pull request #5691 from lbnesquik/Kates-Hedgetrimmers-feature 
Remplace the plant clippers with a pair hedgetrimmers
 2018-10-30 18:37:45 -04:00
NeertiandVirgoBot ea6a9f2df5 Merge pull request #5690 from lbnesquik/Kates-Wax-Fix 
Fix wax appearing to be steel.
 2018-10-20 00:07:01 -04:00