cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-29 06:58:30 +01:00
Code Issues Packages Projects Releases Wiki Activity
54,690 Commits 9 Branches 26 Tags
eb830751eebefff76aa6478b4cc177617d31a3e8
Commit Graph
54690 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Muffindrake eb830751ee Fix refined MAT_LEAD 0 nutrition, gem_eater typos 2020-09-02 01:31:36 +02:00
VerkisterandGitHub bf5ea9e217 Merge pull request #8747 from VOREStation/Verkister-patch-1 
Buffs/fixes darksight traits.
 2020-09-01 20:56:19 +03:00
NovacatandGitHub 4b46195b95 Merge pull request #8951 from VOREStation/upstream-merge-7602 
[MIRROR] Fix jetpack ion trail
 2020-09-01 08:02:42 -04:00
NovacatandGitHub dba5a14b5f Merge pull request #8952 from Heroman3003/constructible-vorelaws 
Constructible vorelaws
 2020-09-01 08:02:26 -04:00
NovacatandGitHub 80dc157fbf Merge pull request #8953 from Heroman3003/inclusion 
Includes alert_vr.dm
 2020-09-01 08:01:43 -04:00
Heroman 732448d389 Fixes indent errors 2020-09-01 20:37:56 +10:00
Heroman3003andGitHub 3124e12f17 Includes alert_vr.dm 2020-09-01 16:38:23 +10:00
Heroman3003andGitHub c890d3dcca Include the PR files 2020-09-01 16:35:53 +10:00
Heroman3003andGitHub 33f85fc4d6 Makes the vorelaw boards makeable 2020-09-01 16:34:24 +10:00
Heroman3003andGitHub 045be423b3 .dm 2020-09-01 16:27:42 +10:00
Heroman3003andGitHub 00913ff339 Adds boards for AI vore laws 2020-09-01 16:26:39 +10:00
NovacatandGitHub 3f35fe1081 Merge pull request #8949 from VOREStation/upstream-merge-7596 
[MIRROR] Perspective-y drone fabricator from CEV-Eris
 2020-09-01 01:05:16 -04:00
NovacatandGitHub c06ccac8a5 Merge pull request #8935 from Cyantime/jetpackfuel 
Jetpack cleanup, don't use fuel when unneeded
 2020-09-01 01:05:04 -04:00
VirgoBot 4153121a4f Fix jetpack ion trail 2020-09-01 01:05:03 -04:00
AtermoneraandVirgoBot 3daa38aade Merge pull request #7602 from Cyantime/patch-2 
Fix jetpack ion trail
 2020-09-01 01:05:03 -04:00
NovacatandGitHub b6cc3bd705 Merge pull request #8950 from VOREStation/upstream-merge-7600 
[MIRROR] Reduce the ore scanner time from 10 to 2 seconds. Same as the mech one.
 2020-09-01 00:52:53 -04:00
NovacatandGitHub 77f39209a1 Merge pull request #8947 from VOREStation/upstream-merge-7593 
[MIRROR] Increases number of things that survive overmap ztransit
 2020-09-01 00:52:36 -04:00
NovacatandGitHub 8bce0ae786 Merge pull request #8946 from VOREStation/upstream-merge-7591 
[MIRROR] Stops meson/etc use with overmap consoles
 2020-09-01 00:52:25 -04:00
NovacatandGitHub 3713f69a5c Merge pull request #8945 from VOREStation/upstream-merge-7588 
[MIRROR] Adds ENGINE_MAP to example config
 2020-09-01 00:52:12 -04:00
NovacatandGitHub 070a3489fe Merge pull request #8940 from VOREStation/upstream-merge-7583 
[MIRROR] FBP Internals Additions
 2020-09-01 00:51:59 -04:00
NovacatandGitHub d5f18ddb2e Merge pull request #8933 from VOREStation/upstream-merge-7552 
[MIRROR] Adds hailer gas (face) masks.
 2020-08-31 23:57:14 -04:00
NovacatandGitHub 7356e13df7 Update config.txt 2020-08-31 23:56:55 -04:00
NovacatandGitHub fe29585641 Merge pull request #8944 from VOREStation/upstream-merge-7589 
[MIRROR] Adds toe-less jackboots to xenowear
 2020-08-31 23:56:31 -04:00
