BlackMajor 725414bd03 Merge pull request #9894 from Putnam3145/real-explosion-fix ...

[TESTMERGE] Explosion/bomb armor rework

2019-12-13 10:20:33 +13:00

..

__DEFINES

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit329

2019-12-07 05:30:07 +01:00

__HELPERS

Fixes a long lasting runtime with filter data sorting.

2019-12-08 13:21:29 +01:00

_globalvars

Merge pull request #9805 from Ghommie/Ghommie-cit352

2019-12-05 21:40:09 -07:00

_js

Revert "PLASE"

2019-11-24 03:06:08 +00:00

_onclick

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit408

2019-12-09 00:04:22 +01:00

controllers

Ports flag for bespoke elements.

2019-12-04 19:38:25 +01:00

datums

Merge pull request #10156 from Ghommie/Ghommie-cit451

2019-12-12 09:30:34 -08:00

game

Merge pull request #10140 from Putnam3145/dynamic-not-in-secret

2019-12-11 14:38:49 -07:00

modules

Merge pull request #9894 from Putnam3145/real-explosion-fix

2019-12-13 10:20:33 +13:00

_compile_options.dm

…

world.dm

…