d04b335d1a
Merge pull request #12652 from silicons/cool
...
cybernetic implant shields will now automatically extend and be used to block if the user has no item to block with
2020-07-04 14:12:43 -05:00
3ba077be71
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit833
2020-07-04 21:04:33 +02:00
780f30bd4d
Fixing cloning
2020-07-04 21:01:44 +02:00
c2ba973c88
Merge remote-tracking branch 'origin' into emi
2020-07-04 15:59:47 -03:00
020da9fa07
i hope this works
2020-07-04 15:47:38 -03:00
871993ce14
Merge pull request #12593 from silicons/autobunker
...
adds verb to auto bunker override on linked servers
2020-07-04 18:36:59 +02:00
17ee8c5960
Merge pull request #12660 from YakumoChen/master
...
Reverts improv small arms, makes guncrafting easier and faster
2020-07-04 18:35:22 +02:00
c5b94a4d00
Update code/modules/antagonists/revenant/revenant.dm
2020-07-04 18:30:01 +02:00
ca6fc8d813
Update revenant.dm
2020-07-04 06:48:00 -07:00
a304ed7f49
Canister and paper updates
...
should fix papah exploits, though some runtiming is occuring
2020-07-04 16:14:42 +03:00
bb065abab7
Merge pull request #12690 from BlackMajor/master
...
[s] Inheritance is something often overlooked.
2020-07-04 01:52:13 -07:00
afdf8c698a
fuck
2020-07-04 19:30:20 +12:00
03aa8fcc2b
Update autobunker.dm
2020-07-04 00:14:32 -07:00
ae5fb008c7
Update client_defines.dm
2020-07-04 00:13:34 -07:00
c10350f10e
Merge pull request #12677 from Ghommie/Ghommie-cit830
...
Fixes items' skills list keys missing associated traits and improves modulability a little.
2020-07-04 00:12:37 -07:00
dbf88a1408
Merge pull request #12676 from Ghommie/Ghommie-cit829
...
Improvements to the recent clothing menu toggle hardsuit helmet feature.
2020-07-04 00:12:29 -07:00
a61e22de71
Merge pull request #12675 from Ghommie/Ghommie-cit828
...
Fixing (un)equip penalties from obscured inv slots.
2020-07-04 00:12:04 -07:00
103b8b7600
Merge pull request #12662 from kappa-sama/patch-29
...
makes bows and arrows more feasible improv weapons
2020-07-04 00:11:45 -07:00
e9c4ac8c3c
Merge pull request #12658 from timothyteakettle/okay-its-bad
...
slightly tweaks the cooking oil damage formula
2020-07-04 00:11:09 -07:00
f6be57269d
Merge pull request #12687 from Ghommie/Ghommie-cit832
...
Fixing obscured inventory slots unequip block, for real.
2020-07-04 00:10:49 -07:00
94b001ad6b
Merge pull request #12685 from Citadel-Station-13/Ghommie-patch-1
...
Silences the skill panel check_rights() call.
2020-07-04 00:10:29 -07:00
7c21f7bd4e
[s] Don't give these to your kids for christmas
...
Someone did a fucky wucky.
2020-07-04 17:17:34 +12:00
832bea9ca5
Fixed sentence formatting, removed Skyrat comments
2020-07-03 21:55:42 -07:00
c9ec6d4a03
Fixes a button, rewords text to be clearer
2020-07-03 21:51:22 -07:00
d3448e04c9
fixes pet carrier edgecase
2020-07-04 03:00:35 +01:00
bc76fa615d
Fixed small strides formula
2020-07-03 17:05:56 -07:00
22d0e7ee0b
Merge pull request #12672 from Sonic121x/patch-3
...
add crushed sodacan and some digitigrade uniform sprite.
2020-07-03 19:59:36 +02:00
e3b1ca4942
Linter.
2020-07-03 19:57:38 +02:00
bde80eb1fb
Fixing obscured inventory slots (un)equip block, for real.
2020-07-03 19:02:20 +02:00
ea8662572b
Silences the skill panel check_rights() call.
2020-07-03 17:37:03 +02:00
870bb8f804
Actual BLT Stuff
...
This is why I test things. Also, I shouldn't do this before I try to sleep.
2020-07-03 09:48:35 -04:00
bef462b4ae
BLT Sandwich
2020-07-03 08:50:54 -04:00
f0154f3f1c
conflicts!!!
2020-07-03 15:45:11 +03:00
82c6a02feb
More Testmerge fixes
2020-07-03 15:34:45 +03:00
5b923623d3
Sprite Updates + Food Ports
...
Ports/Adds, or updates the sprites for:
Cooked Carp
Bear Steaks
Raw and Cooked Chicken
Raw Meatball (Unused, adding for future PR)
Ports:
Chili Cheese Fries
Margarine
BLT (In next Commit)
Fix:
Tuna Sandwich now uses 5u Mayo, instead of 5 jars of mayo.
Tuna Sandwich is now visible.
2020-07-03 08:33:01 -04:00
6c4e733a38
More testmerge fixes
2020-07-03 15:16:02 +03:00
0d9609af29
Fixes SMES
2020-07-03 13:36:18 +03:00
05591ee04c
better
2020-07-03 05:40:18 -04:00
824d11b085
death to lists
2020-07-03 02:34:59 -07:00
d85edbf8fb
ok
2020-07-03 02:15:06 -07:00
7781296fb9
DNA CONSOLE FIX
2020-07-03 11:09:55 +03:00
a738d52740
oh god oh FUCK
2020-07-03 00:11:09 -07:00
8afcea6026
ok
2020-07-03 08:55:21 +02:00
cdebccf38f
downgrading for now till I port cyberboss linux tgs4 docker hack and the end of BSQL.
...
Gosh please work, I'm dead tired.
2020-07-03 08:41:42 +02:00
e3b470f5d3
Alright, I don't want to deal with path shenanigans right now.
2020-07-03 08:15:29 +02:00
0c206ed3fa
Updating rust-g dependencies to 0.4.5
2020-07-03 06:17:14 +02:00
05fb7a67fc
Merge branch 'tray-and-jar' of https://github.com/timothyteakettle/Citadel-Station-13 into tray-and-jar
2020-07-03 03:46:12 +01:00
1316f51a03
better resist and air
2020-07-03 03:46:08 +01:00
f5ffd7d2a9
Easing fine tuning of the system.
2020-07-03 03:00:33 +02:00
396989f143
Fixes items' used skills list keys missing associated base traits.
2020-07-03 01:52:03 +02:00
Lin