Verkister a5ff9415fa Merge branch 'master' of https://github.com/VOREStation/VOREStation into gimmicktraits ...

# Conflicts:
#	code/modules/mob/living/carbon/human/species/station/blank_vr.dm

2017-11-15 17:52:15 +02:00

..

admin

Polaris Sync

2017-11-10 11:37:41 -05:00

alarm

…

assembly

…

awaymissions

…

blob

…

busy_space

Polaris Sync

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

client

Adds a cosmetic "armor vest" taur saddlebag subtype.

2017-11-14 16:18:47 +02:00

clothing

Polaris Sync

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

customitems

…

detectivework

…

economy

gives vatties an econ modifier

2017-11-04 17:15:23 -07:00

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

…

games

Polaris sync

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

genetics

…

ghosttrap

…

holodeck

…

holomap

…

hydroponics

…

icon generation

…

integrated_electronics

Merge pull request #4246 from MarinaGryphon/IE-Fixes

2017-11-09 21:22:35 -06:00

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

Polaris sync

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

mob

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

2017-11-15 17:52:15 +02:00

multiz

Makes stairs function as before

2017-11-12 01:15:33 -05:00

nano

…

nifsoft

Removes the flashlight stuffs.

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

organs

Emergency bugfixes

2017-11-05 00:52:06 -04:00

overmap

…

paperwork

Polaris Sync

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

planet

…

power

Polaris Sync

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

projectiles

Polaris Sync

2017-11-10 11:37:41 -05:00

random_map

…

reagents

Polaris Sync

2017-11-10 11:37:41 -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

…

spells

…

surgery

…

tables

…

telesci

…

turbolift

…

vehicles

…

ventcrawl

…

virus2

…

vore

Merge pull request #2444 from Cameron653/master

2017-11-12 11:52:03 -05:00

xenoarcheaology

Polaris sync

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

xenobio

…

xenobio2

…

xgm

…