Aronai Sieyes d4ddd57bf2 Merge pull request #4371 from VOREStation/upstream-merge-5656 ...

[MIRROR] Fix plastic ashtrays only holding one butt. Now they hold 4 butts.

2018-10-13 17:42:13 -04:00

..

__datastructures

Partially ports the GLOB system

2018-08-14 18:14:09 -05:00

__defines

Admin ticket system (for real this time)

2018-10-09 16:31:01 -04:00

_compatibility/509

…

_global_vars

Admin ticket system (for real this time)

2018-10-09 16:31:01 -04:00

_helpers

Merge pull request #4318 from lbnesquik/Kates-Nevrean-Fix

2018-10-11 23:15:12 -04:00

_onclick

Merge branch 'master' of https://github.com/VOREStation/Polaris into sync-09272018

2018-09-27 18:01:09 -04:00

ATMOSPHERICS

Merge pull request #4296 from VOREStation/phoron-scrubbing

2018-10-01 09:20:05 -04:00

controllers

Merge branch 'master' of https://github.com/VOREStation/Polaris into sync-09272018

2018-09-27 18:01:09 -04:00

datums

Fixes bug with holdout phasers

2018-10-05 02:04:30 -04:00

defines

Hides syndi-synths from the manifest (#5411)

2018-07-15 13:27:47 -04:00

game

Merge pull request #5656 from lbnesquik/Kates-AshTray-Fix

2018-10-13 17:17:27 -04:00

js

…

modules

Merge pull request #4370 from VOREStation/upstream-merge-5655

2018-10-13 17:39:30 -04:00

unit_tests

…

ZAS

Merge branch 'master' of https://github.com/VOREStation/Polaris into sync-09272018

2018-09-27 18:01:09 -04:00

_away_mission_tests.dm

…

_macros_vr.dm

…

_macros.dm

Ports /vg/ instrument frame work, adds client based sound pref

2018-09-05 03:35:34 -05:00

_map_tests.dm

…

_unit_tests.dm

…

global_vr.dm

…

global.dm

Merge branch 'master' of https://github.com/VOREStation/Polaris into sync-09272018

2018-09-27 18:01:09 -04:00

hub.dm

…

names.dm

…

stylesheet.dm

…

world.dm

Admin ticket system (for real this time)

2018-10-09 16:31:01 -04:00