cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-23 12:08:28 +01:00
Code Issues Packages Projects Releases Wiki Activity
47,362 Commits 9 Branches 26 Tags
bd9c75327cdeae2dca92d91be253de53a8f2cb1a
Commit Graph
47362 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
if there were two guys on the moon bd9c75327c Request Spice 2019-07-27 17:04:21 +01:00
NovacatandGitHub 2aa1222b46 Merge pull request #5487 from Heroman3003/mapfixes6 
Fixes a single pipe in security
 2019-07-21 23:41:26 -04:00
Heroman 4613640065 Fixes a single pipe in security 2019-07-22 13:30:13 +10:00
NovacatandGitHub bb4e692e36 Merge pull request #5486 from Heroman3003/mapfixes4 
Minor map fixes
 2019-07-21 21:28:56 -04:00
Heroman 6edd02e995 Minor map adjustments for security 2019-07-22 11:17:45 +10:00
NovacatandGitHub e517e56578 Merge pull request #5485 from Heroman3003/space-side 
Fixes open spaces appearing on z-4 after explosions
 2019-07-21 17:05:08 -04:00
Heroman 897d47573f Fixes open spaces appearing on z-4 after explosions 2019-07-22 06:30:51 +10:00
NovacatandGitHub 942254816d Merge pull request #5484 from VOREStation/upstream-merge-6313 
[MIRROR] itty bitty changelog
 2019-07-20 13:51:33 -04:00
VirgoBot 8560db0994 itty bitty changelog 2019-07-20 13:28:03 -04:00
AnewbeandVirgoBot 7109e22c3f Merge pull request #6313 from Atermonera/changelog 
itty bitty changelog
 2019-07-20 13:28:03 -04:00
NovacatandGitHub 596928d1fa Merge pull request #5481 from VOREStation/upstream-merge-6311 
[MIRROR] Melee Mobs Can Attack with Pointblank
 2019-07-19 19:16:59 -04:00
NovacatandGitHub f78eeb0408 Merge pull request #5480 from VOREStation/upstream-merge-6284 
[MIRROR] fixes communicator weather app's air reading
 2019-07-19 19:16:49 -04:00
NovacatandGitHub f69d1ddbd2 Merge pull request #5479 from VOREStation/upstream-merge-6310 
[MIRROR] Emitters Hit Blob Again
 2019-07-19 19:16:31 -04:00
VirgoBot 40ebbda6bc Melee Mobs Can Attack with Pointblank 2019-07-19 16:19:46 -04:00
AnewbeandVirgoBot 65f8ca05ad Merge pull request #6311 from Nalarac/Hivebot 
Melee Mobs Can Attack with Pointblank
 2019-07-19 16:19:46 -04:00
VirgoBot ba5ccfdae5 fixes communicator weather app's air reading 2019-07-19 16:19:36 -04:00
AnewbeandVirgoBot 03ff9fa0fe Merge pull request #6284 from Atermonera/weather_app_atmos_reading 
fixes communicator weather app's air reading
 2019-07-19 16:19:36 -04:00
