Commit Graph

15171 Commits

Author SHA1 Message Date
Ghom
e7d19f512e Merge pull request #12397 from Rohesie/cooldown
Ports TGMC timer cooldowns
2020-07-06 22:54:58 +02:00
Ghom
bc5e7d1513 Merge pull request #12688 from Weblure/small-strides-fix
[READY] Fixes Small Strides Formula
2020-07-06 22:48:09 +02:00
Lin
4d29aa9148 Merge pull request #12650 from Citadel-Station-13/silicons-patch-7
adds a keybind to toggle active blocking instead of only press-hold
2020-07-04 14:13:18 -05:00
Lin
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
Ghom
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
Ghom
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
Ghom
c5b94a4d00 Update code/modules/antagonists/revenant/revenant.dm 2020-07-04 18:30:01 +02:00
silicons
ca6fc8d813 Update revenant.dm 2020-07-04 06:48:00 -07:00
silicons
03aa8fcc2b Update autobunker.dm 2020-07-04 00:14:32 -07:00
silicons
ae5fb008c7 Update client_defines.dm 2020-07-04 00:13:34 -07:00
silicons
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
silicons
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
silicons
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
silicons
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
silicons
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
silicons
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
Weblure
832bea9ca5 Fixed sentence formatting, removed Skyrat comments 2020-07-03 21:55:42 -07:00
Weblure
c9ec6d4a03 Fixes a button, rewords text to be clearer 2020-07-03 21:51:22 -07:00
Ghom
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
Ghommie
e3b1ca4942 Linter. 2020-07-03 19:57:38 +02:00
Ghommie
bde80eb1fb Fixing obscured inventory slots (un)equip block, for real. 2020-07-03 19:02:20 +02:00
kappa-sama
05591ee04c better 2020-07-03 05:40:18 -04:00
silicons
d85edbf8fb ok 2020-07-03 02:15:06 -07:00
Ghommie
f5ffd7d2a9 Easing fine tuning of the system. 2020-07-03 03:00:33 +02:00
Ghommie
92c846fdbf Improvements to the recent clothing menu toggle hardsuit helmet feature. 2020-07-03 01:08:28 +02:00
Ghom
50716ee393 Merge pull request #12668 from Arturlang/strip_menu_helmet
Hardsuit strip menu helmet toggle
2020-07-03 00:41:03 +02:00
Ghom
7370b7c687 Merge pull request #12671 from Sonic121x/patch-2
Fix Pilltype button (for real this time).also fix technode icon missing.
2020-07-03 00:26:28 +02:00
Ghommie
6fc584518a Fixing (un)equip penalties from obscured inv slots. 2020-07-03 00:07:30 +02:00
Ghom
e586d03e0a text spans. 2020-07-02 19:47:05 +02:00
Ghom
c919075aca Thanks Timothy. 2020-07-02 19:46:10 +02:00
Ghom
4354b0bf6f Actually fixing a dum dum feature. 2020-07-02 19:26:52 +02:00
Sonic121x
4ca695020a add adigitigrade version of captain's female formal outfit. 2020-07-02 23:21:31 +08:00
Sonic121x
6240ade87d Add digitigrade version of cmoturtleneck 2020-07-02 23:20:01 +08:00
Sonic121x
4e2b05a22a Fix the missing Technode icon 2020-07-02 22:33:35 +08:00
Sonic121x
ea7fed0c8e givme that pilltype button
Fix pill type button
2020-07-02 22:30:28 +08:00
Ghom
ef60068f1c Merge pull request #12666 from timothyteakettle/more-blood-fixes
More blood fixes
2020-07-02 14:52:39 +02:00
silicons
5f11612078 Update preferences_savefile.dm 2020-07-02 03:00:35 -07:00
silicons
bb67ab5ddd Merge pull request #12664 from Ghommie/Ghommie-cit827
Porting a few asset cache related PRs.
2020-07-02 01:49:27 -07:00
silicons
7b99e69583 Merge pull request #12661 from LetterN/cool-fucked-up-another-master-branch-fixes-assetthing
Fix broken UI icons
2020-07-02 01:46:14 -07:00
silicons
3f1119fcdb Merge pull request #12630 from Ghommie/Ghommie-cit822
You can't (un)equip garments on/from obscured inventory slots anymore.
2020-07-02 01:44:59 -07:00
silicons
cbad654371 Merge pull request #12632 from Ghommie/Ghommie-cit823
Ups melee stam cost multiplier from 0.8 back to 1, made stam cost for throwing mobs scale with mob_size
2020-07-02 01:44:09 -07:00
silicons
9abeb9c07e Merge pull request #12631 from Citadel-Station-13/Ghommie-patch-1
Nerfing shaft miners' paycheck.
2020-07-02 01:43:53 -07:00
Artur
582d672109 Hardsuit strip menu helmet toggle 2020-07-02 01:31:15 +03:00
Timothy Teakettle
84d60a455e wow its still spelt wrong 2020-07-01 21:53:34 +01:00
Timothy Teakettle
1cb1b4d7e6 oh my god its not even defined right 2020-07-01 21:29:10 +01:00
Timothy Teakettle
311e149562 fix bloodpacks 2020-07-01 21:00:01 +01:00
Ghommie
94f7dae62e Porting "Fix asset cache verification" and other tiny bits. 2020-07-01 16:24:12 +02:00
kappa-sama
cfc14a04f1 Merge branch 'master' into patch-28 2020-07-01 07:48:46 -04:00
kappa-sama
1f38c3029c yeah ok 2020-07-01 07:40:43 -04:00
Letter N
b35e3f2b93 fix: R&D Console, Vending, and chem master 2020-07-01 19:07:03 +08:00