Kelshark e3be545fba Merge branch 'master' of https://github.com/VOREStation/VOREStation ...

# Conflicts:
#	config/custom_items.txt
#	config/jobwhitelist.txt
#	maps/tether/tether-03-station.dmm

2017-09-18 18:46:15 -04:00

..

admin

Merge branch 'master' of https://github.com/VOREStation/VOREStation

2017-09-18 18:46:15 -04:00

alarm

…

assembly

Updates Tools

2017-08-03 04:49:23 -04:00

awaymissions

This should be anchored...

2017-08-30 17:40:26 -04:00

blob

Updates Tools

2017-08-03 04:49:23 -04:00

busy_space

Imperial Military Update

2017-09-02 04:07:25 -04:00

client

Merge branch 'master' of https://github.com/VOREStation/VOREStation

2017-09-18 18:46:15 -04:00

clothing

Merge branch 'master' of https://github.com/VOREStation/VOREStation

2017-09-18 18:46:15 -04:00

customitems

…

detectivework

Polaris sync

2017-08-06 19:07:17 -04:00

economy

aliens don't get paid as much

2017-08-11 12:19:28 -04:00

error_handler

…

events

Revert "Adds a new event - Solargrubs!"

2017-09-09 12:24:37 -04:00

examine

Updates Tools

2017-08-03 04:49:23 -04:00

ext_scripts

…

flufftext

Polaris sync

2017-08-06 19:07:17 -04:00

food

Polaris sync

2017-08-06 19:07:17 -04:00

gamemaster

…

games

…

genetics

…

ghosttrap

…

holodeck

Polaris sync

2017-08-06 19:07:17 -04:00

holomap

…

hydroponics

Polaris sync

2017-08-06 19:07:17 -04:00

icon generation

…

integrated_electronics

Tesla relays will no longer draw power from the local APC when their device's cell is full.

2017-08-20 17:38:39 -05:00

interserver shipping

…

library

Updates Tools

2017-08-03 04:49:23 -04:00

lighting

…

lore_codex

Imperial Military Update

2017-09-02 04:07:25 -04:00

maps

…

materials

Polaris sync

2017-08-06 19:07:17 -04:00

media

…

metric

…

mining

Merge branch 'master' of https://github.com/VOREStation/VOREStation

2017-08-18 08:14:12 -04:00

mob

Merge branch 'master' of https://github.com/VOREStation/VOREStation

2017-09-18 18:46:15 -04:00

multiz

Merge branch 'master' of https://github.com/VOREStation/VOREStation

2017-09-03 12:49:08 -04:00

nano

…

nifsoft

Merge pull request #1913 from Cameron653/SIZEGUN

2017-08-06 17:19:21 -04:00

organs

Merge branch 'master' of https://github.com/VOREStation/VOREStation

2017-09-03 12:49:08 -04:00

overmap

…

paperwork

Polaris Sync

2017-08-28 20:52:11 -04:00

planet

…

power

Polaris Sync

2017-08-28 20:52:11 -04:00

projectiles

Merge branch 'master' of https://github.com/VOREStation/VOREStation

2017-09-03 12:49:08 -04:00

random_map

Polaris Sync

2017-08-28 20:52:11 -04:00

reagents

Revert "Adds a new event - Solargrubs!"

2017-09-09 12:24:37 -04:00

recycling

Updates Tools

2017-08-03 04:49:23 -04:00

research

Polaris Sync

2017-08-28 20:52:11 -04:00

resleeving

Should fix the wings

2017-08-24 22:43:55 -04:00

rogueminer_vr

…

scripting

…

security levels

Updates Tools

2017-08-03 04:49:23 -04:00

shieldgen

Updates Tools

2017-08-03 04:49:23 -04:00

shuttles

Polaris Sync

2017-08-28 20:52:11 -04:00

spells

Polaris sync

2017-08-06 19:07:17 -04:00

supermatter

Polaris sync

2017-08-06 19:07:17 -04:00

surgery

Polaris sync

2017-08-06 19:07:17 -04:00

tables

Polaris sync

2017-08-06 19:07:17 -04:00

telesci

…

turbolift

Emagging lift doors should no longer be a thing

2017-08-30 13:54:45 +12:00

vehicles

Merge branch 'master' of https://github.com/VOREStation/VOREStation

2017-08-18 08:14:12 -04:00

ventcrawl

…

virus2

Polaris sync

2017-08-06 19:07:17 -04:00

vore

Merge branch 'master' of https://github.com/VOREStation/VOREStation

2017-09-18 18:46:15 -04:00

xenoarcheaology

Polaris sync

2017-08-06 19:07:17 -04:00

xenobio2

…

xgm

…