LetterJayandGitHub ac5503d338 Merge branch 'master' into upstream-merge-33055

2017-12-25 04:10:34 -06:00

..

bot

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

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

friendly

Merge branch 'master' into upstream-merge-33246

2017-12-20 00:27:06 -06:00

guardian

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

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

hostile

Merge branch 'master' into upstream-merge-33055

2017-12-25 04:10:34 -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

…