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

# Conflicts:
#	code/modules/organs/organ_icon.dm

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

..

admin

Merge large polaris changes

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

alarm

…

assembly

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

2017-02-14 20:29:57 -05:00

awaymissions

Merge large polaris changes

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

blob

…

busy_space

Space Chatter

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

client

Merge large polaris changes

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

clothing

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

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

customitems

…

detectivework

…

economy

Ports a large chunk of the map datum system that europa/bay uses.

2017-02-27 07:36:41 -05:00

error_handler

…

events

Initial commit of new map system for Virgo

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

examine

Ports a large chunk of the map datum system that europa/bay uses.

2017-02-27 07:36:41 -05:00

ext_scripts

…

flufftext

…

food

…

gamemaster

Ports a large chunk of the map datum system that europa/bay uses.

2017-02-27 07:36:41 -05:00

games

Merge large polaris changes

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

genetics

…

ghosttrap

…

holodeck

Ports a large chunk of the map datum system that europa/bay uses.

2017-02-27 07:36:41 -05:00

hydroponics

Polaris sync

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

icon generation

…

integrated_electronics

Gives not equal gate the correct icon_state

2017-02-27 18:11:38 -05:00

library

…

lighting

…

maps

…

materials

Merge large polaris changes

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

metric

…

mining

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

2017-02-14 20:29:57 -05:00

mob

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

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

multiz

…

nano

Ports a large chunk of the map datum system that europa/bay uses.

2017-02-27 07:36:41 -05:00

organs

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

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

overmap

…

paperwork

Merge large polaris changes

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

planet

Comment out noisy message

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

power

Merge large polaris changes

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

projectiles

Merge large polaris changes

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

random_map

if you don't rename all of something, bad things happen m'kay kids

2017-02-04 15:46:03 +00:00

reagents

Merge large polaris changes

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

recycling

…

research

Merge large polaris changes

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

resleeving

Initial commit of new map system for Virgo

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

rogueminer_vr

This was always the only commit.

2017-02-17 00:56:53 -05:00

scripting

…

security levels

Ports a large chunk of the map datum system that europa/bay uses.

2017-02-27 07:36:41 -05:00

shieldgen

…

shuttles

Merge large polaris changes

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

spells

Merge large polaris changes

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

supermatter

Ports a large chunk of the map datum system that europa/bay uses.

2017-02-27 07:36:41 -05:00

surgery

More tweaks

2017-02-28 01:13:29 -05:00

tables

…

telesci

Initial commit of new map system for Virgo

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

vehicles

Fixes the key not being able to plug into the ignition.

2017-02-17 03:03:17 +09:00

ventcrawl

Allows maint drones to ventcrawl

2017-02-23 13:44:06 -05:00

virus2

Adds more non-fatal symptoms

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

vore

Permit for cat gun

2017-03-01 19:58:33 -03: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

…