LetterJay 1fe4eb7d88 Merge pull request #3508 from Michiyamenotehifunana/recolorable-guns ...

Recolorable Guns and more ballistics for Security

2017-10-29 23:43:20 -04:00

..

__DATASTRUCTURES

Update globals.dm

2017-10-21 07:24:50 -05:00

__DEFINES

Merge pull request #3648 from Citadel-Station-13/upstream-merge-32116

2017-10-29 15:48:47 -04:00

__HELPERS

Merge branch 'master' into upstream-merge-32116

2017-10-29 03:45:59 -04:00

_globalvars

Removes duplicate typecaches

2017-10-23 08:25:30 -05:00

_js

…

_onclick

one more thing to allow more mobs to qdel nicely (#32168)

2017-10-29 07:14:44 -05:00

citadel

Merge pull request #3508 from Michiyamenotehifunana/recolorable-guns

2017-10-29 23:43:20 -04:00

controllers

Merge pull request #3657 from Citadel-Station-13/upstream-merge-32066

2017-10-29 04:20:56 -04:00

datums

Merge pull request #3675 from Citadel-Station-13/upstream-merge-32185

2017-10-29 23:37:30 -04:00

game

Merge pull request #3508 from Michiyamenotehifunana/recolorable-guns

2017-10-29 23:43:20 -04:00

modules

Merge pull request #3678 from Citadel-Station-13/upstream-merge-32144

2017-10-29 23:38:55 -04:00

_compile_options.dm

Find references fix. (#32022)

2017-10-27 04:57:15 -05:00

world.dm

…