LetterJay a0b6b4e7d8 Update _trait.dm

2018-05-20 04:30:25 -05:00

..

__DEFINES

Merge branch 'master' into upstream-merge-37476

2018-05-06 07:07:02 +00:00

__HELPERS

Merge branch 'master' into upstream-merge-37476

2018-05-06 07:07:02 +00:00

_globalvars

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

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

_js

…

_onclick

Merge branch 'master' into upstream-merge-37476

2018-05-06 07:07:02 +00:00

controllers

Merge pull request #37561 from AnturK/customloadingfix

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

datums

Update _trait.dm

2018-05-20 04:30:25 -05:00

game

Update smokebomb.dm

2018-05-13 11:54:34 -05:00

modules

Merge branch 'master' into upstream-merge-37476

2018-05-06 07:07:02 +00:00

_compile_options.dm

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

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

world.dm

…