LetterJay 6d52395643 Merge pull request #4587 from Citadel-Station-13/upstream-merge-33899 ...

[MIRROR] Fixes air alarm contaminated mode

2017-12-29 06:48:09 -06:00

..

__DATASTRUCTURES

…

__DEFINES

Merge branch 'master' into upstream-merge-33627

2017-12-27 04:41:27 -06:00

__HELPERS

Merge pull request #4578 from Citadel-Station-13/upstream-merge-33876

2017-12-29 06:25:11 -06:00

_globalvars

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

_js

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

_onclick

Fixes AI eyes getting nullspaced when jumping to deleted cameras (#33856)

2017-12-29 00:28:47 -06:00

citadel

Update cit_arousal.dm

2017-12-19 17:56:06 -06:00

controllers

Increases research point income by 33% (#33857)

2017-12-29 02:55:10 -06:00

datums

Merge pull request #4582 from Citadel-Station-13/upstream-merge-33882

2017-12-29 06:25:54 -06:00

game

Merge pull request #4586 from Citadel-Station-13/upstream-merge-33895

2017-12-29 06:47:56 -06:00

modules

Merge pull request #4587 from Citadel-Station-13/upstream-merge-33899

2017-12-29 06:48:09 -06:00

_compile_options.dm

…

world.dm

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00