Leshana 7f60e98633 Merge remote-tracking branch 'polaris/stonedmc-update' into stonedmc-update ...

# Conflicts:
#	code/_helpers/game.dm
#	code/controllers/subsystem.dm
#	code/controllers/subsystems/garbage.dm
#	code/game/objects/items/devices/PDA/PDA.dm
#	maps/RandomZLevels/stationCollision.dm
#	maps/RandomZLevels/wildwest.dm
#	maps/~map_system/maps.dm
#	vorestation.dme

2017-06-11 15:35:42 -04:00

..

admin

Merge remote-tracking branch 'polaris/stonedmc-update' into stonedmc-update

2017-06-11 15:35:42 -04:00

alarm

…

assembly

Port of @PsiOmegaDelta's Baystation12/Baystation12#16820

2017-06-10 22:41:51 -04:00

awaymissions

Updated VOREStation specific files for the ammo path reorganization.

2017-06-02 12:18:13 -04:00

blob

…

busy_space

…

client

Merge pull request #1693 from VOREStation/aro-sleevemate

2017-06-11 14:39:43 -04:00

clothing

Destroy() cleanups in VOREStation code

2017-06-10 22:44:03 -04:00

customitems

…

detectivework

Update rag.dm

2017-06-04 18:26:28 -04:00

economy

…

error_handler

…

events

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

2017-06-01 17:27:00 -04:00

examine

Tweaks Statpanel and System Initialization

2017-06-01 21:42:08 -04:00

ext_scripts

…

flufftext

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

2017-06-01 17:27:00 -04:00

food

Egg laying implant, yo!

2017-06-03 15:59:45 +02:00

gamemaster

…

games

…

genetics

…

ghosttrap

…

holodeck

…

holomap

…

hydroponics

Port of @PsiOmegaDelta's Baystation12/Baystation12#16820

2017-06-10 22:41:51 -04:00

icon generation

…

integrated_electronics

…

library

…

lighting

More and more Destroy() cleanups all across the board - Return qdel hints.

2017-06-10 22:41:51 -04:00

lore_codex

…

maps

…

materials

…

media

Destroy() cleanups in VOREStation code

2017-06-10 22:44:03 -04:00

metric

…

mining

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

2017-06-01 17:27:00 -04:00

mob

Destroy() cleanups in VOREStation code

2017-06-10 22:44:03 -04:00

multiz

Destroy() cleanups in VOREStation code

2017-06-10 22:44:03 -04:00

nano

Finishing Up NIFs

2017-06-06 19:34:41 -04:00

nifsoft

Destroy() cleanups in VOREStation code

2017-06-10 22:44:03 -04:00

organs

Port of @PsiOmegaDelta's Baystation12/Baystation12#16820

2017-06-10 22:41:51 -04:00

overmap

…

paperwork

…

planet

…

power

More and more Destroy() cleanups all across the board - Return qdel hints.

2017-06-10 22:41:51 -04:00

projectiles

Updated VOREStation specific files for the ammo path reorganization.

2017-06-02 12:18:13 -04:00

random_map

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

2017-06-01 17:27:00 -04:00

reagents

Destroy() cleanups in VOREStation code

2017-06-10 22:44:03 -04:00

recycling

…

research

Adds the SleeveMate 3200

2017-06-11 13:55:04 -04:00

resleeving

Merge pull request #1693 from VOREStation/aro-sleevemate

2017-06-11 14:39:43 -04:00

rogueminer_vr

…

scripting

…

security levels

…

shieldgen

Port of @PsiOmegaDelta's Baystation12/Baystation12#16820

2017-06-10 22:41:51 -04:00

shuttles

…

spells

…

supermatter

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

2017-06-01 17:27:00 -04:00

surgery

Surgery and syringe fixes

2017-06-09 02:11:23 -04:00

tables

More and more Destroy() cleanups all across the board - Return qdel hints.

2017-06-10 22:41:51 -04:00

telesci

Destroy() cleanups in VOREStation code

2017-06-10 22:44:03 -04:00

turbolift

…

vehicles

…

ventcrawl

…

virus2

…

vore

Merge pull request #1667 from SpoopyLizz/master

2017-06-11 14:40:31 -04:00

xenoarcheaology

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

2017-06-09 22:54:16 -04:00

xenobio2

…

xgm

…