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

..

bot

[MIRROR] Fixes emagged cleanbot acid attack doing no damage (#4544)

2017-12-26 13:58:16 -08:00

friendly

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

guardian

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

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

hostile

more save points

2017-12-29 00:07:36 -06:00

slime

Defines math, take 2

2017-12-17 10:02:43 -06:00

animal_defense.dm

…

constructs.dm

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

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

corpse.dm

Fixes old simple animal humanoid issues (#32214)

2017-10-30 06:50:04 -05:00

damage_procs.dm

Defines math, take 2

2017-12-17 10:02:43 -06:00

parrot.dm

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

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

shade.dm

Process_Spacemove proc improvement

2017-11-08 19:51:57 -06:00

simple_animal_vr.dm

…

simple_animal.dm

Defines math, take 2

2017-12-17 10:02:43 -06:00

spawner.dm

comma splice and ellipsis grammar fix (#33040)

2017-11-24 15:21:11 -06:00

status_procs.dm

…