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

# Conflicts:
#	code/modules/admin/verbs/adminhelp.dm
#	maps/virgo-1.dmm

2017-01-21 01:42:11 -05:00

..

admin

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

2017-01-21 01:42:11 -05:00

alarm

…

assembly

…

awaymissions

…

blob

…

client

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

2017-01-21 01:42:11 -05:00

clothing

Merge branch 'master' of https://github.com/Repede/YawnWiderStation

2016-12-30 15:36:43 -05:00

customitems

…

detectivework

…

economy

…

error_handler

…

events

Polaris December Sync

2016-12-10 09:51:11 -05:00

examine

…

ext_scripts

…

flufftext

…

food

…

gamemaster

…

games

…

genetics

…

ghosttrap

…

holodeck

…

hydroponics

Makes mushroom sprites show up correctly when harvested (#788)

2016-12-30 23:06:57 -05:00

icon generation

…

integrated_electronics

Also fixes EPv2 circuit not pushing data.

2017-01-14 14:04:19 -05:00

library

…

lighting

…

maps

…

materials

Replaces [stack]/fifty atoms with atoms that spawn the normal stack

2016-12-17 17:27:04 -06:00

metric

…

mining

…

mob

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

2017-01-21 01:42:11 -05:00

multiz

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

2016-12-18 00:56:03 -05:00

nano

…

organs

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

2017-01-21 01:42:11 -05:00

overmap

…

paperwork

Polaris December Sync

2016-12-10 09:51:11 -05:00

power

Fixes lights for macros, hopefully.

2016-12-29 02:05:17 -05:00

projectiles

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

2017-01-21 01:42:11 -05:00

random_map

Replaces [stack]/fifty atoms with atoms that spawn the normal stack

2016-12-17 17:27:04 -06:00

reagents

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

2017-01-21 01:42:11 -05:00

recycling

…

research

Merge pull request #837 from Cameron653/master

2017-01-19 00:39:08 -05:00

scripting

…

security levels

…

shieldgen

…

shuttles

…

spells

…

supermatter

…

surgery

Lungs that are repaired will stop causing oxyloss

2016-11-27 16:50:17 -06:00

tables

…

vehicles

…

ventcrawl

…

virus2

…

vore

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

2017-01-21 01:42:11 -05:00

xenoarcheaology

Voremob tweaks, bellies now escapable (#783)

2016-12-30 11:27:07 -05:00

xenobio2

Polaris December Sync

2016-12-10 09:51:11 -05:00

xgm

…