deathride58 baec90fe11 Merge pull request #6759 from Citadel-Station-13/upstream-merge-37840 ...

[MIRROR] Fixes meteors hitting qdeleted stuff.

2018-05-17 18:11:57 +00:00

..

__DEFINES

Fixes Adminorazine killing ash lizards (#37872)

2018-05-17 10:24:59 -05:00

__HELPERS

Fixes robots appearing as deactivated at round end (#37804)

2018-05-13 12:08:46 -05:00

_globalvars

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

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

_js

…

_onclick

Update parallax.dm (#37868)

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

controllers

Merge pull request #6663 from Citadel-Station-13/upstream-merge-37646

2018-05-15 00:47:59 -05:00

datums

Merge pull request #6663 from Citadel-Station-13/upstream-merge-37646

2018-05-15 00:47:59 -05:00

game

Merge pull request #6759 from Citadel-Station-13/upstream-merge-37840

2018-05-17 18:11:57 +00:00

modules

Merge pull request #6760 from Citadel-Station-13/upstream-merge-37602

2018-05-17 18:11:24 +00:00

_compile_options.dm

…

world.dm

…