LetterJay 518b264654 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33783 ...

# Conflicts:
#	_maps/map_files/generic/CentCom.dmm
#	code/modules/mob/living/living.dm

2017-12-29 01:34:17 -06:00

..

brain_item.dm

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33783

2017-12-29 01:34:17 -06:00

brain.dm

Replaces a bunch of loc assignments with forcemoves and moves to nullspace

2017-12-13 13:56:57 -06:00

death.dm

Made some object lists less terrible to read

2017-07-18 09:44:43 -05:00

emote.dm

Fixes emote runtimes (#31498)

2017-10-10 08:42:30 -05:00

life.dm

Cleans up unused code

2017-11-20 10:14:32 -06:00

MMI.dm

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

posibrain.dm

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

say.dm

Datumizes saymodes

2017-12-03 12:56:03 -06:00

status_procs.dm

Prefixed all disability defines with DISABILITY_ to fix a name collision

2017-12-24 15:03:30 -06:00