cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-07 06:39:57 +00:00
Code Issues Packages Projects Releases Wiki Activity
47,303 Commits 8 Branches 26 Tags
dd1a3a775c731bb54ebc05501010caee9d7cfb7d
Commit Graph

22767 Commits

Author SHA1 Message Date
Novacat
2f4e96c1ad Merge pull request #5459 from VOREStation/upstream-merge-6293 
[MIRROR] Xenoarcheaology Tweaks
 2019-07-12 03:12:55 -04:00
Novacat
d871fc12be Merge pull request #5460 from VOREStation/upstream-merge-6287 
[MIRROR] Allows Set Transfer Amounts of 250 and 500 for Reagent Cartridges
 2019-07-12 03:12:37 -04:00
Atermonera
257e3dd9fc Merge pull request #6287 from Wickedtemp/master 
Allows Set Transfer Amounts of 250 and 500 for Reagent Cartridges
 2019-07-12 02:51:39 -04:00
Atermonera
21e5e3e111 Xenoarcheaology Tweaks 2019-07-12 02:51:29 -04:00
Atermonera
7aeab71140 Merge pull request #6286 from Mechoid/Glitterpatch 
Patches Glitterflies
 2019-07-12 02:50:16 -04:00
Novacat
969c6032f5 Merge pull request #5456 from VOREStation/upstream-merge-6282 
[MIRROR] Try to fix slimes and Prometheans.
 2019-07-12 02:43:37 -04:00
Atermonera
b1b8562f66 Merge pull request #6282 from Mechoid/TryToFixSlimes 
Try to fix slimes and Prometheans.
 2019-07-11 23:57:56 -04:00
Atermonera
634b56b1d1 Merge pull request #6280 from Nalarac/patch-8 
Fixes Nurse Spider Feeding
 2019-07-11 23:56:43 -04:00
Novacat
f55c630690 Merge pull request #5451 from VOREStation/upstream-merge-6269 
[MIRROR] MC camera and access fixes and adjustments
 2019-07-09 15:11:18 -04:00
