Novacat 1b2116bf80 Merge pull request #4714 from VOREStation/upstream-merge-5898 ...

[MIRROR] Removes the hyphen from default language keys, should make people spew gibberish less

2019-03-27 21:32:03 -04:00

..

__datastructures

…

__defines

Merge pull request #4688 from VOREStation/upstream-merge-5843

2019-03-27 18:01:56 -04:00

_compatibility/509

…

_global_vars

Ports TGstation view variables + admin proccall guards, and all the baggage that comes with it

2019-03-27 14:49:30 -04:00

_helpers

Reminder: Yell at Leshana for not tagging edited code.

2019-03-27 20:03:23 -04:00

_onclick

Resolves compile errors with the exception of map errors.

2019-01-12 21:09:29 -05:00

ATMOSPHERICS

Conflict Resolution

2019-03-27 16:36:41 -04:00

controllers

Merge pull request #5898 from Anewbe/more_gibberish

2019-03-27 21:15:27 -04:00

datums

Merge pull request #4711 from VOREStation/upstream-merge-5875

2019-03-27 20:45:46 -04:00

defines

Fixes PDA manifest excluding all non-syndie borgs (#5695)

2018-10-21 14:23:48 -04:00

game

Merge pull request #4695 from VOREStation/upstream-merge-5856

2019-03-27 20:54:57 -04:00

js

…

modules

Merge pull request #4713 from VOREStation/upstream-merge-5900

2019-03-27 21:20:56 -04:00

unit_tests

[READY]Makes a bunch of processes subsystems instead

2019-03-27 16:03:51 -04:00

ZAS

Merges AI Branch into Master

2018-12-01 00:06:38 -05:00

_away_mission_tests.dm

…

_macros_vr.dm

…

_macros.dm

Conflict Resolution Part One

2019-03-27 15:21:58 -04:00

_map_tests.dm

…

_unit_tests.dm

…

global_vr.dm

…

global.dm

[READY]Makes a bunch of processes subsystems instead

2019-03-27 16:03:51 -04:00

hub.dm

…

names.dm

…

stylesheet.dm

Merge branch 'master' into upstream-merge-5735

2019-01-14 11:20:55 -05:00

world.dm

Merge pull request #4684 from VOREStation/upstream-merge-5814

2019-03-27 17:46:31 -04:00