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

..

__defines

Adds 'mode addons' to bellies to replace several modes

2018-04-11 19:22:20 -04:00

_compatibility/509

…

_helpers

Fix allowing frames on walls with machine-under-construction on it already.

2018-04-11 21:52:32 -04:00

_onclick

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

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

ATMOSPHERICS

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

2018-04-06 15:40:06 -04:00

controllers

Don't kick admin observers for inactivity. They might be waiting for ahelps.

2018-04-02 22:48:00 -04:00

datums

Added fuzzy legcuffs

2018-04-13 04:56:16 +10:00

defines

…

game

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

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

js

…

modules

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

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

unit_tests

…

ZAS

…

_away_mission_tests.dm

…

_macros_vr.dm

Adds 'mode addons' to bellies to replace several modes

2018-04-11 19:22:20 -04:00

_macros.dm

…

_map_tests.dm

…

_unit_tests.dm

…

global_vr.dm

…

global.dm

Initial cleanup/changes

2018-04-02 16:36:04 -04:00

hub.dm

…

names.dm

…

stylesheet.dm

…

world.dm

…