Leshana 27c3272821 Merge remote-tracking branch 'upstream-polaris/master' into polaris-sync-2018-01-27 ...

# Conflicts:
#	code/ZAS/_docs.dm
#	code/__defines/mobs.dm
#	code/game/turfs/flooring/flooring_decals.dm
#	code/game/turfs/simulated/walls.dm
#	code/modules/client/preference_setup/loadout/loadout_utility.dm
#	code/modules/lore_codex/codex.dm
#	code/modules/mob/living/life.dm
#	code/modules/mob/living/living_defines.dm
#	maps/southern_cross/southern_cross-1.dmm
#	maps/southern_cross/southern_cross-3.dmm
#	maps/southern_cross/southern_cross-6.dmm
#	maps/southern_cross/southern_cross-7.dmm
#	maps/southern_cross/southern_cross_jobs.dm
#	vorestation.dme

2018-01-27 23:08:53 -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 remote-tracking branch 'upstream-polaris/master' into polaris-sync-2018-01-27

2018-01-27 23:08:53 -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

…

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

…

paintkit.dm

Allows modkits to be created for any item. (#4450)

2018-01-19 18:11:28 -08:00

poi_items.dm

capitalization of item

2018-01-22 00:30:53 +00:00

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

…