Heroman3003
ca13a8872c MC camera and access fixes and adjustments (#6269) 
* Adjusts MC camera program, fixes ID program

* Fixes oversight with network access
 2019-07-09 14:01:53 -04:00
Anewbe
19fd2bbab1 Merge pull request #6277 from Mechoid/ActuallyAddTheSeeds 
Actually adds the new seeds to the vendors.
 2019-07-09 14:00:39 -04:00
Heroman3003
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
Heroman3003
6b55b63b0b Fixes ghost riders (#6252) 
* Fixes ghost riders

* Wider usage permissions for bikes
 2019-07-07 19:41:22 -04:00
Atermonera
1472642b88 Merge pull request #6262 from Mechoid/CivilianExpansion1 
Civilian Expansion 1: The Plantening
 2019-07-07 17:29:32 -04:00
Novacat
55a8036df0 Merge pull request #5442 from VOREStation/upstream-merge-6267 
[MIRROR] Fixes carpeted tables refunding wrong carpet type if nonstandard one was used
 2019-07-06 22:29:20 -04:00
Novacat
1064899b8b Merge pull request #5441 from VOREStation/upstream-merge-6270 
[MIRROR] Fixes invisible ventcrawlers
 2019-07-06 22:29:06 -04:00
Anewbe
256e6ade19 Merge pull request #6267 from Heroman3003/carpetfix 
Fixes carpeted tables refunding wrong carpet type if nonstandard one was used
 2019-07-06 21:35:26 -04:00
Anewbe
a4fc2b9147 Merge pull request #6270 from Heroman3003/inviscrawl 
Fixes invisible ventcrawlers
 2019-07-06 21:35:17 -04:00
Anewbe
f18b82aa2b Merge pull request #6268 from Heroman3003/targetfix 
Fixes aiming at z-shadows breaking aiming
 2019-07-06 21:34:03 -04:00
Heroman
c8d9bce55d Allows to compress coal into carbon sheets 2019-07-07 08:01:31 +10:00
Heroman
c1cef80bf9 Changes lobby screen name to match server name 2019-07-06 06:34:15 +10:00
Spades
5a7bdcebf4 Merge pull request #5378 from Novacat/nova-survival 
Minor Fixes
 2019-07-05 07:04:18 -04:00
Spades
bb7b3fe9cc Merge pull request #5376 from mistyLuminescence/customsay 
Custom Say Verbs
 2019-07-05 07:03:50 -04:00
Spades
0a0a414870 Merge pull request #5375 from Heroman3003/scaling-fix 
Fixes icon scaling on later byond versions
 2019-07-05 07:03:30 -04:00
Spades
f12786365b Merge pull request #5368 from Heroman3003/filling-up-debris-field 
Adds a bunch of PoIs to debris field
 2019-07-05 07:03:18 -04:00
Novacat
d32641e940 Merge pull request #5367 from Novacat/nova-basicfixes 
Enables Language Implants
 2019-07-04 21:08:10 -04:00
Heroman
2c11586f7d Fixes some personal fluff items being selectable in loadout 2019-07-05 09:58:27 +10:00
Novacat
5d8cae8705 Merge pull request #5424 from VOREStation/upstream-merge-6264 
[MIRROR] Fixes alien wood issues
 2019-07-03 23:21:39 -04:00
Atermonera
8952374cce Merge pull request #6264 from Heroman3003/awood 
Fixes alien wood issues
 2019-07-03 23:09:42 -04:00
Atermonera
b30b24450d Merge pull request #6265 from Heroman3003/camerafix 
Fixes technical cameras being affected by random event
 2019-07-03 23:09:33 -04:00
Novacat
0750406ae3 Merge pull request #5421 from VOREStation/upstream-merge-6254 
[MIRROR] Fixes farmbot infinite looping
 2019-07-03 14:10:46 -04:00
Novacat
78fc028dba Merge pull request #5420 from VOREStation/upstream-merge-6256 
[MIRROR] Fixes '1' message from MCs
 2019-07-03 13:54:17 -04:00
Novacat
74060aef32 Merge pull request #5419 from VOREStation/upstream-merge-6260 
[MIRROR] Properly splits security and engineering alarms
 2019-07-03 13:54:07 -04:00
Anewbe
61a95813c2 Merge pull request #6254 from Heroman3003/farmbotfix 
Fixes farmbot infinite looping
 2019-07-03 13:11:22 -04:00
Anewbe
f4feaf1363 Merge pull request #6256 from Heroman3003/fixtheone 
Fixes '1' message from MCs
 2019-07-03 13:11:12 -04:00
Anewbe
e08616f1ee Merge pull request #6260 from Heroman3003/alarmchange 
Properly splits security and engineering alarms
 2019-07-03 13:11:00 -04:00
Anewbe
02e1db9dfd Merge pull request #6261 from Heroman3003/botanfix 
Fixes atmosphere targeted mutation editing wrong plant traits
 2019-07-03 13:09:46 -04:00
Anewbe
e223a8b4ad Merge pull request #6251 from Heroman3003/reactionfix 
Fixes retaliate mobs ignoring melee attacks
 2019-07-02 08:28:01 -04:00
Heroman
96ff9f43b9 And to exploration vendor too 2019-07-02 12:10:50 +10:00
Heroman
d0b9ab620a Adds mining GPS to mining vendor 2019-07-02 12:08:05 +10:00
Novacat
1fd999075c Merge pull request #5408 from VOREStation/upstream-merge-6249 
[MIRROR] Makes lead icon display stack
 2019-07-01 21:09:51 -04:00
Novacat
e320d73188 Merge pull request #5407 from VOREStation/upstream-merge-6250 
[MIRROR] Allows to interact with turf itself in Turf tab
 2019-07-01 21:09:43 -04:00
Novacat
cf9986a2f2 Merge pull request #5406 from VOREStation/upstream-merge-6248 
[MIRROR] Adds more GPS variety
 2019-07-01 21:09:34 -04:00
Novacat
a56eb4e514 Merge pull request #5405 from VOREStation/upstream-merge-6247 
[MIRROR] Fixes runtime and GPS problem with invalid Z-levels
 2019-07-01 21:09:26 -04:00
Atermonera
9d207a28fd Merge pull request #6249 from Heroman3003/lead-stack 
Makes lead icon display stack
 2019-07-01 20:48:45 -04:00
Atermonera
02ea14d239 Merge pull request #6250 from Heroman3003/altclickup 
Allows to interact with turf itself in Turf tab
 2019-07-01 20:48:36 -04:00
Atermonera
4f601a94b8 Merge pull request #6248 from Heroman3003/gpsing 
Adds more GPS variety
 2019-07-01 20:47:22 -04:00
Atermonera
58c2b2311e Merge pull request #6247 from mistyLuminescence/zruntime 
Fixes runtime and GPS problem with invalid Z-levels
 2019-07-01 20:46:10 -04:00
Atermonera
3d31a77514 Multi-Tile Objects, Multi-Tile Hovershuttle 2019-07-01 20:43:53 -04:00
Anewbe
b820ac6844 Merge pull request #6246 from Heroman3003/lightfix 
Fixes construction of lights
 2019-06-30 19:40:15 -04:00