LetterJay 886459dcc3 Merge pull request #4954 from Citadel-Station-13/upstream-merge-34591 ...

[MIRROR] Fixes slimes attacking people with the slime faction

2018-01-21 11:48:07 -06:00

..

__DATASTRUCTURES

Add /datum prefix to custom root types (#34294)

2018-01-11 21:28:02 -06:00

__DEFINES

Merge pull request #4949 from Citadel-Station-13/upstream-merge-34534

2018-01-21 11:47:41 -06:00

__HELPERS

Antag Panel / Check antagonists Refactor

2018-01-19 08:43:49 -06:00

_globalvars

Merge pull request #34470 from Cyberboss/MoveMotd

2018-01-16 14:28:07 -06:00

_js

…

_onclick

Update credits.dm

2018-01-19 08:47:27 -05:00

citadel

Merge pull request #4097 from deathride58/theprthatbulliesjanitormains

2018-01-18 06:28:04 +00:00

controllers

Merge pull request #4943 from Citadel-Station-13/upstream-merge-34571

2018-01-21 11:47:27 -06:00

datums

Merge pull request #4942 from Citadel-Station-13/upstream-merge-34608

2018-01-19 19:37:20 +00:00

game

Merge pull request #34631 from uraniummeltdown/airlock

2018-01-20 09:50:00 -06:00

modules

Merge pull request #4954 from Citadel-Station-13/upstream-merge-34591

2018-01-21 11:48:07 -06:00

_compile_options.dm

Low memory mode

2018-01-19 09:12:37 -06:00

world.dm

Merge pull request #4742 from Citadel-Station-13/upstream-merge-34217

2018-01-10 19:59:51 +00:00