shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
36,772 Commits 5 Branches 0 Tags
bd239b01b302091b68fbf92553dc4eff00cbcb49
Commit Graph

1529 Commits

Author SHA1 Message Date
silicons
f20f01cc6b Merge pull request #12853 from LetterN/TGUI-4 
TGUI4 port
 2020-08-09 05:46:21 -07:00
silicons
25d7b15478 Merge pull request #13060 from Hatterhat/timestop-katana 
wizard timestop parrying katana
 2020-08-09 05:41:55 -07:00
Letter N
f1c4a7f6ac Merge remote-tracking branch 'origin/master' into TGUI-4 2020-08-09 14:54:16 +08:00
Hatterhat
7c7eff12c3 wizard buyable 2020-08-08 00:52:39 -05:00
Letter N
cc98f50eb6 what if slabs still show things even if ratvar is free? Does not fix "the sleeper" though 2020-08-07 11:25:36 +08:00
silicons
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
Letter N
333ca2cc7b Merge remote-tracking branch 'origin/master' into TGUI-4 2020-08-06 18:26:04 +08:00
silicons
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
Letter N
ed67801590 what if the tgui actualy recives it's topic? 2020-08-05 09:21:19 +08:00
DeltaFire
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
DeltaFire
2a197af1c0 Merge remote-tracking branch 'upstream/master' into newnew-clock-misc-stuff 2020-08-04 17:30:38 +02:00
DeltaFire
276d35a693 moves a check a few lines 
tin
 2020-08-04 16:59:02 +02:00
Letter N
07c02e1c99 Commit message. Fixes slab 2020-08-04 16:26:30 +08:00
Letter N
7c7d635193 what if atmos relief works? and all the other ui's gets updated 2020-08-04 12:54:55 +08:00
Letter N
454baea55f Merge remote-tracking branch 'origin/master' into TGUI-4 2020-08-04 09:31:34 +08:00
DeltaFire
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
DeltaFire
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
DeltaFire
619a2e47b9 tiny phrasing change 2020-08-03 18:37:05 +02:00
DeltaFire
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
DeltaFire
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
DeltaFire
be44bcfd1c removes debug messages 
not forgetting that.
 2020-08-03 18:00:38 +02:00
DeltaFire
b15ed5e3d1 smol tweaks 2020-08-03 17:58:18 +02:00
DeltaFire
c898b54ed3 span & class torture 
Unfucks a bunch of span stuff, adds a few comments
 2020-08-03 17:55:10 +02:00
DeltaFire
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
DeltaFire
7c871cbad1 oops 2020-08-03 15:43:35 +02:00
Letter N
b30607b759 ayys update - ordering shit 2020-08-03 21:37:11 +08:00
Letter N
9a9e3ffef5 fixfixfix squared. Will not fix missing clockslab tabs, you just have to give it a category. 2020-08-03 21:14:17 +08:00
DeltaFire
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
Letter N
a19e306137 less redtext - updates anomalies 2020-08-03 20:53:36 +08:00
DeltaFire
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
DeltaFire
50c6586dd0 same here 2020-08-02 21:46:41 +02:00
DeltaFire
3a750a8ae5 empty last line 2020-08-02 21:46:12 +02:00
DeltaFire
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
Timothy Teakettle
289c186f32 Merge remote-tracking branch 'upstream/master' into wounds-part-2 2020-08-02 18:11:07 +01:00
Timothy Teakettle
03d01d917f Merge branch 'master' into wounds-part-2 2020-08-02 18:10:31 +01:00
Artur
9dd9474164 Merge remote-tracking branch 'origin/master' into bloodsucker_death_lessspam 2020-08-02 11:12:18 +03:00
silicons
65d184c552 Merge pull request #12999 from KeRSedChaplain/guardianfix 
Removes clockwork guardian's projectile deflection. OOPS!
 2020-08-01 21:05:52 -07:00
Dan-Neposh
6f2d4ac4df makes clockwork guardians have no projectile deflection 2020-08-01 23:36:36 -04:00
DeltaFire
7dab54e38f butchering and smol edits 2020-08-01 22:15:38 +02:00
DeltaFire
d6ba6373a6 comments 2020-08-01 20:36:08 +02:00
DeltaFire
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
silicons
128225ca6f Merge pull request #12970 from kappa-sama/patch-35 
salt pr
 2020-08-01 03:34:17 -07:00
silicons
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
silicons
974fd83e45 Merge pull request #12975 from MrJWhit/abductor-spawntext 
Changes to abductors spawntext
 2020-08-01 00:51:18 -07:00
silicons
320c91f4d3 Merge pull request #12742 from KeRSedChaplain/clockcultrework 
Clockwork Cult rework
 2020-08-01 00:17:11 -07:00
Dan-Neposh
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
Dan-Neposh
7a0dff1f77 fixes the invisible slabs and buffs a couple scripture casting times 2020-07-31 23:03:59 -04:00
Dan-Neposh
aa605ec007 Changes the death sound for Ratvar to have more oomph behind it 2020-07-31 21:02:12 -04:00
kappa-sama
dfa26309d1 copypaste moment 2020-07-31 17:07:47 -04:00
Artur
9020e59aa0 kevinz fix 2020-07-31 04:32:46 +03:00