Verkister 08f840991d Fixes teal carpets. ...

Unnecessary and unmarked vorestation edit. Our carpet_vr.dmi was exactly the same as polaris, but without the teal carpets, surprise!

Fixes #3381

2018-04-11 14:08:40 +03:00

..

__defines

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

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

_compatibility/509

…

_helpers

Initial cleanup/changes

2018-04-02 16:36:04 -04: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-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

Merge pull request #3404 from Verkister/cargostockings

2018-04-10 18:11:55 -04:00

defines

…

game

Fixes teal carpets.

2018-04-11 14:08:40 +03:00

js

…

modules

Merge pull request #3421 from VOREStation/aro-protwork

2018-04-10 18:19:32 -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

Initial cleanup/changes

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

hub.dm

…

names.dm

…

stylesheet.dm

…

world.dm

…