LetterJay 9d7dc29efc Merge pull request #4577 from Citadel-Station-13/upstream-merge-33874 ...

[MIRROR] CTF flags are no longer locked to CTF.

2017-12-29 06:24:57 -06:00

..

__DATASTRUCTURES

…

__DEFINES

Merge branch 'master' into upstream-merge-33627

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

__HELPERS

Made atoms not smooth with shuttles (#33807)

2017-12-29 00:29:04 -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

Merge pull request #33881 from AnturK/walls-have-eyes

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

datums

Fixes admin fingerprintslast

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

game

Merge pull request #4574 from Citadel-Station-13/upstream-merge-33558

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

modules

Merge pull request #4577 from Citadel-Station-13/upstream-merge-33874

2017-12-29 06:24:57 -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