VirgoBot c3c6acb7e5 Emitters Hit Blob Again 2019-07-19 16:13:10 -04:00
AndrewandVirgoBot b168c77071 Emitters Hit Blob Again (#6310) 
* Emitters Hit Blob Again

* Update overmind.dm

* Deletes line
 2019-07-19 16:13:10 -04:00
NovacatandGitHub df03209f13 Merge pull request #5476 from VOREStation/upstream-merge-6306 
[MIRROR] Fixes Razor Drones and Sentry Drones.
 2019-07-19 02:01:53 -04:00
VirgoBot 51c2e49511 Fixes Razor Drones and Sentry Drones. 2019-07-19 00:53:43 -04:00
AtermoneraandVirgoBot 983715d896 Merge pull request #6306 from Mechoid/FixRazorDronesandScanners 
Fixes Razor Drones and Sentry Drones.
 2019-07-19 00:53:43 -04:00
NovacatandGitHub 69c6e8e3ed Merge pull request #5472 from Heroman3003/airlockening 
Implements Firlock scrubbers
 2019-07-17 17:36:34 -04:00
NovacatandGitHub 56861d16cd Merge pull request #5463 from Novacat/nova-pathfinder 
Buffs Air Vents to Baystation Standard
 2019-07-17 17:36:25 -04:00
NovacatandGitHub ea05ba7d02 Merge pull request #5454 from TheFurryFeline/TFF-Nomming_Collars 
Edible Collars
 2019-07-17 17:36:11 -04:00
NovacatandGitHub b039eacdd7 Merge pull request #5429 from Novacat/nova-basicfixes 
Ease of Eating Changes
 2019-07-17 17:35:58 -04:00
NovacatandGitHub d5f0f35519 Merge pull request #5357 from Wickedtemp/master 
Allows New Serenity Mech To Be Constructed
 2019-07-17 17:35:41 -04:00
NovacatandGitHub c09b292d2a Merge pull request #5473 from VOREStation/upstream-merge-6301 
[MIRROR] Salt is Salt
 2019-07-16 01:06:54 -04:00
VirgoBot beb0e47a5a Salt is Salt 2019-07-16 00:49:52 -04:00
AtermoneraandVirgoBot d987e1e7fd Merge pull request #6301 from Cerebulon/saltoid 
Salt is Salt
 2019-07-16 00:49:52 -04:00
Heroman 4439b99bcc Implements Firlock scrubbers 2019-07-16 06:16:42 +10:00
NovacatandGitHub d48861c7e3 Merge pull request #5469 from VOREStation/upstream-merge-6245 
[MIRROR] The great rock update.
 2019-07-14 01:36:40 -04:00
NovacatandGitHub d8c3d23e60 Merge pull request #5465 from VOREStation/upstream-merge-6272 
[MIRROR] Mining Expansion, the Diggening.
 2019-07-14 01:36:27 -04:00
NovacatandGitHub 84e8703ee1 Update glasses.dm 2019-07-13 23:35:50 -04:00
NovacatandGitHub 36ab7984e4 Merge pull request #5470 from Heroman3003/phoronlock-2 
Adds phoronlock scrubbers.
 2019-07-13 23:32:48 -04:00
Heroman f1f72f7d45 Adds phoronlock scrubbers. 2019-07-14 13:04:29 +10:00
NovacatandGitHub 7781093bf4 Update vision.dm 2019-07-13 23:03:40 -04:00
NovacatandGitHub cc2b7e30c0 Update vorestation.dme 2019-07-13 23:01:19 -04:00
NovacatandGitHub 444abae6e0 Merge pull request #5468 from VOREStation/upstream-merge-6297 
[MIRROR] Nalarac's Farmbot Tweak
 2019-07-13 23:00:24 -04:00
NovacatandGitHub a788f4200a Merge pull request #5467 from VOREStation/upstream-merge-6298 
[MIRROR] Fixes Plant Produced Stacks
 2019-07-13 23:00:12 -04:00
NovacatandGitHub d120748a38 Update equipment_vendor.dm 2019-07-13 22:59:47 -04:00
NovacatandGitHub dd1a3a775c Merge pull request #5461 from VOREStation/upstream-merge-6294 
[MIRROR] Makes airtight plastic flaps less of a free pass
 2019-07-13 18:33:36 -04:00
AtermoneraandVirgoBot 22c5967269 The great rock update. 2019-07-13 18:21:45 -04:00
VirgoBot de4377dab7 Nalarac's Farmbot Tweak 2019-07-13 15:58:28 -04:00
TheFurryFelineandVirgoBot 8c01080dba Nalarac's Farmbot Tweak (#6297) 
* Nalarac's Farmbot Tweak

Adding access_xenobiology to the permission levels for Farmbots so xenobotanists can make use of the bugger. Doing this on behalf of Nalarac, using work from  https://github.com/PolarisSS13/Polaris/pull/6288

* Revert "Nalarac's Farmbot Tweak"

This reverts commit bba618a39687574fd7b7fed463aa8f03ba4c5b4e.

* Test Comment Addition

* Back on Track

Restores reverted line and re-adds CL. This compiles FINE in everything BUT here. Think it's just Travis being buggy or something.
 2019-07-13 15:58:28 -04:00
VirgoBot ad785b91d6 Fixes Plant Produced Stacks 2019-07-13 15:58:19 -04:00
AnewbeandVirgoBot 3c21b379f6 Merge pull request #6298 from Nalarac/patch-12 
Fixes Plant Produced Stacks
 2019-07-13 15:58:19 -04:00
AtermoneraandVirgoBot 9325f590ca Mining Expansion, the Diggening. 2019-07-13 03:48:38 -04:00
SpadesandGitHub 1a61b6ea36 Merge pull request #5462 from Mewchild/MC-SaltFans 
Replaces mining phoron lock with FANS
 2019-07-12 16:52:07 -04:00
Unknown 472cfd98c4 Buffs Air Vents to Baystation Standard 
...this should probably be ported to Polaris but too lazy right now.
 2019-07-12 09:47:41 -04:00