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

..

ai

Fixes AI camera lights not updating when tracking mobs (#33849)

2017-12-26 18:30:24 -06:00

pai

[READY]Adds picking up corgis and pAIs!

2017-12-27 15:47:57 -06:00

robot

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

damage_procs.dm

Merge pull request #31210 from MoreRobustThanYou/patch-7

2017-10-03 06:20:51 -05:00

death.dm

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

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

examine.dm

…

laws.dm

…

login.dm

Datum rev & related upgrades to base datum antag

2017-10-18 02:26:11 -05:00

say.dm

Fixes observer versions of sillicon chat (#33355)

2017-12-08 12:07:01 -06:00

silicon_defense.dm

…

silicon_movement.dm

Small refactor to movement (#31071)

2017-09-30 07:23:35 -05:00

silicon.dm

Added bot path data huds

2017-11-28 06:28:40 -06:00