Commit Graph

15824 Commits

Author SHA1 Message Date
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
silicons a4132c04ea Merge pull request #12894 from timothyteakettle/wounds-part-2
port of wounds part 2
2020-08-03 14:43:07 -07: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
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
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
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
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
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
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
Lin 2885b861f2 Merge pull request #12954 from silicons/killer_queen
bomb stands now use components
2020-08-02 12:52:07 -05: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
silicons 06f5ce6401 buffs shoving (#12925)
* ^w^

* ok

* ok
2020-08-02 18:30:09 +02:00
zerothebigboy aa782f1105 a 2020-08-02 02:27:24 -04:00
zerothebigboy 34a8d8f798 a 2020-08-02 01:38:23 -04: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
silicons 25d1fb761a Merge remote-tracking branch 'citadel/master' into killer_queen 2020-08-01 20:51:38 -07:00
Dan-Neposh 6f2d4ac4df makes clockwork guardians have no projectile deflection 2020-08-01 23:36:36 -04:00
Lin d107d2ec49 Merge pull request #12983 from Citadel-Station-13/silicons-patch-63
fixes nukeops timer being from server start instead of roundstart which gives them 5 free minutes am i salty maybe just a little (no i'm not but we should fix this anyways)
2020-08-01 19:45:42 -05: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 2230a3665a Merge pull request #12965 from timothyteakettle/end-our-suffering
drastically lowers the damage-related benefits of combat mode
2020-08-01 03:33:43 -07:00
silicons 8dfa3fcce8 Merge pull request #12947 from Seris02/podpersonfix
replica pod fix bounty
2020-08-01 03:29:16 -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
silicons bc254eb31a Merge pull request #12979 from Auris456852/master
Adds roboticist cartridge to the PDA vendor
2020-07-31 19:45:15 -07:00
silicons 053e18247b Merge pull request #12966 from ike709/master
CentCom Galactic Ban DB
2020-07-31 19:44:40 -07:00
Dan-Neposh aa605ec007 Changes the death sound for Ratvar to have more oomph behind it 2020-07-31 21:02:12 -04:00
silicons d1edbab264 Update life.dm 2020-07-31 14:39:40 -07:00
kappa-sama dfa26309d1 copypaste moment 2020-07-31 17:07:47 -04:00