Commit Graph

16247 Commits

Author SHA1 Message Date
silicons
bbcc36bdec ok 2020-08-03 22:31:31 -07:00
Hatterhat
4df9efb076 heho attack text 2020-08-04 00:29:30 -05: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
Hatterhat
25ab96cf53 funny revolver reskins 2020-08-03 20:39:06 -05:00
Letter N
454baea55f Merge remote-tracking branch 'origin/master' into TGUI-4 2020-08-04 09:31:34 +08:00
silicons
a4132c04ea Merge pull request #12894 from timothyteakettle/wounds-part-2
port of wounds part 2
2020-08-03 14:43:07 -07:00
Timothy Teakettle
91664f5064 bracket 2020-08-03 22:17:35 +01: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
Timothy Teakettle
5f8ed3ee3a acidproof 2020-08-03 22:14:42 +01:00
Timothy Teakettle
3a0b34fb1b funny aim go brr 2020-08-03 21:58:58 +01:00
Timothy Teakettle
8a3e69d32f no more inaccuracy 2020-08-03 21:40:10 +01: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
silicons
db8abc006a Merge pull request #13010 from Seris02/fixeslizards
lizards no longer break their spines ~~roundstart~~ EVER AGAIN I FUCKING FIXED THE DOUBLE SET_SPECIES LIZARD BUG
2020-08-03 12:54:00 -07:00
Timothy Teakettle
93c2924a00 lower cost 2020-08-03 17:41:30 +01:00
Timothy Teakettle
6fdfc19ea0 why can i not spell 2020-08-03 17:39:45 +01:00
Timothy Teakettle
da05108dd0 woops 2020-08-03 17:37:58 +01:00
DeltaFire
619a2e47b9 tiny phrasing change 2020-08-03 18:37:05 +02:00
Timothy Teakettle
2153f9ea35 i too, want people to be hit their ricochets 2020-08-03 17:36:40 +01: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
Timothy Teakettle
9b34407c9f uplink 2020-08-03 15:27:17 +01:00
Timothy Teakettle
34e2bd626f woops 2020-08-03 14:50:19 +01:00
Timothy Teakettle
2bbe4631d6 working ricochets 2020-08-03 14:46:24 +01:00
DeltaFire
7c871cbad1 oops 2020-08-03 15:43:35 +02:00
Seris02
5551e323cc Update tails.dm 2020-08-03 21:41:30 +08:00
Seris02
82790cffed fixes lizard code 2020-08-03 21:39:11 +08: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
silicons
d5a19ea4b2 Merge pull request #13004 from zeroisthebiggay/tailwagfuckyou
prefs for headpat wagging
2020-08-03 02:30:57 -07:00
Seris02
aeec3a3404 lizards no longer have broken spines 2020-08-03 17:29:32 +08:00
Ludox
f7045a55a2 Le shitcode has arrived. 2020-08-03 07:18:46 +02:00
Ludox
f8838d4a8c Lets people fuck with the AI harder
I am a masochist.
2020-08-03 07:16:49 +02:00
zerothebigboy
d3cfa47d65 a 2020-08-02 22:27:42 -04:00
zerothebigboy
2d4127a9a7 a 2020-08-02 22:26:45 -04:00
zerothebigboy
ec2a19660a a 2020-08-02 22:18:24 -04:00
zerothebigboy
35c5c2f4cd a 2020-08-02 22:17:44 -04:00
timothyteakettle
3740e40256 sorry travis 2020-08-02 23:25:00 +01:00
DeltaFire
50c6586dd0 same here 2020-08-02 21:46:41 +02:00
Timothy Teakettle
c1f2ef3b38 we can try 2020-08-02 20:46:15 +01: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
0bf9553eca hmm 2020-08-02 19:13:39 +01:00
Lin
2885b861f2 Merge pull request #12954 from silicons/killer_queen
bomb stands now use components
2020-08-02 12:52:07 -05:00