Commit Graph

23908 Commits

Author SHA1 Message Date
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
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 e8ec73ba7d Merge pull request #12976 from Hatterhat/durathread-kits
Durathread Reinforcement Kits
2020-08-01 03:35:45 -07: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 11a0154ec1 changes Neovgre's sounds again 2020-08-01 01:26:35 -04: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
timothyteakettle e17e1c3a11 conforms to same as everything else 2020-07-31 22:45:03 +01: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
Lin 159d5c1896 Merge pull request #12985 from Citadel-Station-13/silicons-patch-64
okay so no-clickdelay telekinetic sharp-object-throwing is not okay.
2020-07-31 14:27:14 -05:00
Lin b9848dbaee Merge pull request #12967 from Citadel-Station-13/silicons-patch-50
you need two hands free to fire the foam force crossbow! (no, you shouldn't.)
2020-07-31 14:22:11 -05:00
Lin 16fb4b3291 Merge pull request #12964 from timothyteakettle/monkeys-bleed-a-lot
monkeys stop bleeding nonstop
2020-07-31 14:21:57 -05:00
silicons ad75ac0c6d Update telekinesis.dm 2020-07-31 02:30:56 -07:00
Dan-Neposh 9b3ed3009f updates the credits bit of clockwork cult 2020-07-31 00:14:23 -04:00
DeltaFire abe2f83869 Fixes the clockcult gamemode
Servants no longer spawn / stay on the start screen and have no role (haha OOPS). Things SHOULD work now, at least on local with debug mode on, I give no guarantees.
2020-07-31 05:30:21 +02:00
Artur 9020e59aa0 kevinz fix 2020-07-31 04:32:46 +03:00
Artur 2e3922d08e Merge remote-tracking branch 'origin/master' into bloodsucker_life 2020-07-31 02:07:14 +03:00
Artur b22ffd6b6e Makes it properly work 2020-07-31 02:07:03 +03:00
Auris456852 03cff55017 Adds roboticist cartridge to the PDA vendor. 2020-07-30 23:31:31 +03:00
Hatterhat 6dfdff34ef durathread armor kits 2020-07-30 13:38:04 -05:00
MrJWhit 2a23f88438 Whoopsie 2020-07-30 12:44:44 -04:00
MrJWhit 249cb136ef Reworks abducotr spawn text 2020-07-30 12:38:30 -04:00
kappa-sama 6356084fe9 this 2020-07-29 23:36:27 -04:00
silicons f02bc4a572 Update toy.dm 2020-07-29 19:49:11 -07:00
Unknown 16722c47c3 CentCom Galactic Ban DB 2020-07-29 21:39:58 -05:00
timothyteakettle caaedce6e2 end our suffering 2020-07-30 02:33:39 +01:00
timothyteakettle 55be55ce0f Revert "end our suffering"
This reverts commit 4e1fcc4e08.
2020-07-30 02:29:13 +01:00
timothyteakettle 4e1fcc4e08 end our suffering 2020-07-30 02:28:53 +01:00
timothyteakettle 940fe8240d monkey blood fix 2020-07-30 01:57:09 +01:00
Sishen 7fa5ccbd0e fixes slapping uplinks with non uplink items giving runtimes 2020-07-29 16:14:01 -06:00
silicons c60e595d99 Merge pull request #12955 from Arturlang/bloodsucker_life
Plugs bloodsucker LifeTick into BiologicalLife
2020-07-29 14:02:22 -07:00
Lin 41a711ff01 Merge pull request #12959 from Citadel-Station-13/AAAAAAA
FIXES LINTER ON MASTER
2020-07-29 15:59:20 -05:00
Lin a7fe7f1317 Merge pull request #12953 from Adelphon/pog
Adds Camo To AutoDrobe (fix)
2020-07-29 15:48:45 -05:00
silicons 90d3cff53f Merge remote-tracking branch 'citadel/master' into 12742 2020-07-29 11:53:59 -07:00
silicons ad3092d883 Merge branch 'master' into AAAAAAA 2020-07-29 11:13:33 -07:00
Timothy Teakettle 9a9993c7be yep 2020-07-29 19:00:06 +01:00
silicons a9e84df7f4 fix 2020-07-29 01:17:39 -07:00
silicons bc823b544f sigh 2020-07-29 01:17:16 -07:00
silicons e4148fe4ad Merge remote-tracking branch 'citadel/master' into 12742 2020-07-29 01:11:11 -07:00