Jordan Brown a3ca01f158 Merge pull request #37593 from optimumtact/revertarmshit ...

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

2018-04-30 21:20:43 -05:00

..

__DEFINES

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

2018-04-30 00:06:58 -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

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

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

datums

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

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

game

Merge pull request #37593 from optimumtact/revertarmshit

2018-04-30 21:20:43 -05:00

modules

Merge pull request #6590 from Citadel-Station-13/upstream-merge-37494

2018-04-30 11:03:33 -05:00

_compile_options.dm

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

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

world.dm

…