ccee254546
proof of concept: crusherglaive - squashed
2020-08-02 12:30:14 -05:00
289c186f32
Merge remote-tracking branch 'upstream/master' into wounds-part-2
2020-08-02 18:11:07 +01:00
03d01d917f
Merge branch 'master' into wounds-part-2
2020-08-02 18:10:31 +01:00
f7093f2f84
yes
2020-08-02 17:32:13 +01:00
06f5ce6401
buffs shoving ( #12925 )
...
* ^w^
* ok
* ok
2020-08-02 18:30:09 +02:00
9dd9474164
Merge remote-tracking branch 'origin/master' into bloodsucker_death_lessspam
2020-08-02 11:12:18 +03:00
aa782f1105
a
2020-08-02 02:27:24 -04:00
34a8d8f798
a
2020-08-02 01:38:23 -04:00
65d184c552
Merge pull request #12999 from KeRSedChaplain/guardianfix
...
Removes clockwork guardian's projectile deflection. OOPS!
2020-08-01 21:05:52 -07:00
8b2163792a
Update necropolis_chests.dm
2020-08-01 21:05:23 -07:00
25d1fb761a
Merge remote-tracking branch 'citadel/master' into killer_queen
2020-08-01 20:51:38 -07:00
3fa35e4fa6
fix
2020-08-01 20:49:31 -07:00
20dea7e41f
fix
2020-08-01 20:45:49 -07:00
6f2d4ac4df
makes clockwork guardians have no projectile deflection
2020-08-01 23:36:36 -04:00
d05c694ffe
trader tweaks
2020-08-02 01:57:46 +01:00
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
e71c397e29
bye
2020-08-01 16:55:39 -04:00
58d1a066f2
hmm, would be busted considering price for ops.
2020-08-01 16:41:00 -04:00
7dab54e38f
butchering and smol edits
2020-08-01 22:15:38 +02:00
d6ba6373a6
comments
2020-08-01 20:36:08 +02:00
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
6a5e26eb1c
unatomic as shit
2020-08-01 12:31:13 -05:00
128225ca6f
Merge pull request #12970 from kappa-sama/patch-35
...
salt pr
2020-08-01 03:34:17 -07:00
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
8dfa3fcce8
Merge pull request #12947 from Seris02/podpersonfix
...
replica pod fix bounty
2020-08-01 03:29:16 -07:00
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
974fd83e45
Merge pull request #12975 from MrJWhit/abductor-spawntext
...
Changes to abductors spawntext
2020-08-01 00:51:18 -07:00
320c91f4d3
Merge pull request #12742 from KeRSedChaplain/clockcultrework
...
Clockwork Cult rework
2020-08-01 00:17:11 -07:00
a2f6a7c207
Automatic changelog generation for PR #12979 [ci skip]
2020-08-01 00:16:53 -04:00
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
7a0dff1f77
fixes the invisible slabs and buffs a couple scripture casting times
2020-07-31 23:03:59 -04:00
bc254eb31a
Merge pull request #12979 from Auris456852/master
...
Adds roboticist cartridge to the PDA vendor
2020-07-31 19:45:15 -07:00
053e18247b
Merge pull request #12966 from ike709/master
...
CentCom Galactic Ban DB
2020-07-31 19:44:40 -07:00
aa605ec007
Changes the death sound for Ratvar to have more oomph behind it
2020-07-31 21:02:12 -04:00
8d63714f3a
make tongue preference dna
2020-07-31 23:04:29 +01:00
d1edbab264
Update life.dm
2020-07-31 14:39:40 -07:00
dfa26309d1
copypaste moment
2020-07-31 17:07:47 -04:00
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
16fb4b3291
Merge pull request #12964 from timothyteakettle/monkeys-bleed-a-lot
...
monkeys stop bleeding nonstop
2020-07-31 14:21:57 -05:00
1c2bc1b632
Update _song.dm
2020-07-31 00:24:48 -07:00
3a773809b6
Update guardian.dm
2020-07-31 00:22:46 -07:00
9020e59aa0
kevinz fix
2020-07-31 04:32:46 +03:00
6b87f5c87a
Update syndicate.dm
2020-07-30 17:29:36 -07:00
c178e53e2a
Update syndicate.dm
2020-07-30 17:25:39 -07:00
2e3922d08e
Merge remote-tracking branch 'origin/master' into bloodsucker_life
2020-07-31 02:07:14 +03:00
b22ffd6b6e
Makes it properly work
2020-07-31 02:07:03 +03:00
03cff55017
Adds roboticist cartridge to the PDA vendor.
2020-07-30 23:31:31 +03:00
2a23f88438
Whoopsie
2020-07-30 12:44:44 -04:00
249cb136ef
Reworks abducotr spawn text
2020-07-30 12:38:30 -04:00
e40470f553
h. Updates NTOS, and axes p2p filetransfer!
2020-07-30 20:54:13 +08:00
Hatterhat