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
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
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
zerothebigboy
40d12fd02f
a
2020-07-26 06:20:06 -04: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
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
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
Suicidalpickles
229500aa0e
reverts extinguishers to altclick emptying
...
h
2020-07-24 16:00:36 -07: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
Iatots
ec2bd9b876
Update plushes.dm
2020-07-24 08:40:25 +02:00
timothyteakettle
5064c584cc
woops typo
2020-07-24 03:01:40 +01:00
timothyteakettle
869474f4ec
drop location is not suitable for structures
2020-07-24 03:01:12 +01:00
Lin
8a25582c1c
Merge pull request #12850 from silicons/drag
...
fixes dragging stuff into space, enforces no sleeping on Life() and sets Move() to forced async
2020-07-23 17:13:48 -05:00
Iatots
b2a0d00eee
Update plushes.dm
2020-07-23 21:13:41 +02:00
Iatots
80f2766314
Update plushes.dm
2020-07-23 20:11:29 +02:00
silicons
9f66163d4f
Merge pull request #12828 from Owai-Seek/foodport-p2-7/12/20
...
Ports several food sprites/foods from Baystation/Citadel RP
2020-07-23 10:35:30 -07:00
silicons
ec72015f4f
Merge pull request #12809 from BlackMajor/borgo
...
Gripper brained. The medborg can do chemistry now, oh no.
2020-07-23 10:35:16 -07:00
silicons
11a4dfd20b
Merge pull request #12861 from Sneakyrat6/dresserFix
...
Fixes dressers not giving you undies
2020-07-23 10:28:54 -07:00
silicons
6d4f5c633b
Update clown_ops.dm
2020-07-21 22:13:58 -07:00
Sneakyrat6
402f13ce1b
Fixes dressers not giving you undies
2020-07-21 20:33:58 -05:00
silicons
1450b11b01
sigh
2020-07-20 21:37:44 -07:00
Timothy Teakettle
75a2035774
Merge branch 'master' into wound-port
2020-07-21 01:10:51 +01:00
silicons
3d2995b4e8
Merge pull request #12787 from CameronWoof/advanced-sutures-and-mesh
...
Ports Medicated Sutures and Advanced Regenerative Mesh from TG
2020-07-20 17:01:32 -07:00
silicons
7df369e5d7
Merge pull request #12811 from kappa-sama/patch-33
...
removes the 2 best weapons in the game from traitor uplink's 10tc surgery bag
2020-07-20 16:58:01 -07:00
silicons
9bb92f8d4d
Merge pull request #12805 from SiliconMain/patch-1
...
This is stupid
2020-07-20 16:56:57 -07:00
silicons
947b050c47
Merge pull request #12804 from Arturlang/decal_painter_fix
...
Decal Painter ui fix
2020-07-20 16:55:38 -07:00
Lin
210b7b281c
Merge pull request #12727 from Citadel-Station-13/silicons-patch-19
...
bandaids around turnstiles being bad code until it can have its movement checks refactored
2020-07-20 18:25:01 -05:00
Lin
7adae61ade
Merge pull request #12773 from Citadel-Station-13/silicons-patch-28
...
jexp exemption now also exempts from antag days remaining locks
2020-07-20 18:22:42 -05:00
Lin
923b4cbb4f
Merge pull request #12823 from Citadel-Station-13/gravity_update
...
gravity now immediately updates on entering/exiting areas with different gravity and space meaning no more slow for 4 seconds while in a hardsuit and then fast with jetpack
2020-07-20 18:21:55 -05:00
