deathride58 50eae25c92 Merge pull request #6656 from Citadel-Station-13/upstream-merge-37654 ...

[MIRROR] Morphs can no longer eat or attack while disguised

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

..

__DEFINES

Merge pull request #6601 from Citadel-Station-13/upstream-merge-37565

2018-05-02 13:59:14 +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 #6641 from Citadel-Station-13/upstream-merge-37447

2018-05-05 09:38:11 -05:00

game

Adds desc to vendor circuit board (#37647)

2018-05-05 17:54:54 -05:00

modules

alt morph nerf (#37654)

2018-05-05 14:54:06 -05:00

_compile_options.dm

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

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

world.dm

…