447a0b24bf
Merge pull request #12944 from timothyteakettle/fixes-crates
...
fixes some crafted crates containing items
2020-07-28 22:11:30 -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
c15d0de20d
subcategories work
2020-07-29 03:57:16 +01: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
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
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
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
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
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
ef39e62e39
Makes bloodsucker death not spam now actually working
2020-07-29 02:11:14 +03:00
e0d9c7972d
Makes it actually work
2020-07-29 01:50:40 +03:00
721e018aec
loadout stuff
2020-07-28 22:52:00 +01: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
d8378e64be
Merge pull request #12942 from DeltaFire15/outfit-fix
...
Fixes the 'Naked' outfit
2020-07-28 13:26:23 -07: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
09f2594c37
Plugs bloodsucker LifeTick into BiologicalLife
2020-07-28 22:58:13 +03: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
c87c2bd850
smh
2020-07-28 12:31:35 -07:00
78b6a60e80
oh
2020-07-28 12:25:27 -07:00
fd738fd16a
spelling
2020-07-28 12:12:30 -07:00
4ab175d812
sigh
2020-07-28 12:10:34 -07:00
c720e800df
whew!
2020-07-28 12:08:02 -07:00
1f508ef15d
Adds Camo To AutoDrobe (fix)
...
Adds syndicate Camo to Autodrobe WITHOUT the armor bonuses.
2020-07-28 15:04:58 -04:00
8313485632
fix
2020-07-28 11:31:28 -07:00
6c83beea02
Merge pull request #12937 from Ghommie/Ghommie-cit834
...
Fixing new bugs and stuff.
2020-07-28 10:46:17 -07:00
cac1627d26
Merge pull request #12936 from zeroisthebiggay/weenjoystealingfashion
...
Ports RP flannel jackets and a winter coat
2020-07-28 10:45:54 -07:00
a5063a92b9
Merge pull request #12941 from timothyteakettle/alien-embeds-work
...
aliens can remove embeds now
2020-07-28 10:45:31 -07:00
c8960624d3
sorry artur
2020-07-28 18:37:01 +01:00
af02490739
still conflicts with clickdelays bluh whatever I'll fix it if its merged
2020-07-28 13:21:27 -04:00
475d8ed6fb
Merge pull request #12950 from timothyteakettle/species-are-dumb
...
tail wagging fix
2020-07-28 10:15:17 -07:00
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
72972e1659
some species code fixes
2020-07-28 17:56:50 +01:00
8a32cac8db
window rotation fix
2020-07-28 10:47:07 -05:00
0d85f0553b
bumps krav down to 25, only give martyr to syndie iaa
2020-07-28 09:30:26 -06:00
dcd2c11f4e
yay indicator
2020-07-28 20:43:38 +08:00
84e9f406c7
yay it fix time for indicator
2020-07-28 17:41:17 +08:00
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
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
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
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
b0f03eac12
ok
2020-07-27 21:06:03 -07:00
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
f36071bb64
wouldnt it be cool if i tested the small logic change
2020-07-28 03:09:07 +01:00
ffcfd21613
fix
2020-07-27 14:24:10 -07:00
5bf4afcade
sigh
2020-07-27 14:09:37 -07:00
dc14c02570
fix crates
2020-07-27 21:55:51 +01:00
dc278d7b02
woops
2020-07-27 13:11:26 -07:00
67b518bf42
experimental
2020-07-27 13:09:54 -07:00
Lin