Commit Graph

6 Commits

Author SHA1 Message Date
phil235
e5a079b982 Fixes merge conflict stuff.
Readds the lines about coloring hairs and mutant parts in revblight (even though they're no longer needed, but it's a reminder that the color change is a trick and we need to replace it with a proper forced limb coloring like it used to).
2016-10-31 20:19:15 +01: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
663ef769f7 Reworks Guvax (#21202)
Guvax is now targeted; invoking it charges your slab to bind and start converting the next target attacked in melee within 10 seconds. This makes your slab visible in-hand.
tweak: Above 5 Servants, the invocation to charge your slab is not whispered, and the conversion time is increased for each Servant above 5.

Using Guvax on an already bound target will stun them. The bound target can resist out, which will prevent conversion.

Sentinel's Compromise is now targeted, like Guvax, but can select any target in vision range.

Sentinel's Compromise now also removes holy water from the target Servant.

Clicking your slab will cancel these scriptures.

Both of these will change your cursor, to make it obvious they're active and you can't do anything else.


Convert times are faster at very high servant amounts, but it's much easier for 1-on-1 conversions to go wrong and have the target escape. (Though the binding makes early conversions slightly easier.)

Resist time for the binding is a flat 4 seconds, and moving/being moved while chanting will break it immediately.
Formula for conversion time is 5 + (0.5 for each valid servant above 5) seconds up to a maximum of 10 seconds at 15 servants.
2016-10-29 18:16:21 +13: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