LetterJay 8c1dcd9429 Merge pull request #3692 from Citadel-Station-13/upstream-merge-31986 ...

[MIRROR] You can now hide grenades in plushies

2017-10-30 23:33:16 -04:00

..

__DATASTRUCTURES

…

__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

fixes soporifics having the old two shot value

2017-10-30 17:33:01 +08:00

controllers

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

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

datums

Fixes TakeComponent (#32156)

2017-10-30 03:53:00 -05:00

game

Merge pull request #3692 from Citadel-Station-13/upstream-merge-31986

2017-10-30 23:33:16 -04:00

modules

Merge pull request #3694 from Citadel-Station-13/upstream-merge-32225

2017-10-30 23:32:39 -04:00

_compile_options.dm

Find references fix. (#32022)

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

world.dm

…