diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm index faaf6ea68b..68f2952527 100644 --- a/code/game/objects/items/weapons/storage/backpack.dm +++ b/code/game/objects/items/weapons/storage/backpack.dm @@ -37,8 +37,8 @@ */ /obj/item/storage/backpack/holding - name = "bag of holding" - desc = "A backpack that opens into a localized pocket of Blue Space." + name = "bluespace backpack" + desc = "A back-mounted canister that utilizes bluespace technology to absolutely maximize efficient use of space." origin_tech = list(TECH_BLUESPACE = 4) icon_state = "holdingpack" max_w_class = ITEMSIZE_LARGE @@ -46,7 +46,8 @@ storage_cost = INVENTORY_STANDARD_SPACE + 1 /obj/item/storage/backpack/holding/duffle - name = "dufflebag of holding" + name = "bluespace dufflebag" + desc = "Bluespace technology integrated with the ergonomic stylings of a dufflebag. It's not actually bigger on the inside, but you'd be forgiven for believing it was." icon_state = "holdingduffle" /obj/item/storage/backpack/holding/attackby(obj/item/W, mob/user) @@ -56,7 +57,6 @@ return TRUE return ..() -//Please don't clutter the parent storage item with stupid hacks. /obj/item/storage/backpack/holding/can_be_inserted(obj/item/W as obj, stop_messages = 0) if(istype(W, /obj/item/storage/backpack/holding)) return 1 @@ -64,7 +64,7 @@ /obj/item/storage/backpack/santabag name = "\improper Santa's gift bag" - desc = "Space Santa uses this to deliver toys to all the nice children in space in Christmas! Wow, it's pretty big!" + desc = "Santa uses this to deliver toys to all the nice children in the galaxy at Christmas! Wow, it's pretty big!" icon_state = "giftbag0" item_state_slots = list(slot_r_hand_str = "giftbag", slot_l_hand_str = "giftbag") w_class = ITEMSIZE_LARGE @@ -144,7 +144,7 @@ */ /obj/item/storage/backpack/dufflebag - name = "dufflebag" + name = "grey dufflebag" desc = "A large dufflebag for holding extra things." icon_state = "duffle" slowdown = 0.5 @@ -196,6 +196,16 @@ desc = "A large dufflebag for holding circuits and beakers." icon_state = "duffle_sci" +/obj/item/storage/backpack/dufflebag/hydro + name = "hydroponics dufflebag" + desc = "A large dufflebag for holding plants and gardening tools." + icon_state = "duffle_hydro" + +/obj/item/storage/backpack/dufflebag/chem + name = "chemistry dufflebag" + desc = "A large dufflebag for holding chemical samples." + icon_state = "duffle_chem" + /obj/item/storage/backpack/dufflebag/drone name = "drone dufflebag" desc = "A large dufflebag for holding small robots? Or maybe it's one used by robots!" @@ -206,6 +216,22 @@ desc = "That probably shouldn't be moving..." icon_state = "duffle_cursed" +/obj/item/storage/backpack/dufflebag/brown + name = "brown dufflebag" + icon_state = "duffle_brown" + item_state_slots = list(slot_r_hand_str = "duffle", slot_l_hand_str = "duffle") + +/obj/item/storage/backpack/dufflebag/white + name = "white dufflebag" + icon_state = "duffle_white" + item_state_slots = list(slot_r_hand_str = "duffle", slot_l_hand_str = "duffle") + +/obj/item/storage/backpack/dufflebag/solgov + name = "Fleet dufflebag" + desc = "A large dufflebag in Solar Confederate Government colours, for holding bullets and diplomacy." + icon_state = "duffle_gov" + item_state_slots = list(slot_r_hand_str = "duffle", slot_l_hand_str = "duffle") + /* * Satchel Types */ diff --git a/code/game/objects/random/maintenance.dm b/code/game/objects/random/maintenance.dm index d7092c323f..a92a7e046e 100644 --- a/code/game/objects/random/maintenance.dm +++ b/code/game/objects/random/maintenance.dm @@ -48,7 +48,7 @@ something, make sure it's not in one of the other lists.*/ prob(5);/obj/item/storage/backpack, prob(5);/obj/item/storage/backpack/satchel/norm, prob(4);/obj/item/storage/backpack/satchel, - prob(3);/obj/item/storage/backpack/dufflebag, + prob(3);/obj/random/dufflebag, prob(1);/obj/item/storage/backpack/dufflebag/syndie, prob(5);/obj/item/storage/box, prob(3);/obj/item/storage/box/donkpockets, @@ -278,7 +278,7 @@ something, make sure it's not in one of the other lists.*/ prob(4);/obj/item/pickaxe, prob(5);/obj/item/storage/backpack/industrial, prob(5);/obj/item/storage/backpack/satchel/norm, - prob(3);/obj/item/storage/backpack/dufflebag, + prob(3);/obj/random/dufflebag, prob(1);/obj/item/storage/backpack/dufflebag/syndie/ammo, prob(1);/obj/item/storage/toolbox/syndicate, prob(1);/obj/item/storage/belt/utility/full, diff --git a/code/game/objects/random/misc.dm b/code/game/objects/random/misc.dm index 7d8a9a1154..b57c4ada26 100644 --- a/code/game/objects/random/misc.dm +++ b/code/game/objects/random/misc.dm @@ -1043,3 +1043,15 @@ prob(5);/obj/item/clothing/head/helmet/newkyoto, prob(5);/obj/item/clothing/head/helmet/space/void/scg/heavy ) + +/obj/random/dufflebag + desc = "This is a random non-department-specific dufflebag." + +/obj/random/dufflebag/item_to_spawn() + return pick( + prob(10);/obj/item/storage/backpack/dufflebag, + prob(10);/obj/item/storage/backpack/dufflebag/brown, + prob(10);/obj/item/storage/backpack/dufflebag/white, + prob(5);/obj/item/storage/backpack/dufflebag/hydro, + prob(2);/obj/item/storage/backpack/dufflebag/solgov + ) diff --git a/code/game/objects/structures/loot_piles.dm b/code/game/objects/structures/loot_piles.dm index 2470bdeef3..6ee1baab19 100644 --- a/code/game/objects/structures/loot_piles.dm +++ b/code/game/objects/structures/loot_piles.dm @@ -150,7 +150,7 @@ Loot piles can be depleted, if loot_depleted is turned on. Note that players wh /obj/item/storage/backpack, /obj/item/storage/backpack/satchel/norm, /obj/item/storage/backpack/satchel, - /obj/item/storage/backpack/dufflebag, + /obj/random/dufflebag, /obj/item/storage/box, /obj/item/storage/wallet, /obj/item/clothing/shoes/galoshes, diff --git a/code/modules/research/designs/bag_of_holding.dm b/code/modules/research/designs/bag_of_holding.dm index 1116344494..0d38eec4fe 100644 --- a/code/modules/research/designs/bag_of_holding.dm +++ b/code/modules/research/designs/bag_of_holding.dm @@ -5,8 +5,8 @@ name = "Infinite capacity storage prototype ([item_name])" /datum/design/item/boh/bag_holding - name = "Bag of Holding" - desc = "Using localized pockets of bluespace this bag prototype offers incredible storage capacity with the contents weighting nothing. It's a shame the bag itself is pretty heavy." + name = "bluespace backpack" + desc = "Using localized bluespace portals this bag prototype offers incredible storage capacity with the contents weighting nothing. It's a shame the bag itself is pretty heavy." id = "bag_holding" req_tech = list(TECH_BLUESPACE = 4, TECH_MATERIAL = 6) materials = list("gold" = 3000, "diamond" = 1500, "uranium" = 250) @@ -14,10 +14,10 @@ sort_string = "QAAAA" /datum/design/item/boh/dufflebag_holding - name = "DuffleBag of Holding" - desc = "A minaturized prototype of the popular Bag of Holding, the Dufflebag of Holding is, functionally, identical to the bag of holding, but comes in a more stylish and compact form." + name = "bluespace dufflebag" + desc = "A minaturized prototype of the popular bluespace backpack, the bluespace is, functionally, identical to the backpack version, but in a more stylish and compact form." id = "dufflebag_holding" req_tech = list(TECH_BLUESPACE = 4, TECH_MATERIAL = 6) materials = list("gold" = 3000, "diamond" = 1500, "uranium" = 250) build_path = /obj/item/storage/backpack/holding/duffle - sort_string = "QAAAB" \ No newline at end of file + sort_string = "QAAAB" diff --git a/icons/mob/back.dmi b/icons/mob/back.dmi index d54d49e8c6..0634437e76 100644 Binary files a/icons/mob/back.dmi and b/icons/mob/back.dmi differ diff --git a/icons/mob/items/lefthand_storage.dmi b/icons/mob/items/lefthand_storage.dmi index f4f8b396f2..d8c05acfab 100644 Binary files a/icons/mob/items/lefthand_storage.dmi and b/icons/mob/items/lefthand_storage.dmi differ diff --git a/icons/mob/items/righthand_storage.dmi b/icons/mob/items/righthand_storage.dmi index b5501cfc89..b1e294552b 100644 Binary files a/icons/mob/items/righthand_storage.dmi and b/icons/mob/items/righthand_storage.dmi differ diff --git a/icons/obj/clothing/backpack.dmi b/icons/obj/clothing/backpack.dmi index 9e3547e9d5..b2bbcab5d5 100644 Binary files a/icons/obj/clothing/backpack.dmi and b/icons/obj/clothing/backpack.dmi differ