Commit Graph
24081 Commits
Author SHA1 Message Date
lolman360 61ed83027d asj 2020-08-05 18:40:33 +10:00
siliconsandGitHub 810962c633 Update blood.dm 2020-08-05 01:29:51 -07:00
siliconsandGitHub 3e2ab66afa Update shields.dm 2020-08-04 21:34:59 -07:00
silicons c0ac492d07 ok 2020-08-04 21:01:06 -07:00
Hatterhat 06f3eb5e80 wacky ass 2020-08-04 22:58:51 -05:00
silicons d79cc5f85d oof 2020-08-04 20:57:37 -07:00
silicons 0a137d2584 whew 2020-08-04 20:52:35 -07: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
TrilbySpaceClone 5d5459a318 Merge branch 'tea' of https://github.com/Trilbyspaceclone/Citadel-Station-13 into tea 2020-08-04 10:07:10 -04:00
TrilbySpaceClone f2e4b7eacc grammer 2020-08-04 10:07:04 -04:00
TrilbyspacecloneandGitHub 4ea05ab07e Update drink_reagents.dm 2020-08-04 09:33:05 -04:00
TrilbySpaceClone 0f29235e6a Tea Party 2020-08-04 09:15:44 -04:00
silicons bbcc36bdec ok 2020-08-03 22:31:31 -07:00
Hatterhat 4df9efb076 heho attack text 2020-08-04 00:29:30 -05:00
Hatterhat 6420914290 k 2020-08-03 23:45:34 -05:00
Hatterhat 25ab96cf53 funny revolver reskins 2020-08-03 20:39:06 -05:00
siliconsandGitHub 3b1826ce82 Update portable_turret.dm 2020-08-03 18:29:11 -07:00
Hatterhat 157d5c29a6 door charge nerf (tentative) 2020-08-03 19:47:04 -05:00
siliconsandGitHub 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 75641d922e this'll probably be better 2020-08-03 13:02:25 -07:00
siliconsandGitHub 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
Seris02andGitHub 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
siliconsandGitHub 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