shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into changelog-memes

Browse Source
This commit is contained in:
Poojawa
2018-09-11 07:52:59 -05:00
committed by GitHub
parent 284e9d0325 2b7af47717
commit afac3ae0ab
9 changed files with 1128 additions and 1088 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/storage/backpack.dm
+2 -2
View File
@@ -247,7 +247,7 @@
name = "smuggler's satchel"
desc = "A very slim satchel that can easily fit into tight spaces."
icon_state = "satchel-flat"
w_class = WEIGHT_CLASS_NORMAL //Can fit in backpacks itself.
w_class = WEIGHT_CLASS_BULKY //Can fit in backpacks itself.
level = 1
component_type = /datum/component/storage/concrete/secret_satchel
@@ -258,7 +258,7 @@
/obj/item/storage/backpack/satchel/flat/ComponentInitialize()
. = ..()
GET_COMPONENT(STR, /datum/component/storage)
STR.max_combined_w_class = 15
STR.max_combined_w_class = 6
STR.cant_hold = typecacheof(list(/obj/item/storage/backpack/satchel/flat)) //muh recursive backpacks
/obj/item/storage/backpack/satchel/flat/hide(intact)