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

# Conflicts:
#	code/modules/mob/language/station_vr.dm
#	code/modules/surgery/robotics.dm
#	config/custom_items.txt

2017-03-17 19:28:02 -04:00

..

admin

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

2017-03-17 19:28:02 -04:00

alarm

…

assembly

…

awaymissions

Updated our custom items and maps to account for the path changes for boots!

2017-03-06 21:46:35 -05:00

blob

…

busy_space

…

client

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

2017-03-17 19:28:02 -04:00

clothing

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

2017-03-17 19:28:02 -04:00

customitems

Adds a check for custom items

2017-03-06 21:25:54 -06:00

detectivework

…

economy

Fixes sliceable food and slices

2017-03-10 19:49:15 +00:00

error_handler

…

events

Merge pull request #1194 from VOREStation/appendicitis-vr

2017-03-17 18:03:30 -04:00

examine

…

ext_scripts

…

flufftext

…

food

Fix flour!!!

2017-03-13 18:01:29 -04:00

gamemaster

Make sure that the canisters selected have a bit o' air in them.

2017-03-11 19:02:24 -05:00

games

…

genetics

…

ghosttrap

…

holodeck

…

hydroponics

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

2017-03-06 20:58:38 -05:00

icon generation

…

integrated_electronics

Resleeving tweaks, fix compile warning

2017-03-06 14:22:11 -05:00

interserver shipping

…

library

…

lighting

…

maps

…

materials

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

2017-03-06 20:58:38 -05:00

metric

Fixed paths references to obsolete path /obj/item/clothing/shoes/combat

2017-03-06 21:58:39 -05:00

mining

…

mob

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

2017-03-17 19:28:02 -04:00

multiz

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

2017-03-10 20:34:12 -05:00

nano

Merge pull request #1187 from VOREStation/apc-map

2017-03-15 22:55:10 -04:00

organs

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

2017-03-17 19:28:02 -04:00

overmap

…

paperwork

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-polsync

2017-03-11 18:47:17 -05:00

planet

…

power

Enhances power monitor computers to use the nano-map to show APC locations.

2017-03-13 20:50:30 -04:00

projectiles

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

2017-03-10 20:34:12 -05:00

random_map

…

reagents

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

2017-03-17 19:28:02 -04:00

recycling

…

research

Merge pull request #1146 from Screemonster/particlescience

2017-03-10 18:07:29 -05:00

resleeving

Fixes species with very low health in growpod

2017-03-13 11:47:14 -04:00

rogueminer_vr

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

2017-03-17 19:28:02 -04:00

scripting

…

security levels

…

shieldgen

…

shuttles

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

2017-03-06 20:58:38 -05:00

spells

…

supermatter

…

surgery

Allow MMI/Posi/Digi brains w/o minds to be put in

2017-03-12 01:15:40 -05:00

tables

WR_SC_Map_Changes

2017-03-08 17:44:48 -08:00

telesci

…

turbolift

Ports Turbolifts from Bay.

2017-03-04 21:35:00 -05:00

vehicles

…

ventcrawl

Don't allow ventcrawling if vents are welded

2017-03-13 02:00:40 -04:00

virus2

Now in disease form

2017-03-08 19:52:55 -05:00

vore

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

2017-03-17 19:28:02 -04:00

xenoarcheaology

…

xenobio2

…

xgm

…