Verkister b0199bb80e Merge branch 'master' of https://github.com/VOREStation/VOREStation into returnofthelongpup ...

# Conflicts:
#	icons/vore/custom_clothes_vr.dmi

2017-09-28 08:50:38 +03:00

..

admin

HOTFIX

2017-09-21 20:26:48 -04:00

alarm

…

assembly

…

awaymissions

Some disorganizes changes by Aces

2017-09-21 03:22:20 -04:00

blob

…

busy_space

Some disorganizes changes by Aces

2017-09-21 03:22:20 -04:00

client

HOTFIX

2017-09-21 20:26:48 -04:00

clothing

Some disorganizes changes by Aces

2017-09-21 03:22:20 -04:00

customitems

…

detectivework

…

economy

…

error_handler

…

events

Disables grubs until somewhat reworked

2017-09-22 23:42:01 -04:00

examine

…

ext_scripts

…

flufftext

Adds a bunch of dreams. (#3888)

2017-09-20 13:51:14 -05:00

food

Polaris sync

2017-09-15 21:17:34 -04:00

gamemaster

…

games

…

genetics

…

ghosttrap

…

holodeck

…

holomap

…

hydroponics

HOTFIX

2017-09-21 20:26:48 -04:00

icon generation

…

integrated_electronics

…

library

…

lighting

…

lore_codex

…

maps

…

materials

HOTFIX

2017-09-21 20:26:48 -04:00

media

…

metric

…

mining

…

mob

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

2017-09-28 08:50:38 +03:00

multiz

Catwalks and Railings

2017-09-16 00:54:33 -07:00

nano

…

nifsoft

Makes the thermal vision NIF software illegal.

2017-09-12 11:12:44 -04:00

organs

HOTFIX

2017-09-21 20:26:48 -04:00

overmap

…

paperwork

Polaris sync

2017-09-15 21:17:34 -04:00

planet

…

power

Polaris sync

2017-09-15 21:17:34 -04:00

projectiles

HOTFIX

2017-09-21 20:26:48 -04:00

random_map

…

reagents

fixes smol bug

2017-09-24 18:39:44 +02:00

recycling

…

research

HOTFIX

2017-09-21 20:26:48 -04:00

resleeving

…

rogueminer_vr

…

scripting

…

security levels

…

shieldgen

…

shuttles

…

spells

…

supermatter

…

surgery

HOTFIX

2017-09-21 20:26:48 -04:00

tables

HOTFIX

2017-09-21 20:26:48 -04:00

telesci

…

turbolift

…

vehicles

…

ventcrawl

…

virus2

…

vore

Quick fix to get rid of warnings on compile.

2017-09-27 21:01:48 -04:00

xenoarcheaology

HOTFIX

2017-09-21 20:26:48 -04:00

xenobio

…

xenobio2

Polaris sync

2017-09-15 21:17:34 -04:00

xgm

…