Joan Lung
d63d6149c9
Some small clockcult fixes
2016-11-01 15:05:27 -04:00
Joan Lung
7ba3c93db9
Merge branch 'master' of https://github.com/tgstation/tgstation into definecomponents
...
Conflicts:
code/game/gamemodes/clock_cult/clock_items/clockwork_slab.dm
code/game/gamemodes/clock_cult/clock_scriptures/scripture_drivers.dm
code/game/gamemodes/clock_cult/clock_scriptures/scripture_scripts.dm
2016-10-30 11:29:55 -04:00
Joan Lung
6b930dccaa
Improves the Clockwork Slab's Recollection ( #21242 )
...
* Improves the Clockwork Slab's Recollection
* efficiency!
* classesssss
* are the right hands your hands?
find out today!
* clapping
* -n
* a bugfix
2016-10-30 16:20:03 +01:00
Joan Lung
add4f8ecf0
Component IDs are now defines
2016-10-29 11:40:33 -04:00
Joan Lung
09b426df79
Splits various massive clockwork cult code files up into various folders ( #21177 )
...
* Splits various massive clockwork cult code files up into various folders
* JUST1C4R
* 4BSURD
* this is faintly horrifying to look at
* that's right i don't need to double it, just to swap the order
2016-10-26 09:50:04 +13:00
