aa605ec007
Changes the death sound for Ratvar to have more oomph behind it
2020-07-31 21:02:12 -04:00
4e7c5b0377
fixes the inhand sprite for clockwork slabs
2020-07-31 00:32:11 -04:00
9b3ed3009f
updates the credits bit of clockwork cult
2020-07-31 00:14:23 -04:00
8b0b579c99
Merge pull request #11 from DeltaFire15/HAHA-FUCK
...
Fixes the clockcult gamemode -Deltafire
2020-07-30 23:37:52 -04:00
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
90d3cff53f
Merge remote-tracking branch 'citadel/master' into 12742
2020-07-29 11:53:59 -07:00
446e0df667
Merge pull request #12961 from timothyteakettle/travis-patch-1
...
if travis approves this then it fixes travis
2020-07-29 11:12:35 -07:00
097327b4f3
Revert "Merge branch 'master' into travis-patch-1"
...
This reverts commit de3d6310b2f8f29826f5
2020-07-29 19:02:18 +01:00
9a9993c7be
yep
2020-07-29 19:00:06 +01:00
de3d6310b2
Merge branch 'master' into travis-patch-1
2020-07-29 18:59:21 +01:00
1bc2404bae
revert cc
2020-07-29 01:47:14 -07:00
a9e84df7f4
fix
2020-07-29 01:17:39 -07:00
e4148fe4ad
Merge remote-tracking branch 'citadel/master' into 12742
2020-07-29 01:11:11 -07:00
f8f29826f5
Automatic changelog generation for PR #12924 [ci skip]
2020-07-29 03:09:51 -05:00
9ff94e019b
Merge pull request #12924 from SiliconMain/analyzer
...
Ports long range atmos analyzer from skyrat
2020-07-29 01:09:48 -07:00
fbf81930c3
Merge pull request #12958 from silicons/fix_142
...
haha nothing to see here woops
2020-07-29 00:20:45 -05:00
1c2eefb8d6
.
2020-07-28 22:11:51 -07:00
78312c23bf
sigh
2020-07-28 21:53:07 -07:00
1416fd08dc
updates clockwork armor /what is magic defense even for i don't get it/
2020-07-29 00:15:11 -04:00
5284fbbec0
various fixes to make the PR not conflict with clickdelays probably
2020-07-28 23:52:13 -04:00
9a129d8683
Merge pull request #9 from DeltaFire15/prolonging-prism-update
...
Updates the clockie delay structure
2020-07-28 23:20:58 -04:00
dbc766a7ca
Automatic changelog generation for PR #12922 [ci skip]
2020-07-28 22:17:10 -05:00
a560920f3c
Merge pull request #12922 from timothyteakettle/let-bots-wear-hats
...
beepsky hats now move with beepsky when he bobs up and down
2020-07-28 22:17:06 -05:00
481f29fc07
Automatic changelog generation for PR #12944 [ci skip]
2020-07-28 22:11:34 -05:00
447a0b24bf
Merge pull request #12944 from timothyteakettle/fixes-crates
...
fixes some crafted crates containing items
2020-07-28 22:11:30 -05:00
105cc8dc70
Automatic changelog generation for PR #12883 [ci skip]
2020-07-28 22:05:42 -05:00
bbffd41d55
Merge pull request #12883 from Citadel-Station-13/silicons-patch-49
...
beam rifles are now practical in emitters
2020-07-28 22:05:39 -05:00
be20861294
Automatic changelog generation for PR #12734 [ci skip]
2020-07-28 21:51:46 -05:00
a5dd08a054
Merge pull request #12734 from silicons/shoelaces
...
shoelaces. untying people's shoelaces. admin smite to untie someone's shoelaces. credit to shaps/tg.
2020-07-28 21:51:43 -05:00
2e63c17456
Automatic changelog generation for PR #12834 [ci skip]
2020-07-28 21:51:14 -05:00
81a7542aa6
Merge pull request #12834 from silicons/clickcd_experimental
...
Experimental hybrid clickdelay system (No seriously I'm trying my best to not call it Minecraft attack delays)
2020-07-28 21:51:10 -05:00
3371022275
Automatic changelog generation for PR #12929 [ci skip]
2020-07-28 21:48:17 -05:00
ae02a7348c
Merge pull request #12929 from Citadel-Station-13/silicons-patch-59
...
silicons (and all other nonhuman mobs) can now block (with the right items)
2020-07-28 21:48:14 -05:00
13e50ced55
Automatic changelog generation for PR #12928 [ci skip]
2020-07-28 21:48:07 -05:00
e8ab87c396
Merge pull request #12928 from Citadel-Station-13/silicons-patch-58
...
silicons (and any other nonhuman mob) can now parry
2020-07-28 21:48:03 -05:00
9e07eeb84d
Automatic changelog generation for PR #12932 [ci skip]
2020-07-28 21:45:58 -05:00
91dc8b96d0
Merge pull request #12932 from silicons/ok_2
...
perfect parries with an energy sword now reflect projectiles back at their shooter
2020-07-28 21:45:53 -05:00
18fa47e479
Merge pull request #12931 from Citadel-Station-13/silicons-patch-61
...
nerfs parrying bullets with a wooden stick following complaints
2020-07-28 21:45:36 -05:00
3825bb73df
Automatic changelog generation for PR #12930 [ci skip]
2020-07-28 21:45:14 -05:00
e93dddf5cc
Merge pull request #12930 from Citadel-Station-13/silicons-patch-60
...
so you think you can parry turrets
2020-07-28 21:45:10 -05:00
7bc458b43e
Automatic changelog compile [ci skip]
2020-07-29 00:11:03 +00:00
8c2e23e603
Automatic changelog generation for PR #12948 [ci skip]
2020-07-28 15:27:16 -05:00
93da2515b6
Merge pull request #12948 from Hatterhat/windows
...
[speedmerge? it's not that bad i swear] directional window rotation fix
2020-07-28 13:27:12 -07:00
08a6d140aa
Automatic changelog generation for PR #12942 [ci skip]
2020-07-28 15:26:26 -05:00
d8378e64be
Merge pull request #12942 from DeltaFire15/outfit-fix
...
Fixes the 'Naked' outfit
2020-07-28 13:26:23 -07:00
1ef086dffb
Automatic changelog generation for PR #12951 [ci skip]
2020-07-28 15:26:11 -05:00
ab67ae3291
Merge pull request #12951 from timothyteakettle/haha-yes-blood
...
bloodsucker blood loss fix
2020-07-28 13:26:07 -07:00
0152dcda65
fix
2020-07-28 13:24:45 -07:00
aa0670e34c
Updates the clockie delay structure
...
Prolonging prisms exist again. They can be built application-tier and take one minute to delay the shuttle by two minutes (So, basically, you end up with one minute more on the timer before it started). It costs 2000 power for the initial use, and 1000 additional power per time it was already used. Oh, and it creates a reeeaaally obvious effect pointing anyone towards the structure. So, good luck defending it.
Also fixes up some scripture sorting but that's minor.
2020-07-28 21:37:05 +02:00
8313485632
fix
2020-07-28 11:31:28 -07:00
Dan-Neposh