Leshana 5ae26332fa Merge branch 'master' into aro-tether-wip ...

# Conflicts:
#	code/ZAS/_docs.dm
#	code/game/area/areas.dm
#	code/game/objects/explosion.dm
#	code/modules/holodeck/HolodeckControl.dm
#	code/modules/mob/living/say.dm

2017-05-16 00:26:32 -04:00

..

admin

Merge current master in

2017-04-25 20:14:38 -04:00

alarm

…

assembly

…

awaymissions

…

blob

…

busy_space

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

2017-05-08 21:07:45 -04:00

client

Merge branch 'master' into aro-tether-wip

2017-05-16 00:26:32 -04:00

clothing

Merge branch 'master' into aro-tether-wip

2017-05-16 00:26:32 -04:00

customitems

…

detectivework

…

economy

…

error_handler

…

events

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

2017-04-25 15:04:54 -04:00

examine

…

ext_scripts

…

flufftext

…

food

…

gamemaster

…

games

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

2017-05-08 21:07:45 -04:00

genetics

…

ghosttrap

…

holodeck

Holodeck menu tweak

2017-05-14 00:09:24 -04:00

hydroponics

Merge branch 'master' into aro-tether-wip

2017-05-16 00:26:32 -04:00

icon generation

…

integrated_electronics

Fixes Logic Circuits

2017-05-06 16:35:06 -04:00

library

…

lighting

Prevent lighting_overlay objects from being moved around.

2017-05-15 17:15:47 -04:00

lore_codex

Merge pull request #1430 from VOREStation/aro-announcer

2017-04-25 19:08:43 -04:00

maps

…

materials

Merge current master in

2017-04-25 20:14:38 -04:00

media

Convert to using Mediamanager lobby music

2017-05-08 02:33:46 -04:00

metric

…

mining

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

2017-04-25 15:04:54 -04:00

mob

Merge branch 'master' into aro-tether-wip

2017-05-16 00:26:32 -04:00

multiz

Open space set to dynamic_lighting = 0

2017-05-15 20:45:57 -04:00

nano

…

organs

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

2017-05-08 21:07:45 -04:00

overmap

…

paperwork

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

2017-05-08 21:07:45 -04:00

planet

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

2017-04-25 15:04:54 -04:00

power

Adds Ender Cable

2017-05-04 18:50:41 -04:00

projectiles

Merge branch 'master' into aro-tether-wip

2017-05-16 00:26:32 -04:00

random_map

Merge branch 'master' into aro-tether-wip

2017-05-16 00:26:32 -04:00

reagents

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

2017-05-08 21:07:45 -04:00

recycling

…

research

Adds the Algae Oxygen Generator

2017-05-03 01:54:55 -04:00

resleeving

Merge branch 'master' into aro-tether-wip

2017-05-16 00:26:32 -04:00

rogueminer_vr

…

scripting

…

security levels

…

shieldgen

…

shuttles

Things landing on other things fixes

2017-05-14 23:54:57 -04:00

spells

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

2017-05-08 21:07:45 -04:00

supermatter

…

surgery

…

tables

Table Iconstate Cache

2017-05-15 22:38:53 -04:00

telesci

Converts our own uses of PoolOrNew to use just new()

2017-05-08 21:24:47 -04:00

turbolift

Things landing on other things fixes

2017-05-14 23:54:57 -04:00

vehicles

Fix VOREStation use of color macros so we pass the new stringent macro tests.

2017-05-08 22:34:13 -04:00

ventcrawl

…

virus2

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

2017-04-25 15:04:54 -04:00

vore

Merge branch 'master' into aro-tether-wip

2017-05-16 00:26:32 -04:00

xenoarcheaology

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

2017-05-08 21:07:45 -04:00

xenobio2

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

2017-05-08 21:07:45 -04:00

xgm

…