Leshana b5cf8383f6 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into vplk-sync-2018-04-14 ...

# Conflicts:
#	code/game/machinery/jukebox.dm
#	code/modules/economy/lorenews.dm
#	code/modules/mob/living/carbon/human/update_icons.dm

2018-04-15 14:19:36 -04:00

..

bench.dm

…

debug.dm

…

flipping.dm

Arranges lots of things into planes (#5072)

2018-03-28 12:59:12 -07:00

interactions.dm

…

presets.dm

work

2017-11-26 12:08:05 -05:00

rack_vr.dm

Redesigns the armory

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

rack.dm

Redesigns the armory

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

tables.dm

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into vplk-sync-2018-04-14

2018-04-15 14:19:36 -04:00

update_triggers.dm

…