Leshana 3c3dac7102 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-01-19 ...

# Conflicts:
#	code/_onclick/hud/hud.dm
#	code/modules/clothing/glasses/glasses.dm
#	code/modules/mob/living/carbon/human/update_icons.dm
#	maps/southern_cross/southern_cross-1.dmm
#	maps/southern_cross/southern_cross-3.dmm
#	maps/southern_cross/southern_cross-6.dmm
#	vorestation.dme

2018-01-19 17:52:25 -05:00

..

admin

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

2018-01-19 17:52:25 -05:00

alarm

VS: Planes shenanigans. Begins 'plane' work, for VS specific things.

2018-01-14 00:40:00 -05:00

assembly

…

awaymissions

Knife path fix for VS trashpiles and a fluff item

2018-01-18 15:48:14 -05:00

blob

…

blob2

Fixes Blob Tasering

2018-01-17 14:19:40 -05:00

busy_space

…

client

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

2018-01-19 17:52:25 -05:00

clothing

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

2018-01-19 17:52:25 -05:00

customitems

…

detectivework

…

economy

…

error_handler

…

events

Make the Metor Strike random event be configurable per map.

2018-01-17 11:04:20 -05:00

examine

Fixes 'varient'

2018-01-08 16:42:20 -05:00

ext_scripts

…

flufftext

…

food

…

gamemaster

…

games

…

genetics

…

ghosttrap

…

holodeck

Planes Framework (#4545)

2018-01-17 13:45:54 -06:00

holomap

…

hydroponics

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

2018-01-19 17:52:25 -05:00

icon generation

…

integrated_electronics

Update reagents.dm

2018-01-07 06:05:33 -05:00

library

…

lighting

Fix 3 server errors (#4578)

2018-01-18 22:23:43 -06:00

lore_codex

…

maps

Fixes #4522 - Make maploader correctly read lists of numbers, paths, etc.

2018-01-12 19:45:34 -05:00

materials

Merge polaris sync 01 17 2018

2018-01-17 17:56:51 -05:00

media

…

metric

…

mining

Merge polaris sync 01 17 2018

2018-01-17 17:56:51 -05:00

mob

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

2018-01-19 17:52:25 -05:00

multiz

POLARIS: zshadow del fix

2018-01-17 02:18:50 -05:00

nano

…

nifsoft

VS: Clean up NIFs in human destroy in particular

2018-01-18 18:19:17 -05:00

organs

Planes Framework (#4545)

2018-01-17 13:45:54 -06:00

overmap

…

paperwork

Planes Framework (#4545)

2018-01-17 13:45:54 -06:00

planet

…

power

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

2018-01-19 17:52:25 -05:00

projectiles

More guns for the gun box

2018-01-18 18:53:43 -05:00

random_map

Merge polaris sync 01 17 2018

2018-01-17 17:56:51 -05:00

reagents

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

2018-01-19 17:52:25 -05:00

recycling

…

research

Merge polaris sync 01 17 2018

2018-01-17 17:56:51 -05:00

resleeving

VS: Planes shenanigans. Begins 'plane' work, for VS specific things.

2018-01-14 00:40:00 -05:00

rogueminer_vr

…

scripting

…

security levels

Various and sundry admin messages

2018-01-06 19:15:54 -05:00

shieldgen

Adds Boats, Ports /TG/ Buckling (#4527)

2018-01-14 14:58:15 -06:00

shuttles

Merge polaris sync 01 17 2018

2018-01-17 17:56:51 -05:00

spells

…

surgery

Merge polaris sync 01 17 2018

2018-01-17 17:56:51 -05:00

tables

Redesigns the armory

2018-01-08 01:00:41 -05:00

telesci

…

tension

Adds Berserk

2018-01-11 01:35:14 -05:00

turbolift

…

vehicles

Merge polaris sync 01 17 2018

2018-01-17 17:56:51 -05:00

ventcrawl

…

virus2

Planes Framework (#4545)

2018-01-17 13:45:54 -06:00

vore

Merge pull request #2791 from VOREStation/aro-knifepath

2018-01-18 18:20:47 -05:00

xenoarcheaology

Merge polaris sync 01 17 2018

2018-01-17 17:56:51 -05:00

xenobio

Allows easier prefilling of beakers, bottles, etc (#4583)

2018-01-19 15:38:46 -06:00

xenobio2

…

xgm

…