Commit Graph

4742 Commits

Author SHA1 Message Date
Cheridan
53f869b6e3 Merge pull request #21369 from ChangelingRain/clockdrones
Standard drones will be converted to Cogscarabs by Ratvar
2016-11-06 09:32:09 -06:00
Cheridan
27165d2748 Merge pull request #21354 from ChangelingRain/noncolormatrices
You can now actually drag people over Vitality Matrices
2016-11-05 18:49:46 -05:00
Cheridan
3dd35cc0b1 Merge pull request #21365 from ChangelingRain/glowfixes
You can now proselytize false walls + glow fixes
2016-11-05 18:30:59 -05:00
Joan Lung
ab286bd2d8 The spawn animation for the Ark of the Clockwork Justicar will now only play once (#21349)
* The spawn animation for the Ark of the Clockwork Justicar will now only play once

* screaming

* i knoooow

* clang noise
2016-11-05 09:44:10 -05:00
Joan Lung
3c2eb852a2 Standard drones will be converted to cogscarabs by Ratvar 2016-11-04 20:36:54 -04:00
Razharas
e68d1c99ab Merge pull request #21344 from ChangelingRain/fluffmessages
Adds some fluff messages to clockcult
2016-11-04 20:14:02 +04:00
Joan Lung
990942481f You can now proselytize false walls + glow fixes 2016-11-04 11:53:48 -04:00
Joan Lung
d4643f032c Proselytizer conversion now accounts for existing materials better (#21334)
* Proselytizer conversion now accounts for existing materials better

* shitfuck.

* move the god damn defines
2016-11-04 15:35:00 +01:00
Joan Lung
1a26cf9aa5 Ratvar will now proselytize stuff that happens to be in space (#21340)
* Ratvar will now proselytize stuff that happens to be in space

* do you hear ratvar singing

* no narsie in ooc

* "

* don't need that

* heir

* bigger stronger more filled with brass
2016-11-04 09:06:57 +01:00
Joan Lung
e163090dd3 this.. could be better 2016-11-03 15:08:49 -04:00
Joan Lung
76f262a542 if it never activated, don't deactivate 2016-11-03 14:41:08 -04:00
Joan Lung
c3b8fb302d You can now actually drag corpses over Vitality Matrices 2016-11-03 14:31:36 -04:00
Joan Lung
5ae9bd84b4 no message 2016-11-03 09:49:49 -04:00
Joan Lung
0f6aa36b2c no message 2016-11-03 09:48:27 -04:00
Joan Lung
05fade395e Adds some fluff messages to clockcult 2016-11-02 22:14:51 -04:00
oranges
57673a9daa Merge pull request #21323 from ChangelingRain/weakfixes
Some small clockcult fixes
2016-11-03 11:08:30 +13:00
Jordie
f1e293504c Merge pull request #21315 from ChangelingRain/siliconapplication
Clockcult "Convert All Silicons" objective now also requires that Application scripture is unlocked
2016-11-03 09:06:44 +11:00
Joan Lung
25dc7d25c5 Proselytizing a window will automatically proselytize the grille under it (#21314)
* Proselytizing a window will proselytize the grille under it

* fancy
2016-11-03 10:19:49 +13:00
Joan Lung
02e54446d8 Hulks no longer oneshot literally every clockwork structure (#21283)
* Hulks no longer oneshot literally every clockwork structure

* rrrrr

* why the fuck did you ask me to make this a proc????

* hulks, why.
2016-11-02 22:52:42 +13:00
Joan Lung
ff69c5c631 Mending Motors are overall more powerful (#21281)
* Mending Motors are overall more powerful

* that fucking capitalization always gets me
2016-11-02 22:52:15 +13:00
Cheridan
a72658206a Merge pull request #21282 from ChangelingRain/helptheocularwardenisbeatingme
Ocular Wardens no longer attack restrained targets
2016-11-02 03:27:54 -05:00
phil235
b7efc2cef4 Make energy guns able to use burst fire. (#21005)
* Make energy guns able to use burst fire.

* Changed obj/item/weapon/gun/projectile to /gun/ballistic and the name of the folder from "projectile" to "ballistic" to avoid confusion between actually projectiles and guns.

Syringe gun, energy guns and magic guns can now use burst fire.

* fixing merge conflict shit

* fixing map conflicts

* more map conflict fix

* two tiny fixes.

* tiny tweak

* fixing merge conflicts.
Moving the practice mini egun to the gun module.
Renamed nuclear.dm to energy_gun.dm

* map conflict fixes
2016-11-02 16:16:21 +13:00
Joan Lung
d63d6149c9 Some small clockcult fixes 2016-11-01 15:05:27 -04:00
Joan Lung
4c7ecda6b8 good code 2016-11-01 13:33:27 -04:00
Cheridan
37c6f1e1ae Merge pull request #21310 from ChangelingRain/gearbits
Brass windows and windoors no longer drop full sheets of brass when destroyed
2016-11-01 09:09:51 -05:00
Joan Lung
ee76078d16 Merge pull request #21060 from phil235/Color_washing
Adding var/list/atom_colours to /atom .
2016-10-31 21:12:29 -04:00
phil235
0876b424a7 Tiny fixes and suggested changes.
Blight ability will still color your hair, and will be cleared when cured.
2016-11-01 01:59:23 +01:00
Joan Lung
80c8c23b91 only if ai 2016-10-31 18:18:58 -04:00
Joan Lung
ae8eac2977 Clockcult "Convert All Silicons" objective now requires Application scripture to also be unlocked 2016-10-31 16:32:55 -04:00
Joan Lung
8577ed02bf big gear big gear 2016-10-31 16:15:10 -04:00
duncathan salt
6f909d3748 Merge pull request #21261 from Xhuis/fix_bundle
Fix bundle
2016-10-31 13:58:27 -06:00
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
phil235
2dc956bea0 Merge branch 'master' of https://github.com/tgstation/-tg-station into Color_washing
# Conflicts:
#	code/game/gamemodes/clock_cult/clock_scripture.dm
#	code/game/gamemodes/clock_cult/clock_structures.dm
2016-10-31 19:59:00 +01:00
Joan Lung
550293de9a Merge pull request #21279 from lzimann/whydolingshaveamindswap
Removes ling "Swap form" ability
2016-10-31 11:43:17 -04:00
Joan Lung
d0f0b74957 Clockwork windows and windoors no longer drop full sheets of brass when destroyed 2016-10-31 10:27:31 -04:00
Joan Lung
93526ebbfc Ocular wardens no longer attack restrained targets 2016-10-30 12:24:44 -04:00
Lzimann
ca73d87708 Removes ling mind swap. 2016-10-30 13:48:11 -02: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
7262c16328 Merge pull request #21243 from lzimann/selflog
You can see your own attack log once again
2016-10-29 15:50:55 -04:00
Xhuis
398d4099e4 First pass: disposals, glands, tubes, and cocoons 2016-10-29 15:08:11 -04:00
Joan Lung
35f975699a BONUS 2016-10-29 12:04:26 -04:00
Joan Lung
add4f8ecf0 Component IDs are now defines 2016-10-29 11:40:33 -04:00
Cheridan
b1928c0a3a Merge pull request #21225 from ChangelingRain/cachewallsanity
Tinkerer's Caches no longer need to see a clockwork wall to link to it
2016-10-29 00:49:35 -05: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
oranges
0a0c91e83b Merge pull request #21209 from Shadowlight213/headcheck
Removes the possibility of a head of staff being selected as a revhead.
2016-10-29 18:14:02 +13:00
oranges
7e45df096b Merge pull request #21210 from ChangelingRain/quickshuttle
Arks of the Clockwork Justicar that do not summon Ratvar will still quick-call the shuttle
2016-10-29 11:34:53 +13:00
Joan Lung
856e54f0b8 Clockwork structures that use power will now handle APC power better (#21219)
* Clockwork structures that use power will now handle APC power better

* TRUUUUE POWEEEERRRR

* I don't actually need this check, because we don't have power without an apc and a cell
2016-10-29 11:34:22 +13:00
Joan Lung
df4bc0a093 Fixed a few bugs with clockwork proselytizers (#21221)
* Fixed a few bugs with clockwork proselytizers

* condensed

* formatting

* proselytizer.

* i need more sanity checks I think this crashed something

* proper!

* better desc

* sanity! SANITY!
2016-10-29 11:34:03 +13:00
Lzimann
90d76b652c You can see your own attack log once again 2016-10-28 17:35:22 -02:00