 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
|
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 |
|
|
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 |
|
|
Timothy Teakettle
|
75c40f6d93
|
what if wound values didnt suck
|
2020-07-26 18:51:19 +01:00 |
|
|
SiliconMain
|
1a78098885
|
on second thought
|
2020-07-26 05:20:53 -05:00 |
|
|
SiliconMain
|
54ed22d17d
|
ye
|
2020-07-26 05:19:56 -05:00 |
|
|
SiliconMain
|
d1c3465d77
|
Update belt.dm
|
2020-07-26 04:28:18 -05:00 |
|
|
silicons
|
94e218ccc0
|
ok
|
2020-07-26 01:04:55 -07:00 |
|
|
silicons
|
d3e808f0e1
|
fix
|
2020-07-26 00:18:42 -07:00 |
|
|
silicons
|
1990f75957
|
Merge remote-tracking branch 'citadel/master' into clickcd_experimental
|
2020-07-25 23:46:27 -07:00 |
|
|
silicons
|
2a29f73ac8
|
ok
|
2020-07-25 17:34:12 -07:00 |
|
|
timothyteakettle
|
3467bf3515
|
Merge remote-tracking branch 'upstream/master' into wounds-part-2
|
2020-07-26 00:25:26 +01:00 |
|
|
silicons
|
91081ef24c
|
Merge pull request #12872 from Iatots/hairball
Adds depth to the lick wounds mechanic.
|
2020-07-25 15:40:15 -07:00 |
|
|
Hatterhat
|
bf273cffdd
|
burnt bokken backsprite, wound tweak
|
2020-07-25 16:18:26 -05:00 |
|
|
Hatterhat
|
fa5fd08be3
|
parry tweaks
|
2020-07-25 15:37:21 -05:00 |
|
|
Timothy Teakettle
|
76016c75f9
|
yes
|
2020-07-25 21:27:32 +01:00 |
|
|
Hatterhat
|
b9ce2e497d
|
bare wound bonus, wound malus
|
2020-07-25 13:10:35 -05:00 |
|
|
Hatterhat
|
f28c98590a
|
lowered parry windows! attack verbs!
|
2020-07-25 13:03:15 -05:00 |
|
|
Hatterhat
|
eb6cb1151c
|
i forgot the actual defining feature
|
2020-07-25 06:59:31 -05:00 |
|
|
silicons
|
d8a91d9ffa
|
Update robot_upgrades.dm
|
2020-07-25 02:35:53 -07:00 |
|
|
silicons
|
0e1574bf77
|
sigh
|
2020-07-24 23:34:47 -07:00 |
|
|
Hatterhat
|
47d63296d0
|
slight buff? may be overreaching
|
2020-07-25 00:09:53 -05:00 |
|
|
timothyteakettle
|
47998153cd
|
tweaks
|
2020-07-25 03:25:28 +01:00 |
|
|
Hatterhat
|
14fba6a056
|
funny parry sticks
|
2020-07-24 21:19:01 -05:00 |
|
|
timothyteakettle
|
3ca098fe98
|
bugfixes
|
2020-07-25 00:22:24 +01:00 |
|
|
Suicidalpickles
|
229500aa0e
|
reverts extinguishers to altclick emptying
h
|
2020-07-24 16:00:36 -07:00 |
|
|
Timothy Teakettle
|
7fb55a02a5
|
section one
|
2020-07-24 22:34:22 +01:00 |
|
|
Iatots
|
b6437a4ada
|
Update code/game/objects/items/plushes.dm
Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com>
|
2020-07-24 15:23:11 +02:00 |
|
|
Letter N
|
8e177bf01e
|
another batch - MAJOR: teleportaiton, displaycase (ico port needed),
|
2020-07-24 19:58:48 +08:00 |
|
|
Iatots
|
ec2bd9b876
|
Update plushes.dm
|
2020-07-24 08:40:25 +02:00 |
|
|
Letter N
|
22d5aebaa5
|
second batch - MAJOR: mech_fab, turrets
|
2020-07-24 14:38:04 +08:00 |
|