CitadelStationBot eb2368be03 [MIRROR] Fix inconsistent energy gun suicide (#7012) ...

* Fix inconsistent energy gun suicide (#38252)

* Fix inconsistent energy gun suicide

2018-06-05 11:18:27 -07:00

..

__DEFINES

Merge pull request #6995 from Citadel-Station-13/upstream-merge-38240

2018-06-05 12:11:34 -05:00

__HELPERS

Hard upstream sync (#6951)

2018-05-31 16:03:18 -07:00

_globalvars

Hard upstream sync (#6951)

2018-05-31 16:03:18 -07:00

_js

…

_onclick

AI Multicamera mode (#37695)

2018-05-31 22:41:48 -05:00

controllers

Merge pull request #6990 from Citadel-Station-13/upstream-merge-38077

2018-06-05 12:10:07 -05:00

datums

[MIRROR] Lavaland Clock Cult Ruin (#7011)

2018-06-05 11:16:55 -07:00

game

Merge pull request #7010 from Citadel-Station-13/upstream-merge-38267

2018-06-05 12:11:57 -05:00

modules

[MIRROR] Fix inconsistent energy gun suicide (#7012)

2018-06-05 11:18:27 -07:00

_compile_options.dm

Updates BYOND links to use HTTPS (#37918)

2018-05-20 15:31:28 -05:00

world.dm

…