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

# Conflicts:
#	config/custom_items.txt

2017-11-07 08:17:53 -05:00

..

admin

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

2017-10-29 18:14:56 -04:00

alarm

…

assembly

…

awaymissions

…

blob

…

busy_space

Polaris Sync

2017-11-04 13:37:13 -04:00

client

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

2017-11-07 08:17:53 -05:00

clothing

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

2017-11-07 08:17:53 -05:00

customitems

Custom backpacks overwrite a worn backpack

2017-10-16 23:42:23 -05:00

detectivework

…

economy

…

error_handler

…

events

Merge pull request #2282 from Cyantime/grublarvs

2017-10-12 18:12:31 -04:00

examine

Merge pull request #4098 from Neerti/10/15/2017_surface_stuff

2017-10-19 09:36:03 -05:00

ext_scripts

…

flufftext

…

food

…

gamemaster

…

games

Polaris sync

2017-10-27 15:30:24 -04:00

genetics

…

ghosttrap

…

holodeck

…

holomap

…

hydroponics

…

icon generation

…

integrated_electronics

Added full stops to description text

2017-10-29 20:08:44 +01:00

interserver shipping

…

library

…

lighting

…

lore_codex

Polaris sync

2017-10-27 15:30:24 -04:00

maps

…

materials

Polaris sync

2017-10-27 15:30:24 -04:00

media

…

metric

…

mining

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

2017-10-29 18:14:56 -04:00

mob

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

2017-11-07 08:17:53 -05:00

multiz

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

2017-11-07 08:17:53 -05:00

nano

…

nifsoft

Removes the flashlight stuffs.

2017-10-27 23:43:57 +03:00

organs

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

2017-11-07 08:17:53 -05:00

overmap

…

paperwork

Polaris Sync

2017-11-04 13:37:13 -04:00

planet

Polaris Sync

2017-10-16 22:16:24 -04:00

power

Polaris Sync

2017-11-04 13:37:13 -04:00

projectiles

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

2017-10-29 18:14:56 -04:00

random_map

…

reagents

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

2017-11-07 08:17:53 -05:00

recycling

…

research

Polaris Sync

2017-11-04 13:37:13 -04:00

resleeving

Merge pull request #2348 from Anasari/ResleevingSucks

2017-10-30 13:56:01 -04:00

rogueminer_vr

…

scripting

…

security levels

…

shieldgen

Adds New Advanced Shields, Tweaks

2017-10-26 20:55:13 -04:00

shuttles

Polaris Sync

2017-10-16 22:16:24 -04:00

spells

…

surgery

Polaris Sync

2017-10-16 22:16:24 -04:00

tables

…

telesci

…

turbolift

…

vehicles

…

ventcrawl

…

virus2

…

vore

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

2017-11-07 08:17:53 -05:00

xenoarcheaology

Polaris sync

2017-10-27 15:30:24 -04:00

xenobio

…

xenobio2

…

xgm

…