3740e40256
sorry travis
2020-08-02 23:25:00 +01:00
50c6586dd0
same here
2020-08-02 21:46:41 +02:00
c1f2ef3b38
we can try
2020-08-02 20:46:15 +01:00
3a750a8ae5
empty last line
2020-08-02 21:46:12 +02:00
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
0bf9553eca
hmm
2020-08-02 19:13:39 +01:00
2885b861f2
Merge pull request #12954 from silicons/killer_queen
...
bomb stands now use components
2020-08-02 12:52:07 -05:00
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
591f824bde
Update explosion.dm
2020-08-02 00:32:58 -07:00
fdbf488d69
Update explosion.dm
2020-08-02 00:29:47 -07:00
f0a02c2c99
Update _storage.dm
2020-08-01 23:35:42 -07:00
aa782f1105
a
2020-08-02 02:27:24 -04:00
34a8d8f798
a
2020-08-02 01:38:23 -04:00
d4d2e4ae0d
Update _storage.dm
2020-08-01 21:07:07 -07: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
97c8b756ad
Update explosion.dm
2020-08-01 21:04:16 -07:00
a59eaff87e
fix
2020-08-01 21:01:48 -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
d0e8393e95
how did this end up here
2020-08-02 02:00:58 +01: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
94ee8bec08
ok
2020-08-01 19:19:59 -04:00
e71c397e29
bye
2020-08-01 16:55:39 -04:00
178976f5e5
no
2020-08-01 16:54:21 -04:00
58d1a066f2
hmm, would be busted considering price for ops.
2020-08-01 16:41:00 -04:00
7e0e60c126
Merge pull request #12993 from KeRSedChaplain/toyslabfixfortravis
...
Toyslabfixfortravis
2020-08-01 13:31:33 -07:00
44e6b6ccc7
I removed the Dread_Ipad, Clockwork Slab reigns supreme
2020-08-01 16:18:25 -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
7c8f03a81f
new defines
2020-08-01 18:29:27 +01:00
e8ec73ba7d
Merge pull request #12976 from Hatterhat/durathread-kits
...
Durathread Reinforcement Kits
2020-08-01 03:35:45 -07: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
11a0154ec1
changes Neovgre's sounds again
2020-08-01 01:26:35 -04:00
a2f6a7c207
Automatic changelog generation for PR #12979 [ci skip]
2020-08-01 00:16:53 -04:00
timothyteakettle