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

# Conflicts:
#	code/modules/mob/living/carbon/human/species/station/prometheans.dm
#	code/modules/mob/living/carbon/human/species/station/seromi.dm
#	code/modules/mob/living/silicon/robot/robot_modules.dm
#	config/custom_items.txt
#	icons/obj/gun.dmi
#	maps/virgo-1.dmm
#	vorestation.dme

2017-02-03 21:35:22 -05:00

..

admin

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

2017-02-03 21:35:22 -05:00

alarm

…

assembly

…

awaymissions

Polaris sync

2017-02-01 15:08:45 -05:00

blob

…

client

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

2017-02-03 21:35:22 -05:00

clothing

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

2017-02-03 21:35:22 -05:00

customitems

…

detectivework

…

economy

…

error_handler

…

events

Polaris sync

2017-02-01 15:08:45 -05:00

examine

…

ext_scripts

…

flufftext

…

food

…

gamemaster

…

games

Polaris sync

2017-02-01 15:08:45 -05:00

genetics

…

ghosttrap

…

holodeck

…

hydroponics

Polaris sync

2017-02-01 15:08:45 -05:00

icon generation

…

integrated_electronics

Merge pull request #2965 from Neerti/1/28/17_magnets_how_do_they_work

2017-01-28 14:03:51 -06:00

library

…

lighting

…

maps

…

materials

Flesh Turfs

2017-01-24 23:48:50 -03:00

metric

…

mining

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

2017-02-03 21:35:22 -05:00

mob

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

2017-02-03 21:35:22 -05:00

multiz

…

nano

…

organs

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

2017-02-03 21:35:22 -05:00

overmap

…

paperwork

…

power

…

projectiles

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

2017-02-03 21:35:22 -05:00

random_map

…

reagents

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

2017-02-03 21:35:22 -05:00

recycling

…

research

Polaris sync

2017-02-01 15:08:45 -05:00

scripting

…

security levels

…

shieldgen

…

shuttles

…

spells

…

supermatter

…

surgery

Surgical tools will no longer cause damage on help intent

2017-01-21 18:34:05 -06:00

tables

…

vehicles

…

ventcrawl

…

virus2

Adds more non-fatal symptoms

2017-02-02 18:35:03 -05:00

vore

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

2017-02-03 21:35:22 -05:00

xenoarcheaology

Polaris sync

2017-02-01 15:08:45 -05:00

xenobio2

Polaris sync

2017-02-01 15:08:45 -05:00

xgm

…