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

..

devices

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

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

robot

Polaris sync

2017-12-21 04:01:07 -05:00

stacks

Merge polaris sync 01 17 2018

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

weapons

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

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

antag_spawners.dm

Additional types which need Destroy to return qdel hints (and other Destroy fixes)

2017-12-30 16:02:27 -05:00

apc_frame.dm

…

blueprints.dm

Pol sync part 2

2017-10-27 15:30:51 -04:00

bodybag.dm

Standardization & grammar.

2017-11-17 13:18:32 -05:00

contraband_vr.dm

De-equips combat hardsuit from stolen package

2017-11-28 23:52:18 -05:00

contraband.dm

…

crayons.dm

…

glassjar.dm

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00

gunbox_vr.dm

More guns for the gun box

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

gunbox.dm

Allows detectives to take an optional revolver + some other stuff (#4217)

2017-11-05 22:53:11 -06:00

latexballoon.dm

Ports a bunch of fluff stuff

2017-02-21 13:50:14 -06:00

paintkit.dm

…

shooting_range.dm

…

toys.dm

Adds bracelets!

2017-11-17 18:27:35 +00:00

trash_vr.dm

Refactor Digestion

2018-01-10 02:06:13 -05:00

trash.dm

Adds in an Unathi-made jerky snack

2017-04-07 23:36:22 -05:00