deathride58 e66e348d5c Merge pull request #6572 from Citadel-Station-13/upstream-merge-37535 ...

[MIRROR] Fixes gas fusion power not being taken into account

2018-04-29 22:33:37 +00:00

..

__DEFINES

Merge pull request #6540 from Citadel-Station-13/upstream-merge-37461

2018-04-29 02:24:04 -05:00

__HELPERS

Merge pull request #6503 from Citadel-Station-13/upstream-merge-37371

2018-04-27 00:11:11 -05:00

_globalvars

Adds a stationloving component to replace a couple of flags and SSinbounds with (#37436)

2018-04-27 07:37:15 -05:00

_js

…

_onclick

Condenses a check

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

controllers

Merge pull request #6540 from Citadel-Station-13/upstream-merge-37461

2018-04-29 02:24:04 -05:00

datums

[syou can no longer insert a storage object into itself, and therefore, no longer bohbomb with one boh (#37410)

2018-04-29 15:21:02 -05:00

game

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

2018-04-29 10:09:29 -05:00

modules

Merge pull request #6572 from Citadel-Station-13/upstream-merge-37535

2018-04-29 22:33:37 +00:00

_compile_options.dm

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

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

world.dm

…