deathride58 084f2ac1da Merge pull request #6606 from Citadel-Station-13/upstream-merge-37593 ...

[MIRROR] Revert "fixes a pacifism kill through crushing firelocks! (#37511)"

2018-05-02 01:29:15 +00:00

..

__DEFINES

Merge pull request #6596 from Citadel-Station-13/upstream-merge-37513

2018-05-02 01:25:04 +00: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 #6596 from Citadel-Station-13/upstream-merge-37513

2018-05-02 01:25:04 +00:00

game

Merge pull request #6606 from Citadel-Station-13/upstream-merge-37593

2018-05-02 01:29:15 +00:00

modules

Merge pull request #6604 from Citadel-Station-13/upstream-merge-37562

2018-05-02 01:28:05 +00:00

_compile_options.dm

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

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

world.dm

…