Commit Graph

26370 Commits

Author SHA1 Message Date
silicons 20dea7e41f fix 2020-08-01 20:45:49 -07:00
Dan-Neposh 6f2d4ac4df makes clockwork guardians have no projectile deflection 2020-08-01 23:36:36 -04:00
timothyteakettle d0e8393e95 how did this end up here 2020-08-02 02:00:58 +01:00
timothyteakettle d05c694ffe trader tweaks 2020-08-02 01:57:46 +01: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
kappa-sama 94ee8bec08 ok 2020-08-01 19:19:59 -04:00
kappa-sama e71c397e29 bye 2020-08-01 16:55:39 -04:00
kappa-sama 178976f5e5 no 2020-08-01 16:54:21 -04:00
b1tt3r1n0 58d1a066f2 hmm, would be busted considering price for ops. 2020-08-01 16:41:00 -04:00
silicons 7e0e60c126 Merge pull request #12993 from KeRSedChaplain/toyslabfixfortravis
Toyslabfixfortravis
2020-08-01 13:31:33 -07:00
Dan-Neposh 44e6b6ccc7 I removed the Dread_Ipad, Clockwork Slab reigns supreme 2020-08-01 16:18:25 -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
Hatterhat 6a5e26eb1c unatomic as shit 2020-08-01 12:31:13 -05:00
Timothy Teakettle 7c8f03a81f new defines 2020-08-01 18:29:27 +01: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
CitadelStationBot a2f6a7c207 Automatic changelog generation for PR #12979 [ci skip] 2020-08-01 00:16:53 -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 8d63714f3a make tongue preference dna 2020-07-31 23:04:29 +01: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 adf4a8a2e3 indent 2020-07-31 17:10:06 -04:00
kappa-sama cc34c4b1a2 no empty slot 😔 2020-07-31 17:09:54 -04: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
silicons 1c2bc1b632 Update _song.dm 2020-07-31 00:24:48 -07:00
silicons 3a773809b6 Update guardian.dm 2020-07-31 00:22:46 -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
silicons 6b87f5c87a Update syndicate.dm 2020-07-30 17:29:36 -07:00
silicons c178e53e2a Update syndicate.dm 2020-07-30 17:25:39 -07: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