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

# Conflicts:
#	code/game/objects/items/blueprints.dm
#	vorestation.dme

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

..

admin

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

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

alarm

…

assembly

…

awaymissions

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

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

blob

…

busy_space

Space Chatter

2017-03-01 15:32:43 -05:00

client

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

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

clothing

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

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

customitems

…

detectivework

…

economy

…

error_handler

…

events

Initial commit of new map system for Virgo

2017-03-02 23:34:43 -05:00

examine

…

ext_scripts

…

flufftext

…

food

…

gamemaster

…

games

Merge large polaris changes

2017-03-02 22:44:17 -05:00

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

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

…

mining

…

mob

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

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

multiz

Adds Multi-Z Test Map

2017-03-03 09:40:34 -05:00

nano

Adds a console to medical, engineering, security AR glasses

2017-03-06 00:33:08 -05:00

organs

Adds Serdy's Robobutt

2017-03-04 17:25:17 -05:00

overmap

…

paperwork

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

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

planet

Comment out noisy message

2017-03-03 00:43:35 -05:00

power

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

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

projectiles

Merge large polaris changes

2017-03-02 22:44:17 -05:00

random_map

…

reagents

Merge pull request #1089 from Yoshax/ewwwfatpeople

2017-03-04 18:35:07 -05:00

recycling

…

research

Improves AR glasses, makes them available

2017-03-05 20:58:59 -05:00

resleeving

Display OOC notes on mind and body records

2017-03-06 15:09:55 -05:00

rogueminer_vr

…

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

Merge large polaris changes

2017-03-02 22:44:17 -05:00

supermatter

…

surgery

…

tables

…

telesci

Initial commit of new map system for Virgo

2017-03-02 23:34:43 -05:00

turbolift

Ports Turbolifts from Bay.

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

vehicles

Some personal changes to my items and adds a dune buggy for science expeditions.

2017-03-02 23:17:04 -08:00

ventcrawl

…

virus2

…

vore

Merge pull request #1114 from VOREStation/aro-hudbetter

2017-03-06 03:10:33 -05:00

xenoarcheaology

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

2017-03-03 19:39:56 -05:00

xenobio2

Merge large polaris changes

2017-03-02 22:44:17 -05:00

xgm

…