deathride58 e0f971ecbb Merge pull request #6693 from Citadel-Station-13/upstream-merge-37457 ...

[MIRROR] Adds a French beret! HONH HONH HONH!

2018-05-11 03:41:26 +00:00

..

__DEFINES

Fixes EMPs (#37656)

2018-05-10 01:33:25 -05:00

__HELPERS

Kills off /obj/item/device (#6561)

2018-04-30 00:06:58 -05:00

_globalvars

Kills off /obj/item/device (#6561)

2018-04-30 00:06:58 -05:00

_js

…

_onclick

Condenses a check

2018-04-29 10:03:39 -05:00

controllers

Merge pull request #37561 from AnturK/customloadingfix

2018-04-30 21:19:05 -05:00

datums

Merge pull request #6703 from Citadel-Station-13/upstream-merge-37656

2018-05-11 03:36:01 +00:00

game

Merge pull request #6695 from Citadel-Station-13/upstream-merge-37709

2018-05-11 03:40:41 +00:00

modules

Merge pull request #6693 from Citadel-Station-13/upstream-merge-37457

2018-05-11 03:41:26 +00:00

_compile_options.dm

Merge pull request #37000 from tgstation/KorPhaeron-patch-2

2018-04-11 15:12:55 -05:00

world.dm

…