cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-21 02:58:45 +01:00
Code Issues Packages Projects Releases Wiki Activity
46,619 Commits 9 Branches 26 Tags
ff9e4f2e4a48b2eae68b64c3ffbd5c0cbcd50cf4
Commit Graph
46619 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Heroman ff9e4f2e4a Makes Flavor Text properly required for joining 2019-05-02 14:40:13 +10:00
NovacatandGitHub 44be2d7c35 Merge pull request #5166 from VOREStation/upstream-merge-6142 
[MIRROR] Adds Holowarrant Projectors
 2019-05-01 14:49:18 -04:00
AtermoneraandVirgoBot 51dc091cd5 Adds Holowarrant Projectors 2019-05-01 14:37:50 -04:00
NovacatandGitHub 72e931cdbc Merge pull request #5165 from VOREStation/upstream-merge-6133 
[MIRROR] Minor PDA cartridge tweaks
 2019-05-01 14:20:23 -04:00
VirgoBot dbc8a08dba Minor PDA cartridge tweaks 2019-05-01 14:08:33 -04:00
AtermoneraandVirgoBot 8e724ad32c Merge pull request #6133 from Heroman3003/cart-tweek 
Minor PDA cartridge tweaks
 2019-05-01 14:08:33 -04:00
NovacatandGitHub e4367a8e31 Merge pull request #5164 from VOREStation/upstream-merge-6143 
[MIRROR] Adds some premade full condiment bottles
 2019-05-01 03:51:44 -04:00
VirgoBot 5c72bdad41 Adds some premade full condiment bottles 2019-05-01 03:40:29 -04:00
NeertiandVirgoBot 8f9cc9a41e Merge pull request #6143 from Heroman3003/condiment-presets 
Adds some premade full condiment bottles
 2019-05-01 03:40:29 -04:00
NovacatandGitHub 39cd5e860e Merge pull request #5163 from Heroman3003/forgotten-terminal 
Fixes missing Storage Console in Cyborg Station
 2019-05-01 01:03:07 -04:00
Heroman 11d123ca3b Fixes missing Storage Console in Cyborg Station 2019-05-01 14:45:41 +10:00
NovacatandGitHub 037be98a90 Merge pull request #5162 from Heroman3003/southern-cross-update 
Updates Southern Cross maps
 2019-04-30 22:52:43 -04:00
Heroman 00a851f867 Updates Southern Cross maps 2019-05-01 12:41:34 +10:00
NovacatandGitHub 79dda0f265 Merge pull request #5125 from Heroman3003/repositioning 
Rework of expedition areas
 2019-04-30 16:45:36 -04:00
NovacatandGitHub 974946f1e7 Merge pull request #5160 from Heroman3003/restrictions-timeclocks 
Changes way timeclock going on-duty restritctions work slightly
 2019-04-30 05:16:10 -04:00
Heroman 2ae08bb543 Changes way timeclock going on-duty restritctions work slightly 2019-04-30 19:00:30 +10:00
Heroman a598649a5c Fixes some airlock colors 2019-04-30 05:50:38 +10:00
NovacatandGitHub 8decf68867 Merge pull request #5157 from Heroman3003/purple-flakes 
Fixes outdoors tiles having phoron flaking on them
 2019-04-29 06:35:08 -04:00
NovacatandGitHub 8bb5ec6300 Merge pull request #5158 from Heroman3003/cooler-cooler 
Fixes mining outpost's cooler being empty
 2019-04-29 06:34:37 -04:00
Heroman 02710f62ce Fixed mining outpost's uncool cooler 2019-04-29 16:09:51 +10:00
Heroman 1380a27c31 Fixes outdoors tiles having phoron flaking on them 2019-04-29 16:01:29 +10:00
NovacatandGitHub 9b5888160c Merge pull request #5156 from VOREStation/upstream-merge-6136 
[MIRROR] Shortwave and Relay Tweaks
 2019-04-29 00:22:55 -04:00
