diff --git a/code/_globalvars/lists/flavor_misc.dm b/code/_globalvars/lists/flavor_misc.dm index 8c5b9affdee..84dea24683d 100644 --- a/code/_globalvars/lists/flavor_misc.dm +++ b/code/_globalvars/lists/flavor_misc.dm @@ -142,17 +142,21 @@ GLOBAL_LIST_INIT(security_depts_prefs, sort_list(list( #define DBACKPACK "Department Backpack" #define DDUFFELBAG "Department Duffel Bag" #define DSATCHEL "Department Satchel" +#define DMESSENGER "Department Messenger Bag" #define GBACKPACK "Grey Backpack" #define GDUFFELBAG "Grey Duffel Bag" #define GSATCHEL "Grey Satchel" +#define GMESSENGER "Grey Messenger Bag" #define LSATCHEL "Leather Satchel" GLOBAL_LIST_INIT(backpacklist, list( DBACKPACK, DDUFFELBAG, DSATCHEL, + DMESSENGER, GBACKPACK, GDUFFELBAG, GSATCHEL, + GMESSENGER, LSATCHEL, )) diff --git a/code/game/objects/effects/spawners/random/clothing.dm b/code/game/objects/effects/spawners/random/clothing.dm index 3d2bb47cbf0..e3193b05836 100644 --- a/code/game/objects/effects/spawners/random/clothing.dm +++ b/code/game/objects/effects/spawners/random/clothing.dm @@ -172,6 +172,16 @@ /obj/item/storage/backpack/duffelbag/sec, /obj/item/storage/backpack/duffelbag/engineering, /obj/item/storage/backpack/duffelbag/clown, + /obj/item/storage/backpack/messenger, + /obj/item/storage/backpack/messenger/eng, + /obj/item/storage/backpack/messenger/med, + /obj/item/storage/backpack/messenger/vir, + /obj/item/storage/backpack/messenger/chem, + /obj/item/storage/backpack/messenger/gen, + /obj/item/storage/backpack/messenger/science, + /obj/item/storage/backpack/messenger/hyd, + /obj/item/storage/backpack/messenger/sec, + /obj/item/storage/backpack/messenger/explorer, ) /obj/effect/spawner/random/clothing/funny_hats diff --git a/code/game/objects/items/storage/backpack.dm b/code/game/objects/items/storage/backpack.dm index 4bc5eb2f9e5..a97d97a06e7 100644 --- a/code/game/objects/items/storage/backpack.dm +++ b/code/game/objects/items/storage/backpack.dm @@ -809,3 +809,90 @@ new /obj/item/gun/energy/recharge/kinetic_accelerator(src) new /obj/item/knife/combat/survival(src) new /obj/item/flashlight/seclite(src) + +/* + * Messenger Bag Types + */ + +/obj/item/storage/backpack/messenger + name = "messenger bag" + desc = "A trendy looking messenger bag; sometimes known as a courier bag. Fashionable and portable." + icon_state = "messenger" + inhand_icon_state = "messenger" + icon = 'icons/obj/storage/backpack.dmi' + worn_icon = 'icons/mob/clothing/back/backpack.dmi' + lefthand_file = 'icons/mob/inhands/equipment/backpack_lefthand.dmi' + righthand_file = 'icons/mob/inhands/equipment/backpack_righthand.dmi' + +/obj/item/storage/backpack/messenger/eng + name = "industrial messenger bag" + desc = "A tough messenger bag made of advanced treated leather for fireproofing. It also has more pockets than usual." + icon_state = "messenger_engineering" + inhand_icon_state = "messenger_engineering" + resistance_flags = FIRE_PROOF + +/obj/item/storage/backpack/messenger/med + name = "medical messenger bag" + desc = "A sterile messenger bag well loved by medics for its portability and sleek profile." + icon_state = "messenger_medical" + inhand_icon_state = "messenger_medical" + +/obj/item/storage/backpack/messenger/vir + name = "virologist messenger bag" + desc = "A sterile messenger bag with virologist colours, useful for deploying biohazards in record times." + icon_state = "messenger_virology" + inhand_icon_state = "messenger_virology" + +/obj/item/storage/backpack/messenger/chem + name = "chemist messenger bag" + desc = "A sterile messenger bag with chemist colours, good for getting to your alleyway deals on time." + icon_state = "messenger_chemistry" + inhand_icon_state = "messenger_chemistry" + +/obj/item/storage/backpack/messenger/coroner + name = "coroner messenger bag" + desc = "A messenger bag used to sneak your way out of graveyards at a good pace." + icon_state = "messenger_coroner" + inhand_icon_state = "messenger_coroner" + +/obj/item/storage/backpack/messenger/gen + name = "geneticist messenger bag" + desc = "A sterile messenger bag with geneticist colours, making a remarkably cute accessory for hulks." + icon_state = "messenger_genetics" + inhand_icon_state = "messenger_genetics" + +/obj/item/storage/backpack/messenger/science + name = "scientist messenger bag" + desc = "Useful for holding research materials, and for speeding your way to different scan objectives." + icon_state = "messenger_science" + inhand_icon_state = "messenger_science" + +/obj/item/storage/backpack/messenger/hyd + name = "botanist messenger bag" + desc = "A messenger bag made of all natural fibers, great for getting to the sesh in time." + icon_state = "messenger_hydroponics" + inhand_icon_state = "messenger_hydroponics" + +/obj/item/storage/backpack/messenger/sec + name = "security messenger bag" + desc = "A robust messenger bag for security related needs." + icon_state = "messenger_security" + inhand_icon_state = "messenger_security" + +/obj/item/storage/backpack/messenger/explorer + name = "explorer messenger bag" + desc = "A robust messenger bag for stashing your loot, as well as making a remarkably cute accessory for your drakebone armor." + icon_state = "messenger_explorer" + inhand_icon_state = "messenger_explorer" + +/obj/item/storage/backpack/messenger/cap + name = "captain's messenger bag" + desc = "An exclusive messenger bag for Nanotrasen officers, made of real whale leather." + icon_state = "messenger_captain" + inhand_icon_state = "messenger_captain" + +/obj/item/storage/backpack/messenger/clown + name = "Giggles von Honkerton Jr." + desc = "The latest in storage 'technology' from Honk Co. Hey, how does this fit so much with such a small profile anyway? The wearer will definitely never tell you." + icon_state = "messenger_clown" + inhand_icon_state = "messenger_clown" 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 14d201e07de..e0d615f95fa 100644 --- a/code/game/objects/structures/crates_lockers/closets/job_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/job_closets.dm @@ -124,6 +124,7 @@ /obj/item/storage/backpack/security = 1, /obj/item/storage/backpack/satchel/sec = 1, /obj/item/storage/backpack/duffelbag/sec = 2, + /obj/item/storage/backpack/messenger/sec = 1, /obj/item/clothing/under/rank/security/officer = 3, /obj/item/clothing/under/rank/security/officer/skirt = 2, /obj/item/clothing/shoes/jackboots = 3, @@ -157,6 +158,7 @@ /obj/item/storage/backpack/duffelbag/engineering = 1, /obj/item/storage/backpack/satchel/eng = 1, /obj/item/storage/backpack/industrial = 1, + /obj/item/storage/backpack/messenger/eng = 1, /obj/item/clothing/suit/hooded/wintercoat/engineering/atmos = 3, /obj/item/clothing/under/rank/engineering/atmospheric_technician = 3, /obj/item/clothing/shoes/sneakers/black = 3) @@ -173,6 +175,7 @@ /obj/item/storage/backpack/duffelbag/engineering = 1, /obj/item/storage/backpack/industrial = 1, /obj/item/storage/backpack/satchel/eng = 1, + /obj/item/storage/backpack/messenger/eng = 1, /obj/item/clothing/suit/hooded/wintercoat/engineering = 1, /obj/item/clothing/under/rank/engineering/engineer = 3, /obj/item/clothing/suit/hazardvest = 3, @@ -190,6 +193,7 @@ /obj/item/storage/backpack/duffelbag/med = 1, /obj/item/storage/backpack/medic = 1, /obj/item/storage/backpack/satchel/med = 1, + /obj/item/storage/backpack/messenger/med = 1, /obj/item/clothing/suit/hooded/wintercoat/medical = 1, /obj/item/clothing/head/costume/nursehat = 1, /obj/item/clothing/under/rank/medical/scrubs/blue = 1, @@ -233,6 +237,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/messenger/chem = 2, /obj/item/storage/backpack/duffelbag/chemistry = 2, /obj/item/storage/bag/chemistry = 2) generate_items_inside(items_inside,src) @@ -250,6 +255,7 @@ /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/messenger/gen = 2, /obj/item/storage/backpack/duffelbag/genetics = 2) generate_items_inside(items_inside,src) return @@ -267,6 +273,7 @@ /obj/item/clothing/mask/surgical = 2, /obj/item/storage/backpack/virology = 2, /obj/item/storage/backpack/satchel/vir = 2, + /obj/item/storage/backpack/messenger/vir = 2, /obj/item/storage/backpack/duffelbag/virology = 2,) generate_items_inside(items_inside,src) return @@ -298,6 +305,7 @@ var/static/items_inside = list( /obj/item/storage/backpack/botany = 2, /obj/item/storage/backpack/satchel/hyd = 2, + /obj/item/storage/backpack/messenger/hyd = 2, /obj/item/storage/backpack/duffelbag/hydroponics = 2, /obj/item/clothing/suit/hooded/wintercoat/hydro = 1, /obj/item/clothing/suit/apron = 2, @@ -316,4 +324,5 @@ new /obj/item/clothing/under/rank/civilian/curator/treasure_hunter(src) new /obj/item/clothing/shoes/workboots/mining(src) new /obj/item/storage/backpack/satchel/explorer(src) + new /obj/item/storage/backpack/messenger/explorer(src) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm index f9b61598c98..b5f8d99b974 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -9,6 +9,7 @@ new /obj/item/storage/backpack/captain(src) new /obj/item/storage/backpack/satchel/cap(src) new /obj/item/storage/backpack/duffelbag/captain(src) + new /obj/item/storage/backpack/messenger/cap(src) new /obj/item/clothing/neck/petcollar(src) new /obj/item/pet_carrier(src) new /obj/item/storage/bag/garment/captain(src) diff --git a/code/modules/client/preferences/clothing.dm b/code/modules/client/preferences/clothing.dm index 7bf59a9bef3..cf200ad1ffd 100644 --- a/code/modules/client/preferences/clothing.dm +++ b/code/modules/client/preferences/clothing.dm @@ -26,9 +26,11 @@ GSATCHEL, LSATCHEL, GDUFFELBAG, + GMESSENGER, DBACKPACK, DSATCHEL, DDUFFELBAG, + DMESSENGER, ) /datum/preference/choiced/backpack/icon_for(value) @@ -41,6 +43,8 @@ return /obj/item/storage/backpack/satchel/leather if (GDUFFELBAG) return /obj/item/storage/backpack/duffelbag + if (GMESSENGER) + return /obj/item/storage/backpack/messenger // In a perfect world, these would be your department's backpack. // However, this doesn't factor in assistants, or no high slot, and would @@ -52,6 +56,8 @@ return /obj/item/storage/backpack/satchel/med if (DDUFFELBAG) return /obj/item/storage/backpack/duffelbag/med + if (DMESSENGER) + return /obj/item/storage/backpack/messenger/med /datum/preference/choiced/backpack/apply_to_human(mob/living/carbon/human/target, value) target.backpack = value diff --git a/code/modules/jobs/job_types/_job.dm b/code/modules/jobs/job_types/_job.dm index 486eb7caff4..5831d1ffef0 100644 --- a/code/modules/jobs/job_types/_job.dm +++ b/code/modules/jobs/job_types/_job.dm @@ -279,6 +279,7 @@ var/backpack = /obj/item/storage/backpack var/satchel = /obj/item/storage/backpack/satchel var/duffelbag = /obj/item/storage/backpack/duffelbag + var/messenger = /obj/item/storage/backpack/messenger var/pda_slot = ITEM_SLOT_BELT @@ -293,10 +294,14 @@ back = /obj/item/storage/backpack/duffelbag //Grey Duffel bag if(LSATCHEL) back = /obj/item/storage/backpack/satchel/leather //Leather Satchel + if(GMESSENGER) + back = /obj/item/storage/backpack/messenger //Grey messenger bag if(DSATCHEL) back = satchel //Department satchel if(DDUFFELBAG) back = duffelbag //Department duffel bag + if(DMESSENGER) + back = messenger //Department messenger bag else back = backpack //Department backpack diff --git a/code/modules/jobs/job_types/atmospheric_technician.dm b/code/modules/jobs/job_types/atmospheric_technician.dm index 77f52fd8ab6..8947a77c508 100644 --- a/code/modules/jobs/job_types/atmospheric_technician.dm +++ b/code/modules/jobs/job_types/atmospheric_technician.dm @@ -52,6 +52,7 @@ backpack = /obj/item/storage/backpack/industrial satchel = /obj/item/storage/backpack/satchel/eng duffelbag = /obj/item/storage/backpack/duffelbag/engineering + messenger = /obj/item/storage/backpack/messenger/eng box = /obj/item/storage/box/survival/engineer pda_slot = ITEM_SLOT_LPOCKET diff --git a/code/modules/jobs/job_types/botanist.dm b/code/modules/jobs/job_types/botanist.dm index d977b221b47..7ccc4b31ceb 100644 --- a/code/modules/jobs/job_types/botanist.dm +++ b/code/modules/jobs/job_types/botanist.dm @@ -54,3 +54,4 @@ backpack = /obj/item/storage/backpack/botany satchel = /obj/item/storage/backpack/satchel/hyd duffelbag = /obj/item/storage/backpack/duffelbag/hydroponics + messenger = /obj/item/storage/backpack/messenger/hyd diff --git a/code/modules/jobs/job_types/captain.dm b/code/modules/jobs/job_types/captain.dm index 5d9891ec6dd..1eacae70c1a 100644 --- a/code/modules/jobs/job_types/captain.dm +++ b/code/modules/jobs/job_types/captain.dm @@ -75,6 +75,7 @@ backpack = /obj/item/storage/backpack/captain satchel = /obj/item/storage/backpack/satchel/cap duffelbag = /obj/item/storage/backpack/duffelbag/captain + messenger = /obj/item/storage/backpack/messenger/cap accessory = /obj/item/clothing/accessory/medal/gold/captain chameleon_extras = list( diff --git a/code/modules/jobs/job_types/chemist.dm b/code/modules/jobs/job_types/chemist.dm index b53f95cd687..bdb48c84f35 100644 --- a/code/modules/jobs/job_types/chemist.dm +++ b/code/modules/jobs/job_types/chemist.dm @@ -55,6 +55,7 @@ backpack = /obj/item/storage/backpack/chemistry satchel = /obj/item/storage/backpack/satchel/chem duffelbag = /obj/item/storage/backpack/duffelbag/chemistry + messenger = /obj/item/storage/backpack/messenger/chem box = /obj/item/storage/box/survival/medical chameleon_extras = /obj/item/gun/syringe diff --git a/code/modules/jobs/job_types/chief_engineer.dm b/code/modules/jobs/job_types/chief_engineer.dm index 42676d72e66..cee7b7ca7eb 100644 --- a/code/modules/jobs/job_types/chief_engineer.dm +++ b/code/modules/jobs/job_types/chief_engineer.dm @@ -73,6 +73,7 @@ backpack = /obj/item/storage/backpack/industrial satchel = /obj/item/storage/backpack/satchel/eng duffelbag = /obj/item/storage/backpack/duffelbag/engineering + messenger = /obj/item/storage/backpack/messenger/eng box = /obj/item/storage/box/survival/engineer chameleon_extras = /obj/item/stamp/head/ce diff --git a/code/modules/jobs/job_types/chief_medical_officer.dm b/code/modules/jobs/job_types/chief_medical_officer.dm index 448c764d44e..92c272167a0 100644 --- a/code/modules/jobs/job_types/chief_medical_officer.dm +++ b/code/modules/jobs/job_types/chief_medical_officer.dm @@ -72,6 +72,7 @@ backpack = /obj/item/storage/backpack/medic satchel = /obj/item/storage/backpack/satchel/med duffelbag = /obj/item/storage/backpack/duffelbag/med + messenger = /obj/item/storage/backpack/messenger/med box = /obj/item/storage/box/survival/medical chameleon_extras = list( diff --git a/code/modules/jobs/job_types/clown.dm b/code/modules/jobs/job_types/clown.dm index 927241ea6d0..01d144b4a51 100644 --- a/code/modules/jobs/job_types/clown.dm +++ b/code/modules/jobs/job_types/clown.dm @@ -67,6 +67,7 @@ backpack = /obj/item/storage/backpack/clown satchel = /obj/item/storage/backpack/clown duffelbag = /obj/item/storage/backpack/duffelbag/clown //strangely has a duffel + messenger = /obj/item/storage/backpack/messenger/clown box = /obj/item/storage/box/survival/hug chameleon_extras = /obj/item/stamp/clown diff --git a/code/modules/jobs/job_types/coroner.dm b/code/modules/jobs/job_types/coroner.dm index 14928b76dc5..22f6c5e65db 100644 --- a/code/modules/jobs/job_types/coroner.dm +++ b/code/modules/jobs/job_types/coroner.dm @@ -69,5 +69,6 @@ backpack = /obj/item/storage/backpack/coroner satchel = /obj/item/storage/backpack/satchel/coroner duffelbag = /obj/item/storage/backpack/duffelbag/coroner + messenger = /obj/item/storage/backpack/messenger/coroner skillchips = list(/obj/item/skillchip/entrails_reader) diff --git a/code/modules/jobs/job_types/geneticist.dm b/code/modules/jobs/job_types/geneticist.dm index 0b97bcb36e6..2498eb7c2a3 100644 --- a/code/modules/jobs/job_types/geneticist.dm +++ b/code/modules/jobs/job_types/geneticist.dm @@ -48,3 +48,4 @@ backpack = /obj/item/storage/backpack/genetics satchel = /obj/item/storage/backpack/satchel/gen duffelbag = /obj/item/storage/backpack/duffelbag/genetics + messenger = /obj/item/storage/backpack/messenger/gen diff --git a/code/modules/jobs/job_types/head_of_security.dm b/code/modules/jobs/job_types/head_of_security.dm index c06f61e6a59..74773b0e9be 100644 --- a/code/modules/jobs/job_types/head_of_security.dm +++ b/code/modules/jobs/job_types/head_of_security.dm @@ -67,6 +67,7 @@ backpack = /obj/item/storage/backpack/security satchel = /obj/item/storage/backpack/satchel/sec duffelbag = /obj/item/storage/backpack/duffelbag/sec + messenger = /obj/item/storage/backpack/messenger/sec box = /obj/item/storage/box/survival/security chameleon_extras = list( diff --git a/code/modules/jobs/job_types/medical_doctor.dm b/code/modules/jobs/job_types/medical_doctor.dm index 049ca748957..6f7359ddb7a 100644 --- a/code/modules/jobs/job_types/medical_doctor.dm +++ b/code/modules/jobs/job_types/medical_doctor.dm @@ -56,6 +56,7 @@ backpack = /obj/item/storage/backpack/medic satchel = /obj/item/storage/backpack/satchel/med duffelbag = /obj/item/storage/backpack/duffelbag/med + messenger = /obj/item/storage/backpack/messenger/med box = /obj/item/storage/box/survival/medical chameleon_extras = /obj/item/gun/syringe diff --git a/code/modules/jobs/job_types/paramedic.dm b/code/modules/jobs/job_types/paramedic.dm index 09bd837382a..53e9b22bf1d 100644 --- a/code/modules/jobs/job_types/paramedic.dm +++ b/code/modules/jobs/job_types/paramedic.dm @@ -60,6 +60,7 @@ backpack = /obj/item/storage/backpack/medic satchel = /obj/item/storage/backpack/satchel/med duffelbag = /obj/item/storage/backpack/duffelbag/med + messenger = /obj/item/storage/backpack/messenger/med box = /obj/item/storage/box/survival/medical chameleon_extras = /obj/item/gun/syringe diff --git a/code/modules/jobs/job_types/psychologist.dm b/code/modules/jobs/job_types/psychologist.dm index 3ece5c84371..4a1d291c867 100644 --- a/code/modules/jobs/job_types/psychologist.dm +++ b/code/modules/jobs/job_types/psychologist.dm @@ -56,6 +56,7 @@ backpack = /obj/item/storage/backpack/medic satchel = /obj/item/storage/backpack/satchel/med duffelbag = /obj/item/storage/backpack/duffelbag/med + messenger = /obj/item/storage/backpack/messenger/med pda_slot = ITEM_SLOT_BELT skillchips = list(/obj/item/skillchip/job/psychology) diff --git a/code/modules/jobs/job_types/research_director.dm b/code/modules/jobs/job_types/research_director.dm index bec6024621f..684c88a7e0f 100644 --- a/code/modules/jobs/job_types/research_director.dm +++ b/code/modules/jobs/job_types/research_director.dm @@ -72,6 +72,7 @@ backpack = /obj/item/storage/backpack/science satchel = /obj/item/storage/backpack/satchel/science duffelbag = /obj/item/storage/backpack/duffelbag/science + messenger = /obj/item/storage/backpack/messenger/science chameleon_extras = /obj/item/stamp/head/rd 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 06be18a02b6..878167f2548 100644 --- a/code/modules/jobs/job_types/scientist.dm +++ b/code/modules/jobs/job_types/scientist.dm @@ -51,6 +51,7 @@ backpack = /obj/item/storage/backpack/science satchel = /obj/item/storage/backpack/satchel/science duffelbag = /obj/item/storage/backpack/duffelbag/science + messenger = /obj/item/storage/backpack/messenger/science /datum/outfit/job/scientist/pre_equip(mob/living/carbon/human/H) ..() diff --git a/code/modules/jobs/job_types/security_officer.dm b/code/modules/jobs/job_types/security_officer.dm index 72f96725387..25d76bf0156 100644 --- a/code/modules/jobs/job_types/security_officer.dm +++ b/code/modules/jobs/job_types/security_officer.dm @@ -215,6 +215,7 @@ GLOBAL_LIST_EMPTY(security_officer_distribution) backpack = /obj/item/storage/backpack/security satchel = /obj/item/storage/backpack/satchel/sec duffelbag = /obj/item/storage/backpack/duffelbag/sec + messenger = /obj/item/storage/backpack/messenger/sec box = /obj/item/storage/box/survival/security chameleon_extras = list( diff --git a/code/modules/jobs/job_types/shaft_miner.dm b/code/modules/jobs/job_types/shaft_miner.dm index 66eb80244f4..2c65ca3e05e 100644 --- a/code/modules/jobs/job_types/shaft_miner.dm +++ b/code/modules/jobs/job_types/shaft_miner.dm @@ -51,6 +51,7 @@ backpack = /obj/item/storage/backpack/explorer satchel = /obj/item/storage/backpack/satchel/explorer duffelbag = /obj/item/storage/backpack/duffelbag/explorer + messenger = /obj/item/storage/backpack/messenger/explorer box = /obj/item/storage/box/survival/mining chameleon_extras = /obj/item/gun/energy/recharge/kinetic_accelerator diff --git a/code/modules/jobs/job_types/station_engineer.dm b/code/modules/jobs/job_types/station_engineer.dm index f636058677e..8738389ab41 100644 --- a/code/modules/jobs/job_types/station_engineer.dm +++ b/code/modules/jobs/job_types/station_engineer.dm @@ -55,6 +55,7 @@ backpack = /obj/item/storage/backpack/industrial satchel = /obj/item/storage/backpack/satchel/eng duffelbag = /obj/item/storage/backpack/duffelbag/engineering + messenger = /obj/item/storage/backpack/messenger/eng backpack_contents = list( /obj/item/construction/rcd/loaded, diff --git a/code/modules/jobs/job_types/virologist.dm b/code/modules/jobs/job_types/virologist.dm index 20ebf3ac8dd..39cbc0ccce7 100644 --- a/code/modules/jobs/job_types/virologist.dm +++ b/code/modules/jobs/job_types/virologist.dm @@ -55,5 +55,6 @@ backpack = /obj/item/storage/backpack/virology satchel = /obj/item/storage/backpack/satchel/vir duffelbag = /obj/item/storage/backpack/duffelbag/virology + messenger = /obj/item/storage/backpack/messenger/vir box = /obj/item/storage/box/survival/medical diff --git a/code/modules/jobs/job_types/warden.dm b/code/modules/jobs/job_types/warden.dm index 62e7dc9e205..643611201c8 100644 --- a/code/modules/jobs/job_types/warden.dm +++ b/code/modules/jobs/job_types/warden.dm @@ -65,6 +65,7 @@ backpack = /obj/item/storage/backpack/security satchel = /obj/item/storage/backpack/satchel/sec duffelbag = /obj/item/storage/backpack/duffelbag/sec + messenger = /obj/item/storage/backpack/messenger/sec box = /obj/item/storage/box/survival/security implants = list(/obj/item/implant/mindshield) diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm index aae28fcf476..aebb858facb 100644 --- a/code/modules/mining/mine_items.dm +++ b/code/modules/mining/mine_items.dm @@ -36,6 +36,7 @@ new /obj/item/storage/backpack/duffelbag/explorer(src) new /obj/item/storage/backpack/explorer(src) new /obj/item/storage/backpack/satchel/explorer(src) + new /obj/item/storage/backpack/messenger/explorer(src) new /obj/item/clothing/under/rank/cargo/miner/lavaland(src) new /obj/item/clothing/under/rank/cargo/miner/lavaland(src) new /obj/item/clothing/under/rank/cargo/miner/lavaland(src) diff --git a/code/modules/vending/wardrobes.dm b/code/modules/vending/wardrobes.dm index 398d82497e3..89452979e71 100644 --- a/code/modules/vending/wardrobes.dm +++ b/code/modules/vending/wardrobes.dm @@ -31,6 +31,7 @@ /obj/item/storage/backpack/security = 3, /obj/item/storage/backpack/satchel/sec = 3, /obj/item/storage/backpack/duffelbag/sec = 3, + /obj/item/storage/backpack/messenger/sec = 3, ) premium = list( /obj/item/clothing/under/rank/security/officer/formal = 3, @@ -80,6 +81,7 @@ /obj/item/storage/backpack/duffelbag/med = 4, /obj/item/storage/backpack/medic = 4, /obj/item/storage/backpack/satchel/med = 4, + /obj/item/storage/backpack/messenger/med = 4, /obj/item/radio/headset/headset_med = 4, ) refill_canister = /obj/item/vending_refill/wardrobe/medi_wardrobe @@ -109,6 +111,7 @@ /obj/item/storage/backpack/industrial = 3, /obj/item/storage/backpack/satchel/eng = 3, /obj/item/storage/backpack/duffelbag/engineering = 3, + /obj/item/storage/backpack/messenger/eng = 3, ) refill_canister = /obj/item/vending_refill/wardrobe/engi_wardrobe payment_department = ACCOUNT_ENG @@ -132,6 +135,7 @@ /obj/item/storage/backpack/satchel/eng = 3, /obj/item/storage/backpack/industrial = 3, /obj/item/storage/backpack/duffelbag/engineering = 3, + /obj/item/storage/backpack/messenger/eng = 3, ) refill_canister = /obj/item/vending_refill/wardrobe/atmos_wardrobe payment_department = ACCOUNT_ENG @@ -161,6 +165,7 @@ /obj/item/storage/backpack/satchel = 3, /obj/item/storage/backpack/satchel/leather = 3, /obj/item/storage/backpack/duffelbag = 3, + /obj/item/storage/backpack/messenger = 3, /obj/item/storage/bag/mail = 3, /obj/item/radio/headset/headset_cargo = 3, ) @@ -194,6 +199,7 @@ /obj/item/storage/backpack/science = 3, /obj/item/storage/backpack/satchel/science = 3, /obj/item/storage/backpack/duffelbag/science = 3, + /obj/item/storage/backpack/messenger/science = 3, /obj/item/radio/headset/headset_sci = 2, ) contraband = list( @@ -228,6 +234,7 @@ /obj/item/storage/backpack/science = 3, /obj/item/storage/backpack/satchel/science = 3, /obj/item/storage/backpack/duffelbag/science = 3, + /obj/item/storage/backpack/messenger/science = 3, /obj/item/radio/headset/headset_sci = 3, ) refill_canister = /obj/item/vending_refill/wardrobe/science_wardrobe @@ -253,6 +260,7 @@ /obj/item/storage/backpack/botany = 3, /obj/item/storage/backpack/satchel/hyd = 3, /obj/item/storage/backpack/duffelbag/hydroponics = 3, + /obj/item/storage/backpack/messenger/hyd = 3, /obj/item/radio/headset/headset_srv = 3, ) refill_canister = /obj/item/vending_refill/wardrobe/hydro_wardrobe @@ -285,6 +293,7 @@ /obj/item/clothing/under/rank/civilian/head_of_personnel/suit/skirt = 1, /obj/item/clothing/suit/toggle/lawyer/greyscale = 1, /obj/item/storage/backpack/satchel/explorer = 1, + /obj/item/storage/backpack/messenger/explorer = 1, /obj/item/storage/bag/books = 1, /obj/item/radio/headset/headset_srv = 2, ) @@ -315,6 +324,7 @@ /obj/item/storage/backpack/coroner = 1, /obj/item/storage/backpack/satchel/coroner = 1, /obj/item/storage/backpack/duffelbag/coroner = 1, + /obj/item/storage/backpack/messenger/coroner = 1, /obj/item/storage/box/bodybags = 3, /obj/item/scalpel/cruel = 1, /obj/item/retractor/cruel = 1, @@ -545,6 +555,7 @@ /obj/item/storage/backpack/chemistry = 2, /obj/item/storage/backpack/satchel/chem = 2, /obj/item/storage/backpack/duffelbag/chemistry = 2, + /obj/item/storage/backpack/messenger/chem = 2, /obj/item/storage/bag/chemistry = 2, /obj/item/ph_booklet = 3, /obj/item/radio/headset/headset_med = 2, @@ -574,6 +585,7 @@ /obj/item/storage/backpack/genetics = 2, /obj/item/storage/backpack/satchel/gen = 2, /obj/item/storage/backpack/duffelbag/genetics = 2, + /obj/item/storage/backpack/messenger/gen = 2, /obj/item/radio/headset/headset_sci = 2, ) refill_canister = /obj/item/vending_refill/wardrobe/gene_wardrobe @@ -600,6 +612,7 @@ /obj/item/storage/backpack/virology = 2, /obj/item/storage/backpack/satchel/vir = 2, /obj/item/storage/backpack/duffelbag/virology = 2, + /obj/item/storage/backpack/messenger/vir = 2, /obj/item/radio/headset/headset_med = 2, ) refill_canister = /obj/item/vending_refill/wardrobe/viro_wardrobe diff --git a/icons/mob/clothing/back/backpack.dmi b/icons/mob/clothing/back/backpack.dmi index 0ee8632c87b..bf5207d85c4 100644 Binary files a/icons/mob/clothing/back/backpack.dmi and b/icons/mob/clothing/back/backpack.dmi differ diff --git a/icons/mob/inhands/equipment/backpack_lefthand.dmi b/icons/mob/inhands/equipment/backpack_lefthand.dmi index 62c0dabfb52..e1cdb33c4b7 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 f0d9981edc4..31bdf51e7e0 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/backpack.dmi b/icons/obj/storage/backpack.dmi index b66bb441968..c61d9321611 100644 Binary files a/icons/obj/storage/backpack.dmi and b/icons/obj/storage/backpack.dmi differ