Dan-Neposh
aa605ec007
Changes the death sound for Ratvar to have more oomph behind it
2020-07-31 21:02:12 -04: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
silicons
90d3cff53f
Merge remote-tracking branch 'citadel/master' into 12742
2020-07-29 11:53:59 -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
e4148fe4ad
Merge remote-tracking branch 'citadel/master' into 12742
2020-07-29 01:11:11 -07:00
silicons
9ff94e019b
Merge pull request #12924 from SiliconMain/analyzer
...
Ports long range atmos analyzer from skyrat
2020-07-29 01:09:48 -07:00
silicons
78312c23bf
sigh
2020-07-28 21:53:07 -07:00
Keate Senior
1416fd08dc
updates clockwork armor /what is magic defense even for i don't get it/
2020-07-29 00:15:11 -04:00
Keate Senior
5284fbbec0
various fixes to make the PR not conflict with clickdelays probably
2020-07-28 23:52:13 -04:00
Lin
447a0b24bf
Merge pull request #12944 from timothyteakettle/fixes-crates
...
fixes some crafted crates containing items
2020-07-28 22:11:30 -05:00
Lin
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
Lin
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
Lin
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
Lin
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
Lin
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
Lin
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
Lin
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
Lin
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
silicons
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
silicons
d8378e64be
Merge pull request #12942 from DeltaFire15/outfit-fix
...
Fixes the 'Naked' outfit
2020-07-28 13:26:23 -07:00
silicons
ab67ae3291
Merge pull request #12951 from timothyteakettle/haha-yes-blood
...
bloodsucker blood loss fix
2020-07-28 13:26:07 -07:00
silicons
0152dcda65
fix
2020-07-28 13:24:45 -07:00
DeltaFire
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
silicons
8313485632
fix
2020-07-28 11:31:28 -07:00
silicons
6c83beea02
Merge pull request #12937 from Ghommie/Ghommie-cit834
...
Fixing new bugs and stuff.
2020-07-28 10:46:17 -07:00
silicons
cac1627d26
Merge pull request #12936 from zeroisthebiggay/weenjoystealingfashion
...
Ports RP flannel jackets and a winter coat
2020-07-28 10:45:54 -07:00
silicons
a5063a92b9
Merge pull request #12941 from timothyteakettle/alien-embeds-work
...
aliens can remove embeds now
2020-07-28 10:45:31 -07:00
Timothy Teakettle
c8960624d3
sorry artur
2020-07-28 18:37:01 +01:00
Keate Senior
af02490739
still conflicts with clickdelays bluh whatever I'll fix it if its merged
2020-07-28 13:21:27 -04:00
silicons
475d8ed6fb
Merge pull request #12950 from timothyteakettle/species-are-dumb
...
tail wagging fix
2020-07-28 10:15:17 -07:00
Keate Senior
daed810c3a
I didn't get to see if it'd still conflict with the clickdelay testmerge
...
ugghh I shouldn't be coding when my second brain cell falls asleep but hey at least the change is incredibly small
2020-07-28 12:59:34 -04:00
Timothy Teakettle
72972e1659
some species code fixes
2020-07-28 17:56:50 +01:00
Hatterhat
8a32cac8db
window rotation fix
2020-07-28 10:47:07 -05:00
Keate Senior
e8d4d5b053
Revert "Revert "Revert "THIS COMMIT IS PURELY SO IT WORKS WITH KEVINS CLICKDELAYS #12834 """
...
This reverts commit 0e6fe357da
2020-07-28 05:00:13 -04:00
Keate Senior
0e6fe357da
Revert "Revert "THIS COMMIT IS PURELY SO IT WORKS WITH KEVINS CLICKDELAYS #12834 ""
...
This reverts commit 4b876ef9fb
2020-07-28 04:59:58 -04:00
Keate Senior
4b876ef9fb
Revert "THIS COMMIT IS PURELY SO IT WORKS WITH KEVINS CLICKDELAYS #12834 "
...
This reverts commit 7e1cab15ae
2020-07-28 04:07:41 -04:00
Keate Senior
7e1cab15ae
THIS COMMIT IS PURELY SO IT WORKS WITH KEVINS CLICKDELAYS #12834
...
REVERT IF CLICKDELAYS ARE UN-TESTMERGED
2020-07-28 04:07:01 -04:00
silicons
b0f03eac12
ok
2020-07-27 21:06:03 -07:00
silicons
2ba01663e5
Merge pull request #12945 from timothyteakettle/jar-fixes
...
bluespace jar / pet carrier logic tweak so it works correctly
2020-07-27 19:21:16 -07:00
timothyteakettle
f36071bb64
wouldnt it be cool if i tested the small logic change
2020-07-28 03:09:07 +01:00
silicons
ffcfd21613
fix
2020-07-27 14:24:10 -07:00
silicons
5bf4afcade
sigh
2020-07-27 14:09:37 -07:00
Timothy Teakettle
dc14c02570
fix crates
2020-07-27 21:55:51 +01:00
silicons
dc278d7b02
woops
2020-07-27 13:11:26 -07:00
silicons
67b518bf42
experimental
2020-07-27 13:09:54 -07:00
DeltaFire
9f3e7755ae
two line fix
...
tin
2020-07-27 21:30:13 +02:00
Timothy Teakettle
8d9c94c087
aliens can remove embeds now
2020-07-27 17:59:05 +01:00
Lin
87eac49bbf
Merge pull request #12862 from Citadel-Station-13/silicons-patch-44
...
you can now shoot yourself with a gun by using disarm intent will this cause balance issues maybe do i care not really
2020-07-27 11:46:37 -05:00
