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

# Conflicts:
#	code/modules/mob/living/silicon/robot/dogborg/dog_modules_vr.dm
#	code/modules/mob/living/silicon/robot/robot_modules_vr.dm
#	config/custom_items.txt

2017-11-25 11:49:28 -05:00

..

admin

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

2017-11-25 11:49:28 -05:00

alarm

…

assembly

…

awaymissions

…

blob

…

busy_space

Update organizations_vr.dm

2017-11-15 19:45:25 -05:00

client

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

2017-11-25 11:49:28 -05:00

clothing

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

2017-11-25 11:49:28 -05:00

customitems

…

detectivework

…

economy

…

error_handler

…

events

Stop causing bots to kill everyone, jesus christ

2017-11-13 17:38:19 -05:00

examine

…

ext_scripts

…

flufftext

…

food

…

gamemaster

Some various map tweaks, and also carp nerf

2017-11-20 15:35:32 -05:00

games

…

genetics

…

ghosttrap

…

holodeck

…

holomap

…

hydroponics

…

icon generation

…

integrated_electronics

Sanitizes Circuit Inputs

2017-11-17 18:38:48 -05:00

interserver shipping

…

library

…

lighting

…

lore_codex

…

maps

…

materials

…

media

…

metric

…

mining

…

mob

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

2017-11-25 11:49:28 -05:00

multiz

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

2017-11-25 11:49:28 -05:00

nano

…

nifsoft

…

organs

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

2017-11-25 11:49:28 -05:00

overmap

…

paperwork

Polaris sync

2017-11-17 19:27:03 -05:00

planet

…

power

Polaris sync

2017-11-17 19:27:03 -05:00

projectiles

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

2017-11-25 11:35:10 -05:00

random_map

…

reagents

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

2017-11-25 11:35:10 -05:00

recycling

…

research

…

resleeving

…

rogueminer_vr

…

scripting

…

security levels

…

shieldgen

changes max shield radius

2017-11-16 02:17:06 -08:00

shuttles

…

spells

…

surgery

…

tables

…

telesci

…

turbolift

…

vehicles

…

ventcrawl

…

virus2

…

vore

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

2017-11-25 11:49:28 -05:00

xenoarcheaology

…

xenobio

…

xenobio2

…

xgm

…