Commit Graph

4959 Commits

Author SHA1 Message Date
Winter Flare
767290d8e9 Trashbag Whitelist Update
Trashbag can now hold:
All Organs
Most Shoes

Trashbags cannot hold:
Jackbooks
Workboots
Clown Shoes
Nuke Disk
Wallets (Nuke Disk Nesting)
Brains
2020-07-04 21:03:31 -04:00
Lin
703d03453b Merge pull request #12651 from Citadel-Station-13/silicons-patch-9
lowers shield blocking stamcost/second 3.5 to 2.5
2020-07-04 14:16:06 -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
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
silicons
bb065abab7 Merge pull request #12690 from BlackMajor/master
[s] Inheritance is something often overlooked.
2020-07-04 01:52:13 -07:00
BlackMajor
afdf8c698a fuck 2020-07-04 19:30:20 +12: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
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
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
BlackMajor
7c21f7bd4e [s] Don't give these to your kids for christmas
Someone did a fucky wucky.
2020-07-04 17:17:34 +12: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
Ghommie
f5ffd7d2a9 Easing fine tuning of the system. 2020-07-03 03:00:33 +02:00
Ghommie
396989f143 Fixes items' used skills list keys missing associated base traits. 2020-07-03 01:52:03 +02:00
Ghommie
6fc584518a Fixing (un)equip penalties from obscured inv slots. 2020-07-03 00:07:30 +02:00
silicons
9ae040b904 Merge pull request #12657 from bunny232/witchhunterhat
Witch hunter hat tweak.
2020-07-02 01:48:19 -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
kappa-sama
406af65d93 you need 5 of these 2020-07-01 08:12:35 -04:00
kappa-sama
9cc6f5aa91 durathread->string 2020-07-01 08:09:43 -04:00
kappa-sama
0b0d9ff1a6 this 2020-07-01 07:56:55 -04: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
kappa-sama
5c7c300bf0 these do nothing 2020-07-01 04:58:44 -04:00
YakumoChen
ed017cc22a Update sheet_types.dm 2020-07-01 08:53:08 +00:00
YakumoChen
4c460278b4 removes improv handgun spawns 2020-07-01 08:52:09 +00:00
bunny232
afe9b2dfbd Update holy_weapons.dm 2020-06-30 11:15:40 -04:00
Ghommie
cd1c5511a4 Fixing two handed items and etcetera. 2020-06-30 16:24:04 +02:00
silicons
2039496739 groan 2020-06-30 03:05:15 -07:00
silicons
84f6efe683 Update shields.dm 2020-06-29 23:22:48 -07:00
Ghommie
9dc4b99620 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765 2020-06-30 00:49:06 +02:00
silicons
26fee48cec Merge pull request #12645 from Ghommie/Ghommie-cit825
More and more fixes.
2020-06-29 14:18:10 -07:00
Putnam3145
ee2fedd4af Merge pull request #12390 from Ghommie/Ghommie-cit800
Porting brain trauma updates: Curse of madness, cloning traumas, random brain trauma event.
2020-06-29 12:44:33 -07:00
Ghom
b280c0f550 Merge pull request #12622 from timothyteakettle/grammar-fixes
big batch of spelling/grammar corrections
2020-06-29 21:13:06 +02:00
Ghommie
0779dd560e More and more fixes. 2020-06-29 18:52:37 +02:00
Ghommie
a34a7ba5d4 You can't (un)equip garments on/from obscured inventory slots anymore. 2020-06-28 01:10:22 +02:00
silicons
2ab69c0170 Merge pull request #12603 from b1tt3r1n0/Pouches(again)
Some edits to pouches, and something that can hold sheets.
2020-06-27 14:54:57 -07:00
silicons
45a6061958 Merge pull request #12596 from Ghommie/Ghommie-cit819
Porting further material datum features and improvements.
2020-06-27 14:53:28 -07:00
silicons
8b04fd70de Merge pull request #12615 from Ghommie/Ghommie-cit821
Solving several issues.
2020-06-27 14:52:59 -07:00
Ghom
58778f2e6e Merge pull request #12619 from timothyteakettle/what-if-blood-didnt-suck
slimes blood colour is their body colour
2020-06-27 22:14:17 +02:00
timothyteakettle
b94267e1e1 more spellchecks 2020-06-27 02:41:50 +01:00
timothyteakettle
76b5557e1e bunch of grammar corrections 2020-06-27 02:12:44 +01:00
Timothy Teakettle
334d55bef3 add support for custom blood colours 2020-06-26 20:29:40 +01:00
Ghommie
8f6b31c26e Solving several issues. 2020-06-26 18:40:20 +02:00
silicons
a2a1ae3a2c Merge pull request #12592 from timothyteakettle/felinids-nya-when-tabled
felinids nya when tabled
2020-06-25 18:33:34 -07:00
silicons
54c8d58e52 Update clown_items.dm 2020-06-24 23:20:51 -07:00
b1tt3r1n0
a780b9037c Some edits to pouches, and something that can hold sheets.
Title. Vendor edits and a minor engineering addition for those who want to hold sheets and shit.
2020-06-24 23:07:56 -04:00
Ghommie
fe3932a36e Fixing the snore-pocalypse, and another not so critical issue. 2020-06-24 23:08:40 +02:00
Ghommie
c5cbfa64e5 Porting further material datum features and improvements. 2020-06-24 20:45:17 +02:00
Timothy Teakettle
b83c428744 Update tables_racks.dm 2020-06-24 14:37:08 +01:00