Spades a72abf203d Merge pull request #3407 from Little-119/rings-fix ...

Changes wedding rings to be a subtype of ring

2018-04-08 07:26:38 -04:00

..

__defines

Merge pull request #3378 from VOREStation/polaris-sync-2018-03-30

2018-04-06 14:42:19 -04:00

_compatibility/509

…

_helpers

Revert "Fixes cameras making completely black photos"

2018-03-24 17:42:36 -05:00

_onclick

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

2018-03-31 09:20:59 -04:00

ATMOSPHERICS

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

2018-03-31 09:20:59 -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

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

2018-03-31 09:20:59 -04:00

defines

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

2018-03-15 22:41:14 -04:00

game

Fix light/camera layers for macros and fix constants for them too.

2018-04-01 16:29:52 -04:00

js

…

modules

Merge pull request #3407 from Little-119/rings-fix

2018-04-08 07:26:38 -04:00

unit_tests

…

ZAS

…

_away_mission_tests.dm

…

_macros_vr.dm

…

_macros.dm

…

_map_tests.dm

…

_unit_tests.dm

…

global_vr.dm

…

global.dm

POLARIS: Moves daily logs into being folders rather than files

2018-03-13 18:20:59 -04:00

hub.dm

…

names.dm

…

stylesheet.dm

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

2018-03-15 22:41:14 -04:00

world.dm

POLARIS: Move Topic() log to debug_log

2018-03-13 18:57:38 -04:00