LetterJay 408182758f Merge branch 'master' into upstream-merge-33498

2017-12-19 17:50:11 -06:00

..

clock_effects

Defines math, take 2

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

clock_helpers

Merge branch 'master' into upstream-merge-33498

2017-12-19 17:50:11 -06:00

clock_items

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

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

clock_mobs

Shield balance (#33553)

2017-12-17 04:11:24 -06:00

clock_scriptures

Defines math, take 2

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

clock_structures

Defines math, take 2

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

clock_cult.dm

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

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

clock_effect.dm

Changes some 1s and 0s to TRUE and FALSE (#1967)

2017-07-10 16:13:16 -07:00

clock_item.dm

…

clock_mobs.dm

Merge pull request #32039 from Xhuis/marauders

2017-10-26 05:03:59 -05:00

clock_scripture.dm

JSON feedback

2017-11-17 01:44:12 -06:00

clock_structure.dm

(Ready) Clockwork Cult Rework: Proof-of-concept

2017-09-26 15:22:09 -05:00