009f0ebeeb
Merge pull request #13013 from DeltaFire15/newnew-clock-misc-stuff
...
N tvsg sebz Nezbere (or: a bunch of clockcult related stuff)
2020-08-06 19:37:30 -07:00
164201ab27
Merge pull request #12956 from Arturlang/bloodsucker_death_lessspam
...
Makes bloodsucker death not spam now actually working
2020-08-05 15:15:30 -07:00
831ea372f8
buncha stuff
...
adds a check if the sigil is already busy which I forgot before, makes the brass claw wounds-2 compartible and changes some misc stuff
2020-08-04 17:33:57 +02:00
2a197af1c0
Merge remote-tracking branch 'upstream/master' into newnew-clock-misc-stuff
2020-08-04 17:30:38 +02:00
276d35a693
moves a check a few lines
...
tin
2020-08-04 16:59:02 +02:00
160991c5b4
Caps claw damage
...
The claw can now only have a maximum of bonus 18 damage caused by combo (after 10 consecutive hits against the same target), making it 33 damage total. The target shouldn't be standing by then anyways if they attacked them consecutively, but if they still are, better to have this capped.
2020-08-03 23:15:14 +02:00
a2155f9e91
more codersprite
...
clockie arm implants now have a somewhat different looking sprite (totally not just a normal arm implant recolor)
2020-08-03 22:13:50 +02:00
619a2e47b9
tiny phrasing change
2020-08-03 18:37:05 +02:00
9649a900e9
tweak to sigil of rites
...
The sigil of rites now needs two invokers to be able to be summoned.
2020-08-03 18:20:26 +02:00
d1622053d2
kindle tweaks
...
Time to cast back up to 1.5 seconds because yeah no you can't just stand still for a moment and kindle the guy chasing you.
But also: Kindle now mutes for five seconds (instead of 2) after it ends, and causes stuttering for five seconds after it ends (instead of 3)
2020-08-03 18:08:47 +02:00
be44bcfd1c
removes debug messages
...
not forgetting that.
2020-08-03 18:00:38 +02:00
b15ed5e3d1
smol tweaks
2020-08-03 17:58:18 +02:00
c898b54ed3
span & class torture
...
Unfucks a bunch of span stuff, adds a few comments
2020-08-03 17:55:10 +02:00
a75aac288d
Makes the Sigil of rites summonable and adds some more rites
...
The sigil of rites can now be summoned for 1400 power at tier two.
Two new rites are available: The rite of woundmending, which heals any wounds (not damage) a target may have, but causes 10 toxins damage per wound healed aswell as the rite of the claw, which summons a brass claw implant on the rune. This rite specifically can only be used a limited amount of times
2020-08-03 17:25:37 +02:00
7c871cbad1
oops
2020-08-03 15:43:35 +02:00
c0b9e2bace
updates some examines
...
little fix in the rite desc generation, brass claws now show combo / bonus damage, if their wielder if a clock cultist
2020-08-03 15:11:49 +02:00
932eeeecef
rites actually work now
...
Rites can be casted now, added a show info option on the sigil of rites, adds a TON of debug messages, if this is PRd while they are still in yell at me loudly. Also adds the rite of advancement, a rite used to implant organs into a servant, without surgery being required.
2020-08-03 14:43:50 +02:00
50c6586dd0
same here
2020-08-02 21:46:41 +02:00
3a750a8ae5
empty last line
2020-08-02 21:46:12 +02:00
abf825280b
Modifies a bunch and adds rite support
...
Clockie implants don't get detected by medscanners, brass claws get combo aka bonus damage on consecutive attacks against the same target, spears have a check for now accidentally draining vitality, and rite support has been added via a special sigil, though as of now there only is the 'base' rite which should never actually exist / be casted
2020-08-02 21:43:41 +02:00
289c186f32
Merge remote-tracking branch 'upstream/master' into wounds-part-2
2020-08-02 18:11:07 +01:00
03d01d917f
Merge branch 'master' into wounds-part-2
2020-08-02 18:10:31 +01:00
9dd9474164
Merge remote-tracking branch 'origin/master' into bloodsucker_death_lessspam
2020-08-02 11:12:18 +03:00
65d184c552
Merge pull request #12999 from KeRSedChaplain/guardianfix
...
Removes clockwork guardian's projectile deflection. OOPS!
2020-08-01 21:05:52 -07:00
6f2d4ac4df
makes clockwork guardians have no projectile deflection
2020-08-01 23:36:36 -04:00
7dab54e38f
butchering and smol edits
2020-08-01 22:15:38 +02:00
d6ba6373a6
comments
2020-08-01 20:36:08 +02:00
cf2b1b4d0b
fixes, tweaks and brass claws
...
Gives clockies a replica rabricator on roundstart, makes ratvarian spears able to parry (short parry cycle, short cooldown, timing is essence), adds brass claws to the code though they're not possible to acquire as of now.
2020-08-01 20:28:57 +02:00
128225ca6f
Merge pull request #12970 from kappa-sama/patch-35
...
salt pr
2020-08-01 03:34:17 -07:00
30d82d66d1
Merge pull request #12939 from Sishen1542/iaa-iaa
...
Reflavors IAA, removes certain items from IAA uplinks, adds TC stealing functionality to uplinks
2020-08-01 02:24:01 -07:00
974fd83e45
Merge pull request #12975 from MrJWhit/abductor-spawntext
...
Changes to abductors spawntext
2020-08-01 00:51:18 -07:00
320c91f4d3
Merge pull request #12742 from KeRSedChaplain/clockcultrework
...
Clockwork Cult rework
2020-08-01 00:17:11 -07:00
9e36d65a05
HAHAHAHA NOTHING TO SEE HERE
...
THIS VARIABLE HAS ALWAYS BEEN THERE WHAT DO YOU MEAN HAHAHAHAHA
2020-08-01 00:00:41 -04:00
7a0dff1f77
fixes the invisible slabs and buffs a couple scripture casting times
2020-07-31 23:03:59 -04:00
aa605ec007
Changes the death sound for Ratvar to have more oomph behind it
2020-07-31 21:02:12 -04:00
dfa26309d1
copypaste moment
2020-07-31 17:07:47 -04:00
9020e59aa0
kevinz fix
2020-07-31 04:32:46 +03:00
2e3922d08e
Merge remote-tracking branch 'origin/master' into bloodsucker_life
2020-07-31 02:07:14 +03:00
b22ffd6b6e
Makes it properly work
2020-07-31 02:07:03 +03:00
2a23f88438
Whoopsie
2020-07-30 12:44:44 -04:00
249cb136ef
Reworks abducotr spawn text
2020-07-30 12:38:30 -04:00
6356084fe9
this
2020-07-29 23:36:27 -04:00
c60e595d99
Merge pull request #12955 from Arturlang/bloodsucker_life
...
Plugs bloodsucker LifeTick into BiologicalLife
2020-07-29 14:02:22 -07:00
9721025582
Merge branch 'master' into wounds-part-2
2020-07-29 15:47:44 +01:00
a9e84df7f4
fix
2020-07-29 01:17:39 -07:00
e4148fe4ad
Merge remote-tracking branch 'citadel/master' into 12742
2020-07-29 01:11:11 -07:00
1416fd08dc
updates clockwork armor /what is magic defense even for i don't get it/
2020-07-29 00:15:11 -04:00
5284fbbec0
various fixes to make the PR not conflict with clickdelays probably
2020-07-28 23:52:13 -04:00
ef39e62e39
Makes bloodsucker death not spam now actually working
2020-07-29 02:11:14 +03:00
09f2594c37
Plugs bloodsucker LifeTick into BiologicalLife
2020-07-28 22:58:13 +03:00
silicons