diff --git a/code/game/objects/items/storage/backpack.dm b/code/game/objects/items/storage/backpack.dm index 285e3e68ddd..9aaec89e1b2 100644 --- a/code/game/objects/items/storage/backpack.dm +++ b/code/game/objects/items/storage/backpack.dm @@ -435,6 +435,44 @@ name = "surgical duffel bag" desc = "A large duffel bag for holding extra medical supplies - this one seems to be designed for holding surgical tools." +/obj/item/storage/backpack/duffelbag/explorer + name = "explorator's duffel bag" + desc = "A large duffel bag for holding extra exotic treasures." + icon_state = "duffel-explorer" + inhand_icon_state = "duffel-explorer" + +/obj/item/storage/backpack/duffelbag/hydroponics + name = "hydroponic's duffel bag" + desc = "A large duffel bag for holding extra gardening tools." + icon_state = "duffel-hydroponics" + inhand_icon_state = "duffel-hydroponics" + +/obj/item/storage/backpack/duffelbag/chemistry + name = "chemistry duffel bag" + desc = "A large duffel bag for holding extra chemical substances." + icon_state = "duffel-chemistry" + inhand_icon_state = "duffel-chemistry" + +/obj/item/storage/backpack/duffelbag/genetics + name = "geneticist's duffel bag" + desc = "A large duffel bag for holding extra genetic mutations." + icon_state = "duffel-genetics" + inhand_icon_state = "duffel-genetics" + +/obj/item/storage/backpack/duffelbag/toxins + name = "scientist's duffel bag" + desc = "A large duffel bag for holding extra scientific components." + icon_state = "duffel-toxins" + inhand_icon_state = "duffel-toxins" + +/obj/item/storage/backpack/duffelbag/virology + name = "virologist's duffel bag" + desc = "A large duffel bag for holding extra viral bottles." + icon_state = "duffel-virology" + inhand_icon_state = "duffel-virology" + + + /obj/item/storage/backpack/duffelbag/med/surgery/PopulateContents() new /obj/item/scalpel(src) new /obj/item/hemostat(src) diff --git a/code/game/objects/structures/crates_lockers/closets/job_closets.dm b/code/game/objects/structures/crates_lockers/closets/job_closets.dm index bbc172ba843..2893f17606e 100644 --- a/code/game/objects/structures/crates_lockers/closets/job_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/job_closets.dm @@ -232,6 +232,7 @@ /obj/item/clothing/suit/toggle/labcoat/chemist = 2, /obj/item/storage/backpack/chemistry = 2, /obj/item/storage/backpack/satchel/chem = 2, + /obj/item/storage/backpack/duffelbag/chemistry = 2, /obj/item/storage/bag/chemistry = 2) generate_items_inside(items_inside,src) return @@ -247,7 +248,8 @@ /obj/item/clothing/shoes/sneakers/white = 2, /obj/item/clothing/suit/toggle/labcoat/genetics = 2, /obj/item/storage/backpack/genetics = 2, - /obj/item/storage/backpack/satchel/gen = 2) + /obj/item/storage/backpack/satchel/gen = 2, + /obj/item/storage/backpack/duffelbag/genetics = 2) generate_items_inside(items_inside,src) return @@ -263,7 +265,8 @@ /obj/item/clothing/suit/toggle/labcoat/virologist = 2, /obj/item/clothing/mask/surgical = 2, /obj/item/storage/backpack/virology = 2, - /obj/item/storage/backpack/satchel/vir = 2) + /obj/item/storage/backpack/satchel/vir = 2, + /obj/item/storage/backpack/duffelbag/virology = 2,) generate_items_inside(items_inside,src) return @@ -276,6 +279,7 @@ /obj/item/clothing/accessory/pocketprotector = 1, /obj/item/storage/backpack/science = 2, /obj/item/storage/backpack/satchel/tox = 2, + /obj/item/storage/backpack/duffelbag/toxins = 2, /obj/item/clothing/suit/hooded/wintercoat/science = 1, /obj/item/clothing/under/rank/rnd/scientist = 3, /obj/item/clothing/suit/toggle/labcoat/science = 3, @@ -293,6 +297,7 @@ var/static/items_inside = list( /obj/item/storage/backpack/botany = 2, /obj/item/storage/backpack/satchel/hyd = 2, + /obj/item/storage/backpack/duffelbag/hydroponics = 2, /obj/item/clothing/suit/hooded/wintercoat/hydro = 1, /obj/item/clothing/suit/apron = 2, /obj/item/clothing/suit/apron/overalls = 2, diff --git a/code/modules/jobs/job_types/botanist.dm b/code/modules/jobs/job_types/botanist.dm index d2c4d5b58b5..4e85538f34f 100644 --- a/code/modules/jobs/job_types/botanist.dm +++ b/code/modules/jobs/job_types/botanist.dm @@ -29,5 +29,5 @@ backpack = /obj/item/storage/backpack/botany satchel = /obj/item/storage/backpack/satchel/hyd - + duffelbag = /obj/item/storage/backpack/duffelbag/hydroponics diff --git a/code/modules/jobs/job_types/chemist.dm b/code/modules/jobs/job_types/chemist.dm index a9eaac62c4e..0ca731d0b52 100644 --- a/code/modules/jobs/job_types/chemist.dm +++ b/code/modules/jobs/job_types/chemist.dm @@ -33,7 +33,7 @@ suit = /obj/item/clothing/suit/toggle/labcoat/chemist backpack = /obj/item/storage/backpack/chemistry satchel = /obj/item/storage/backpack/satchel/chem - duffelbag = /obj/item/storage/backpack/duffelbag/med + duffelbag = /obj/item/storage/backpack/duffelbag/chemistry box = /obj/item/storage/box/survival/medical chameleon_extras = /obj/item/gun/syringe diff --git a/code/modules/jobs/job_types/geneticist.dm b/code/modules/jobs/job_types/geneticist.dm index 0817285697d..df65ec805eb 100644 --- a/code/modules/jobs/job_types/geneticist.dm +++ b/code/modules/jobs/job_types/geneticist.dm @@ -33,3 +33,4 @@ backpack = /obj/item/storage/backpack/genetics satchel = /obj/item/storage/backpack/satchel/gen + duffelbag = /obj/item/storage/backpack/duffelbag/genetics diff --git a/code/modules/jobs/job_types/research_director.dm b/code/modules/jobs/job_types/research_director.dm index 824effb5e65..ccdba98089a 100644 --- a/code/modules/jobs/job_types/research_director.dm +++ b/code/modules/jobs/job_types/research_director.dm @@ -50,6 +50,7 @@ backpack = /obj/item/storage/backpack/science satchel = /obj/item/storage/backpack/satchel/tox + duffelbag = /obj/item/storage/backpack/duffelbag/toxins skillchips = list(/obj/item/skillchip/job/research_director) diff --git a/code/modules/jobs/job_types/scientist.dm b/code/modules/jobs/job_types/scientist.dm index 82282ae6719..7fe734629ad 100644 --- a/code/modules/jobs/job_types/scientist.dm +++ b/code/modules/jobs/job_types/scientist.dm @@ -34,6 +34,7 @@ backpack = /obj/item/storage/backpack/science satchel = /obj/item/storage/backpack/satchel/tox + duffelbag = /obj/item/storage/backpack/duffelbag/toxins /datum/outfit/job/scientist/pre_equip(mob/living/carbon/human/H) ..() diff --git a/code/modules/jobs/job_types/shaft_miner.dm b/code/modules/jobs/job_types/shaft_miner.dm index 4cf7900f1cf..b9e952180c6 100644 --- a/code/modules/jobs/job_types/shaft_miner.dm +++ b/code/modules/jobs/job_types/shaft_miner.dm @@ -36,7 +36,7 @@ backpack = /obj/item/storage/backpack/explorer satchel = /obj/item/storage/backpack/satchel/explorer - duffelbag = /obj/item/storage/backpack/duffelbag + duffelbag = /obj/item/storage/backpack/duffelbag/explorer box = /obj/item/storage/box/survival/mining chameleon_extras = /obj/item/gun/energy/kinetic_accelerator diff --git a/code/modules/jobs/job_types/virologist.dm b/code/modules/jobs/job_types/virologist.dm index 9063b72038d..8b919d0cfa7 100644 --- a/code/modules/jobs/job_types/virologist.dm +++ b/code/modules/jobs/job_types/virologist.dm @@ -35,5 +35,5 @@ backpack = /obj/item/storage/backpack/virology satchel = /obj/item/storage/backpack/satchel/vir - duffelbag = /obj/item/storage/backpack/duffelbag/med + duffelbag = /obj/item/storage/backpack/duffelbag/virology box = /obj/item/storage/box/survival/medical diff --git a/code/modules/mining/machine_vending.dm b/code/modules/mining/machine_vending.dm index cea88b734bc..69e11246fab 100644 --- a/code/modules/mining/machine_vending.dm +++ b/code/modules/mining/machine_vending.dm @@ -279,6 +279,8 @@ /obj/item/storage/backpack/duffelbag/mining_conscript name = "mining conscription kit" desc = "A kit containing everything a crewmember needs to support a shaft miner in the field." + icon_state = "duffel-explorer" + inhand_icon_state = "duffel-explorer" /obj/item/storage/backpack/duffelbag/mining_conscript/PopulateContents() new /obj/item/clothing/glasses/meson(src) diff --git a/code/modules/vending/wardrobes.dm b/code/modules/vending/wardrobes.dm index 60b3beff00c..3be119b3ed2 100644 --- a/code/modules/vending/wardrobes.dm +++ b/code/modules/vending/wardrobes.dm @@ -169,6 +169,7 @@ products = list(/obj/item/clothing/accessory/pocketprotector = 3, /obj/item/storage/backpack/science = 3, /obj/item/storage/backpack/satchel/tox = 3, + /obj/item/storage/backpack/duffelbag/toxins = 3, /obj/item/clothing/head/beret/science = 3, /obj/item/clothing/suit/hooded/wintercoat/science = 3, /obj/item/clothing/under/rank/rnd/scientist = 3, @@ -190,6 +191,7 @@ vend_reply = "Thank you for using the Hydrobe!" products = list(/obj/item/storage/backpack/botany = 2, /obj/item/storage/backpack/satchel/hyd = 2, + /obj/item/storage/backpack/duffelbag/hydroponics = 2, /obj/item/clothing/suit/hooded/wintercoat/hydro = 2, /obj/item/clothing/suit/apron = 2, /obj/item/clothing/suit/apron/overalls = 3, @@ -403,6 +405,7 @@ /obj/item/clothing/suit/toggle/labcoat/chemist = 2, /obj/item/storage/backpack/chemistry = 2, /obj/item/storage/backpack/satchel/chem = 2, + /obj/item/storage/backpack/duffelbag/chemistry = 2, /obj/item/storage/bag/chemistry = 2) contraband = list(/obj/item/reagent_containers/spray/syndicate = 2) refill_canister = /obj/item/vending_refill/wardrobe/chem_wardrobe @@ -421,7 +424,8 @@ /obj/item/clothing/shoes/sneakers/white = 2, /obj/item/clothing/suit/toggle/labcoat/genetics = 2, /obj/item/storage/backpack/genetics = 2, - /obj/item/storage/backpack/satchel/gen = 2) + /obj/item/storage/backpack/satchel/gen = 2, + /obj/item/storage/backpack/duffelbag/genetics = 2) refill_canister = /obj/item/vending_refill/wardrobe/gene_wardrobe payment_department = ACCOUNT_SCI /obj/item/vending_refill/wardrobe/gene_wardrobe @@ -439,7 +443,8 @@ /obj/item/clothing/suit/toggle/labcoat/virologist = 2, /obj/item/clothing/mask/surgical = 2, /obj/item/storage/backpack/virology = 2, - /obj/item/storage/backpack/satchel/vir = 2) + /obj/item/storage/backpack/satchel/vir = 2, + /obj/item/storage/backpack/duffelbag/virology = 2) refill_canister = /obj/item/vending_refill/wardrobe/viro_wardrobe payment_department = ACCOUNT_MED /obj/item/vending_refill/wardrobe/viro_wardrobe diff --git a/icons/mob/clothing/back.dmi b/icons/mob/clothing/back.dmi index 3ad315c91f3..9648f247b5b 100644 Binary files a/icons/mob/clothing/back.dmi and b/icons/mob/clothing/back.dmi differ diff --git a/icons/mob/inhands/equipment/backpack_lefthand.dmi b/icons/mob/inhands/equipment/backpack_lefthand.dmi index c2ffd6b77c5..ac282acfedb 100644 Binary files a/icons/mob/inhands/equipment/backpack_lefthand.dmi and b/icons/mob/inhands/equipment/backpack_lefthand.dmi differ diff --git a/icons/mob/inhands/equipment/backpack_righthand.dmi b/icons/mob/inhands/equipment/backpack_righthand.dmi index 2086b7c9923..dd3d59762b0 100644 Binary files a/icons/mob/inhands/equipment/backpack_righthand.dmi and b/icons/mob/inhands/equipment/backpack_righthand.dmi differ diff --git a/icons/obj/storage.dmi b/icons/obj/storage.dmi index 5b34ac4773a..3a83a94df8f 100644 Binary files a/icons/obj/storage.dmi and b/icons/obj/storage.dmi differ