NovacatandGitHub 47acb763e0 Merge pull request #8941 from VOREStation/upstream-merge-7587 
[MIRROR] Fixes Teshari dresses
 2020-08-31 23:56:20 -04:00
NovacatandGitHub 847287eee4 Update vorestation.dme 2020-08-31 23:55:55 -04:00
VirgoBot 33fa86bc34 Reduce the ore scanner time from 10 to 2 seconds. Same as the mech one. 2020-08-31 23:54:19 -04:00
AtermoneraandVirgoBot ca2ce6adea Merge pull request #7600 from lbnesquik/Kot-Scanner-ore 
Reduce the ore scanner time from 10 to 2 seconds. Same as the mech one.
 2020-08-31 23:54:19 -04:00
NovacatandGitHub 68f64d3d84 Update ship.dm 2020-08-31 23:53:59 -04:00
VirgoBot 80e89d2961 Perspective-y drone fabricator from CEV-Eris 2020-08-31 23:48:50 -04:00
AtermoneraandVirgoBot 9d4f85c764 Merge pull request #7596 from listerla/dronefab 
Perspective-y drone fabricator from CEV-Eris
 2020-08-31 23:48:50 -04:00
VirgoBot 1a60ffde19 Increases number of things that survive overmap ztransit 2020-08-31 23:41:08 -04:00
AtermoneraandVirgoBot aa1575c27f Merge pull request #7593 from Cyantime/patch-3 
Increases number of things that survive overmap ztransit
 2020-08-31 23:41:07 -04:00
NovacatandGitHub f90777ead5 Merge pull request #8939 from VOREStation/upstream-merge-7573 
[MIRROR] Distillery Upkeep, Chemistry Tweakening
 2020-08-31 23:40:47 -04:00
NovacatandGitHub 9aec6b23db Update vorestation.dme 2020-08-31 23:40:21 -04:00
CyantimeandVirgoBot 6d5c14c448 Stops meson/etc use with overmap consoles 2020-08-31 23:39:49 -04:00
Unknown c024404024 Merge remote-tracking branch 'VOREStation/master' into upstream-merge-7552 2020-08-31 23:39:16 -04:00
AtermoneraandVirgoBot 1fe31b3446 Adds ENGINE_MAP to example config 2020-08-31 23:37:31 -04:00
VirgoBot 9468ad0943 Adds toe-less jackboots to xenowear 2020-08-31 23:37:18 -04:00
AtermoneraandVirgoBot 2a3a5483b0 Merge pull request #7589 from listerla/toelessjackboots 
Adds toe-less jackboots to xenowear
 2020-08-31 23:37:18 -04:00
VirgoBot 80e47dc1fd Fixes Teshari dresses 2020-08-31 23:35:51 -04:00
AtermoneraandVirgoBot 500d859fd6 Merge pull request #7587 from listerla/teshclothesfix 
Fixes Teshari dresses
 2020-08-31 23:35:51 -04:00
AtermoneraandVirgoBot a5c829ea53 FBP Internals Additions 2020-08-31 23:25:13 -04:00
NovacatandGitHub f8a9a649d3 Merge pull request #8938 from VOREStation/upstream-merge-7609 
[MIRROR] Stop in the name of the law, open tag.
 2020-08-31 22:51:33 -04:00
VirgoBot 4fd7130b67 Distillery Upkeep, Chemistry Tweakening 2020-08-31 22:37:18 -04:00
MechoidandVirgoBot 97831abf14 Distillery Upkeep, Chemistry Tweakening (#7573) 
* Distillery For Chemistry

* Synthplasma, Synthblood but not horrifically strong.

* Rectify, I said, damnit!

* Distillery for Chem. Now with STRONG DMM.

* changeling
 2020-08-31 22:37:18 -04:00
AtermoneraandVirgoBot 18060684ac Stop in the name of the law, open tag. 2020-08-31 22:36:05 -04:00
NovacatandGitHub 52a8917379 Merge pull request #8937 from Heroman3003/fullnotfat 
Makes the fullness alert more accurate
 2020-08-31 22:05:36 -04:00
Heroman3003andGitHub 41814c6a82 Fixes indents 2020-09-01 11:30:14 +10:00
Heroman3003andGitHub fee5eb895a Makes the fullness alert more accurate 2020-09-01 11:27:53 +10:00
Cyantime 99009e6266 Jetpack cleanup, don't use fuel when unneeded 2020-08-31 21:13:04 -04:00