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

# Conflicts:
#	code/game/objects/items/weapons/tools.dm
#	code/modules/mob/dead/observer/say.dm
#	config/custom_items.txt
#	vorestation.dme

2017-04-13 19:43:56 -04:00

..

admin

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

2017-04-13 19:43:56 -04:00

alarm

Make AR glasses show messages like HUDs

2017-03-28 16:09:14 -04:00

assembly

…

awaymissions

Added vore capabilies to the new simple_animal system.

2017-03-22 19:32:19 -04:00

blob

…

busy_space

…

client

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

2017-04-13 19:43:56 -04:00

clothing

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

2017-04-13 19:43:56 -04:00

customitems

…

detectivework

…

economy

…

error_handler

…

events

Disables Ian storms

2017-03-26 23:45:56 -04:00

examine

Actually gets the HI name right

2017-03-24 15:27:55 -05:00

ext_scripts

…

flufftext

…

food

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync

2017-04-01 19:19:42 -04:00

gamemaster

…

games

Adds 500 Cards against The Galaxy cards

2017-03-29 12:52:20 -04:00

genetics

…

ghosttrap

…

holodeck

…

hydroponics

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync

2017-04-01 19:19:42 -04:00

icon generation

…

integrated_electronics

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync

2017-04-01 19:19:42 -04:00

interserver shipping

…

library

…

lighting

…

maps

…

materials

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync

2017-04-01 19:19:42 -04:00

media

Oops. Accidently did mediamanager shutdown wrong. Fixed.

2017-03-28 19:36:56 -04:00

metric

…

mining

…

mob

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

2017-04-13 19:43:56 -04:00

multiz

…

nano

…

organs

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

2017-04-13 19:43:56 -04:00

overmap

…

paperwork

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync

2017-04-01 19:19:42 -04:00

planet

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync

2017-04-01 19:19:42 -04:00

power

Make cells show correct icon when they spawn

2017-04-02 19:28:11 -04:00

projectiles

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

2017-04-13 19:43:56 -04:00

random_map

…

reagents

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

2017-04-13 19:43:56 -04:00

recycling

…

research

Adds the 'Hunter' Capture Gun

2017-04-02 19:25:27 -04:00

resleeving

Sleevecards!

2017-04-06 17:59:58 -04:00

rogueminer_vr

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

2017-04-13 19:43:56 -04:00

scripting

…

security levels

…

shieldgen

…

shuttles

Bugfix, cleanup, & xenoarch belter access

2017-03-28 18:01:02 -04:00

spells

Added vore capabilies to the new simple_animal system.

2017-03-22 19:32:19 -04:00

supermatter

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into heart_damage_2

2017-03-22 17:29:01 -05:00

surgery

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync

2017-04-01 19:19:42 -04:00

tables

Adds bench presets

2017-03-24 22:46:43 -05:00

telesci

…

turbolift

…

vehicles

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

2017-04-09 09:56:44 -04:00

ventcrawl

…

virus2

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync

2017-04-01 19:19:42 -04:00

vore

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

2017-04-13 19:43:56 -04:00

xenoarcheaology

Added vore capabilies to the new simple_animal system.

2017-03-22 19:32:19 -04:00

xenobio2

…

xgm

…