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
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
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
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
0152dcda65
fix
2020-07-28 13:24:45 -07: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
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
Timothy Teakettle
dc14c02570
fix crates
2020-07-27 21:55:51 +01:00
Ghommie
f1c242aadc
Fixing new bugs and stuff.
2020-07-27 14:16:01 +02:00
silicons
6f9c310ea8
Merge pull request #12920 from zeroisthebiggay/blackboxfatcox
...
Ports the Black Box theft objective from TG
2020-07-26 22:58:43 -07:00
silicons
850bc0dc33
Merge pull request #12919 from SiliconMain/patch-5
...
Dura belt tweaks
2020-07-26 22:58:31 -07:00
silicons
d47b553527
Merge pull request #12892 from Literallynotpickles/hi
...
Reverts extinguishers into being alt-clickable
2020-07-26 22:56:22 -07:00
silicons
e240453044
Merge pull request #12884 from timothyteakettle/fix-a-bad-bug/exploit
...
fixes a dumb bug to do with material crafting
2020-07-26 22:52:30 -07:00
silicons
b5e21e5555
Merge pull request #12896 from timothyteakettle/jar-fixes
...
makes some small tweaks to pet carriers / bluespace jars
2020-07-26 17:21:28 -07:00
silicons
69335bae0e
buff
2020-07-26 17:20:21 -07:00
silicons
4256826aae
epic
2020-07-26 17:15:12 -07:00
silicons
0b17c761e7
whew
2020-07-26 17:11:23 -07:00
silicons
3ab4b62dc1
huh
2020-07-26 17:03:52 -07:00
silicons
279b3e7aed
fix
2020-07-26 16:52:16 -07:00
silicons
349874e512
haha
2020-07-26 16:49:47 -07:00
silicons
21988d47f5
woops
2020-07-26 16:42:51 -07:00
silicons
ea1ea6dde1
Update weaponry.dm
2020-07-26 16:41:27 -07:00
silicons
d52892f000
Update portable_turret.dm
2020-07-26 16:32:20 -07:00
silicons
d954588c9a
Update portable_turret.dm
2020-07-26 16:30:50 -07:00
silicons
791bfabc9b
walls
2020-07-26 16:03:57 -07:00
silicons
e13b6d36da
Merge pull request #12895 from Hatterhat/bokken
...
Training Bokkens - "funny wood sticks for parrying and beating the shit out of people"
2020-07-26 15:52:35 -07:00
Lin
8aa20d10b8
Merge pull request #12863 from Citadel-Station-13/clownops
...
clown mobss are now allied to each other and clownops are now allied to clown mobs
2020-07-26 17:51:00 -05:00
Hatterhat
aabb60b5c5
shit damn boys its another fucking day
2020-07-26 17:42:24 -05:00
Lin
ea737d63dd
Merge pull request #12904 from Citadel-Station-13/silicons-patch-54
...
proper fix for every borg being able to have mops, but doesn't remove the upgrade entirely
2020-07-26 17:22:47 -05:00
silicons
7d7f40ce90
fixes
2020-07-26 14:56:03 -07:00
SiliconMain
e11dab552f
it just werks
2020-07-26 16:28:21 -05:00
SiliconMain
fdaa4b4372
aaaaaaaaaaa
2020-07-26 16:07:48 -05:00
SiliconMain
ad420c6633
AAAAAAAAAAAA
2020-07-26 15:53:08 -05:00
SiliconMain
abdafe15fa
fuck
2020-07-26 15:21:24 -05:00
Hatterhat
6bf53859d2
wow maybe i should make it compile first
2020-07-26 14:42:45 -05:00
Hatterhat
af08e8a37f
altclick for fucked up parries! also bugfixes
2020-07-26 13:02:56 -05:00
zerothebigboy
27bf41ac5f
a
2020-07-26 06:29:10 -04:00
zerothebigboy
ee2de61b17
a
2020-07-26 06:27:30 -04:00
SiliconMain
1a78098885
on second thought
2020-07-26 05:20:53 -05:00