Unknown 6864027709 Merge branch 'nova-heterochromia' into upstream-merge-6136 2019-04-29 00:12:05 -04:00
Unknown c12fd7b793 Fixes Missing Sprite 2019-04-29 00:11:51 -04:00
NovacatandGitHub 9770d675c2 Update radio.dm 2019-04-29 00:10:51 -04:00
NovacatandGitHub e01db9b517 Update telecomunications.dm 2019-04-29 00:10:13 -04:00
NeertiandVirgoBot 0d76e09b7c Shortwave and Relay Tweaks 2019-04-29 00:02:13 -04:00
NovacatandGitHub 7943c60676 Merge pull request #5155 from Novacat/nova-heterochromia 
Fixes oversights with last PRs
 2019-04-28 23:38:01 -04:00
Unknown 32ae85e423 Fixes oversights with last PRs 2019-04-28 23:28:19 -04:00
NovacatandGitHub 797f9dee59 Merge pull request #5115 from InterroLouis/Webbing-Cost 
Changes Webbing Cost
 2019-04-28 22:57:41 -04:00
NovacatandGitHub fb52ec08c6 Merge pull request #5114 from Novacat/nova-weapons 
Expedition Sub-department
 2019-04-28 22:57:13 -04:00
NovacatandGitHub fe4185735b Merge pull request #5150 from Novacat/nova-heterochromia 
POI Generation Fixes/Updates
 2019-04-28 22:56:10 -04:00
NovacatandGitHub 30a6e8c2db Merge pull request #5154 from VOREStation/upstream-merge-6031 
[MIRROR] [REVIEW] Ports Modular Computers from Baystation
 2019-04-28 22:53:25 -04:00
Unknown 1b7bab5810 Conflict Resolution Four 2019-04-28 22:37:49 -04:00
Unknown 7b9c155511 Conflict Resolution Part Three 2019-04-28 22:19:44 -04:00
NovacatandGitHub 4c34013856 Conflict Resolution Part Two 2019-04-28 22:15:58 -04:00
Unknown 1f9eb87849 Conflict Resolution Part One 2019-04-28 22:14:31 -04:00
NovacatandGitHub 3c48a14f02 Update Rockybase.dmm 2019-04-28 22:13:31 -04:00
NeertiandVirgoBot 16b3b58259 [REVIEW] Ports Modular Computers from Baystation 2019-04-28 22:06:40 -04:00
NovacatandGitHub 96669c91f0 Merge pull request #5153 from VOREStation/upstream-merge-6139 
[MIRROR] Fixes Access Code Transmission Device oversight.
 2019-04-28 20:25:48 -04:00
VirgoBot 9c5e0c0caa Fixes Access Code Transmission Device oversight. 2019-04-28 20:12:14 -04:00
NeertiandVirgoBot cf1588441f Merge pull request #6139 from Mechoid/FixACTDStuff 
Fixes Access Code Transmission Device oversight.
 2019-04-28 20:12:14 -04:00
Unknown a1bb30ddf8 Seriously? 2019-04-28 15:24:34 -04:00
Unknown fb6c78317a Gives V2 Surface more points 
More POIs, more Points.
 2019-04-28 15:19:59 -04:00
Unknown f8f6483469 Updates V2 POIs 2019-04-28 15:12:51 -04:00
Unknown 44094f2634 V4 POI Generation Fixes 
POIs can only generate on half the map right now, and, not a particularly large half. This prevents the generation of larger POIs, and basically squishes all the POIs towards the cave entrance.
 2019-04-28 14:04:43 -04:00
NovacatandGitHub b9a1fa29d6 Merge pull request #5111 from Heroman3003/people-cant-have-nice-things 
Removes glucose autoinjectors from vendomats, makes Zaddat spawn with a bunch
 2019-04-27 22:49:53 -04:00
NovacatandGitHub 76bf550299 Merge pull request #5146 from VOREStation/upstream-merge-6129 
[MIRROR] Allows liquidfoods to be eaten through protective gear
 2019-04-27 22:49:20 -04:00
NovacatandGitHub cda7fc3156 Merge pull request #5148 from VOREStation/upstream-merge-6137 
[MIRROR] Removes Resident from the Southern Cross
 2019-04-27 22:45:06 -04:00
NovacatandGitHub 958a5b6645 Merge pull request #5142 from VOREStation/upstream-merge-6058 
[MIRROR] Removes umbrella permastuns. Adds wind mechanics.
 2019-04-27 22:42:42 -04:00