Dax Dupont 6eb9d6daaa Fixes mulligan for mutants (#37895)

2018-05-18 19:52:19 -05:00

..

__DEFINES

Merge pull request #6682 from Citadel-Station-13/upstream-merge-37429

2018-05-17 18:14:54 +00:00

__HELPERS

Merge pull request #37838 from Jordie0608/ithoughtaboutmakingthissendanemailbutidontwanttodrownmyinbox

2018-05-17 21:38:41 -05:00

_globalvars

Merge pull request #37838 from Jordie0608/ithoughtaboutmakingthissendanemailbutidontwanttodrownmyinbox

2018-05-17 21:38:41 -05:00

_js

…

_onclick

Update parallax.dm (#37868)

2018-05-17 10:17:26 -05:00

controllers

Merge pull request #37838 from Jordie0608/ithoughtaboutmakingthissendanemailbutidontwanttodrownmyinbox

2018-05-17 21:38:41 -05:00

datums

Merge pull request #6682 from Citadel-Station-13/upstream-merge-37429

2018-05-17 18:14:54 +00:00

game

Merge pull request #37838 from Jordie0608/ithoughtaboutmakingthissendanemailbutidontwanttodrownmyinbox

2018-05-17 21:38:41 -05:00

modules

Fixes mulligan for mutants (#37895)

2018-05-18 19:52:19 -05:00

_compile_options.dm

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

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

world.dm

…