diff --git a/code/defines/obj/storage.dm b/code/defines/obj/storage.dm index 7e85b46e654..62841aa7867 100644 --- a/code/defines/obj/storage.dm +++ b/code/defines/obj/storage.dm @@ -2,6 +2,7 @@ name = "backpack" desc = "You wear this on your back and put items into it." icon_state = "backpack" + item_state = "backpack" w_class = 4.0 flags = FPRINT|TABLEPASS slot_flags = SLOT_BACK //ERROOOOO @@ -108,6 +109,7 @@ name = "satchel" desc = "It's a very robust satchel to wear on your back." icon_state = "satchel" + item_state = "backpack" /obj/item/weapon/storage/backpack/satchel/withwallet New() @@ -125,11 +127,13 @@ name = "industrial satchel" desc = "A tough satchel with extra pockets." icon_state = "satchel-eng" + item_state = "engiepack" /obj/item/weapon/storage/backpack/satchel_med name = "medical satchel" desc = "A sterile satchel used in medical departments." icon_state = "satchel-med" + item_state = "medicalpack" /obj/item/weapon/storage/backpack/satchel_vir name = "virologist satchel" @@ -155,6 +159,7 @@ name = "security satchel" desc = "A robust satchel for security related needs." icon_state = "satchel-sec" + item_state = "securitypack" /obj/item/weapon/storage/backpack/satchel_hyd name = "hydroponics satchel" diff --git a/code/game/jobs/job/captain.dm b/code/game/jobs/job/captain.dm index ed49b142f56..3209233c191 100644 --- a/code/game/jobs/job/captain.dm +++ b/code/game/jobs/job/captain.dm @@ -14,7 +14,7 @@ if(!H) return 0 H.equip_if_possible(new /obj/item/device/radio/headset/heads/captain(H), H.slot_ears) if(H.backbag == 2) H.equip_if_possible(new /obj/item/weapon/storage/backpack(H), H.slot_back) - if(H.backbag == 3) H.equip_if_possible(new /obj/item/weapon/storage/backpack/satchel(H), H.slot_back) + if(H.backbag == 3) H.equip_if_possible(new /obj/item/weapon/storage/backpack/satchel_norm(H), H.slot_back) H.equip_if_possible(new /obj/item/weapon/storage/box/survival(H.back), H.slot_in_backpack) H.equip_if_possible(new /obj/item/clothing/under/rank/captain(H), H.slot_w_uniform) H.equip_if_possible(new /obj/item/device/pda/captain(H), H.slot_belt) @@ -51,7 +51,7 @@ if(!H) return 0 H.equip_if_possible(new /obj/item/device/radio/headset/heads/hop(H), H.slot_ears) if(H.backbag == 2) H.equip_if_possible(new /obj/item/weapon/storage/backpack(H), H.slot_back) - if(H.backbag == 3) H.equip_if_possible(new /obj/item/weapon/storage/backpack/satchel(H), H.slot_back) + if(H.backbag == 3) H.equip_if_possible(new /obj/item/weapon/storage/backpack/satchel_norm(H), H.slot_back) H.equip_if_possible(new /obj/item/weapon/storage/box/survival(H.back), H.slot_in_backpack) H.equip_if_possible(new /obj/item/clothing/under/rank/head_of_personnel(H), H.slot_w_uniform) H.equip_if_possible(new /obj/item/clothing/shoes/brown(H), H.slot_shoes) diff --git a/code/game/jobs/job/civilian.dm b/code/game/jobs/job/civilian.dm index 55f552d98cc..258a0768fe0 100644 --- a/code/game/jobs/job/civilian.dm +++ b/code/game/jobs/job/civilian.dm @@ -13,7 +13,7 @@ equip(var/mob/living/carbon/human/H) if(!H) return 0 if(H.backbag == 2) H.equip_if_possible(new /obj/item/weapon/storage/backpack(H), H.slot_back) - if(H.backbag == 3) H.equip_if_possible(new /obj/item/weapon/storage/backpack/satchel(H), H.slot_back) + if(H.backbag == 3) H.equip_if_possible(new /obj/item/weapon/storage/backpack/satchel_norm(H), H.slot_back) H.equip_if_possible(new /obj/item/clothing/shoes/black(H), H.slot_shoes) H.equip_if_possible(new /obj/item/clothing/suit/armor/vest(H), H.slot_wear_suit) H.equip_if_possible(new /obj/item/clothing/under/rank/bartender(H), H.slot_w_uniform) @@ -144,7 +144,7 @@ if(!H) return 0 H.equip_if_possible(new /obj/item/device/radio/headset/headset_mine (H), H.slot_ears) if(H.backbag == 2) H.equip_if_possible(new /obj/item/weapon/storage/backpack/industrial (H), H.slot_back) - if(H.backbag == 3) H.equip_if_possible(new /obj/item/weapon/storage/backpack/satchel(H), H.slot_back) + if(H.backbag == 3) H.equip_if_possible(new /obj/item/weapon/storage/backpack/satchel_eng(H), H.slot_back) H.equip_if_possible(new /obj/item/device/pda/shaftminer(H), H.slot_belt) H.equip_if_possible(new /obj/item/clothing/under/rank/miner(H), H.slot_w_uniform) H.equip_if_possible(new /obj/item/clothing/shoes/black(H), H.slot_shoes) @@ -205,7 +205,7 @@ equip(var/mob/living/carbon/human/H) if(!H) return 0 if(H.backbag == 2) H.equip_if_possible(new /obj/item/weapon/storage/backpack(H), H.slot_back) - if(H.backbag == 3) H.equip_if_possible(new /obj/item/weapon/storage/backpack/satchel(H), H.slot_back) + if(H.backbag == 3) H.equip_if_possible(new /obj/item/weapon/storage/backpack/satchel_norm(H), H.slot_back) H.equip_if_possible(new /obj/item/clothing/under/mime(H), H.slot_w_uniform) H.equip_if_possible(new /obj/item/clothing/shoes/black(H), H.slot_shoes) H.equip_if_possible(new /obj/item/device/pda/mime(H), H.slot_belt) @@ -287,7 +287,7 @@ var/global/lawyer = 0//Checks for another lawyer equip(var/mob/living/carbon/human/H) if(!H) return 0 if(H.backbag == 2) H.equip_if_possible(new /obj/item/weapon/storage/backpack(H), H.slot_back) - if(H.backbag == 3) H.equip_if_possible(new /obj/item/weapon/storage/backpack/satchel(H), H.slot_back) + if(H.backbag == 3) H.equip_if_possible(new /obj/item/weapon/storage/backpack/satchel_norm(H), H.slot_back) if(!lawyer) lawyer = 1 H.equip_if_possible(new /obj/item/clothing/under/lawyer/bluesuit(H), H.slot_w_uniform) diff --git a/code/game/jobs/job/engineering.dm b/code/game/jobs/job/engineering.dm index b1e7134dbc9..c0c3136c9e8 100644 --- a/code/game/jobs/job/engineering.dm +++ b/code/game/jobs/job/engineering.dm @@ -14,7 +14,7 @@ if(!H) return 0 H.equip_if_possible(new /obj/item/device/radio/headset/heads/ce(H), H.slot_ears) if(H.backbag == 2) H.equip_if_possible(new /obj/item/weapon/storage/backpack/industrial (H), H.slot_back) - if(H.backbag == 3) H.equip_if_possible(new /obj/item/weapon/storage/backpack/satchel(H), H.slot_back) + if(H.backbag == 3) H.equip_if_possible(new /obj/item/weapon/storage/backpack/satchel_eng(H), H.slot_back) H.equip_if_possible(new /obj/item/clothing/under/rank/chief_engineer(H), H.slot_w_uniform) H.equip_if_possible(new /obj/item/device/pda/heads/ce(H), H.slot_l_store) H.equip_if_possible(new /obj/item/clothing/shoes/brown(H), H.slot_shoes) @@ -47,7 +47,7 @@ if(!H) return 0 H.equip_if_possible(new /obj/item/device/radio/headset/headset_eng(H), H.slot_ears) if(H.backbag == 2) H.equip_if_possible(new /obj/item/weapon/storage/backpack/industrial(H), H.slot_back) - if(H.backbag == 3) H.equip_if_possible(new /obj/item/weapon/storage/backpack/satchel(H), H.slot_back) + if(H.backbag == 3) H.equip_if_possible(new /obj/item/weapon/storage/backpack/satchel_eng(H), H.slot_back) H.equip_if_possible(new /obj/item/clothing/under/rank/engineer(H), H.slot_w_uniform) H.equip_if_possible(new /obj/item/clothing/shoes/orange(H), H.slot_shoes) H.equip_if_possible(new /obj/item/weapon/storage/belt/utility/full(H), H.slot_belt) @@ -77,7 +77,7 @@ if(!H) return 0 H.equip_if_possible(new /obj/item/device/radio/headset/headset_eng(H), H.slot_ears) if(H.backbag == 2) H.equip_if_possible(new /obj/item/weapon/storage/backpack(H), H.slot_back) - if(H.backbag == 3) H.equip_if_possible(new /obj/item/weapon/storage/backpack/satchel(H), H.slot_back) + if(H.backbag == 3) H.equip_if_possible(new /obj/item/weapon/storage/backpack/satchel_norm(H), H.slot_back) H.equip_if_possible(new /obj/item/clothing/under/rank/atmospheric_technician(H), H.slot_w_uniform) H.equip_if_possible(new /obj/item/clothing/shoes/black(H), H.slot_shoes) H.equip_if_possible(new /obj/item/device/pda/atmos(H), H.slot_l_store) @@ -104,7 +104,7 @@ if(!H) return 0 H.equip_if_possible(new /obj/item/device/radio/headset/headset_rob(H), H.slot_ears) if(H.backbag == 2) H.equip_if_possible(new /obj/item/weapon/storage/backpack(H), H.slot_back) - if(H.backbag == 3) H.equip_if_possible(new /obj/item/weapon/storage/backpack/satchel(H), H.slot_back) + if(H.backbag == 3) H.equip_if_possible(new /obj/item/weapon/storage/backpack/satchel_norm(H), H.slot_back) H.equip_if_possible(new /obj/item/clothing/under/rank/roboticist(H), H.slot_w_uniform) H.equip_if_possible(new /obj/item/clothing/shoes/black(H), H.slot_shoes) H.equip_if_possible(new /obj/item/device/pda/roboticist(H), H.slot_belt) diff --git a/code/game/jobs/job/medical.dm b/code/game/jobs/job/medical.dm index f498d384703..7dfd020a74e 100644 --- a/code/game/jobs/job/medical.dm +++ b/code/game/jobs/job/medical.dm @@ -14,7 +14,7 @@ if(!H) return 0 H.equip_if_possible(new /obj/item/device/radio/headset/heads/cmo(H), H.slot_ears) if(H.backbag == 2) H.equip_if_possible(new /obj/item/weapon/storage/backpack/medic (H), H.slot_back) - if(H.backbag == 3) H.equip_if_possible(new /obj/item/weapon/storage/backpack/satchel(H), H.slot_back) + if(H.backbag == 3) H.equip_if_possible(new /obj/item/weapon/storage/backpack/satchel_med(H), H.slot_back) H.equip_if_possible(new /obj/item/clothing/under/rank/chief_medical_officer(H), H.slot_w_uniform) H.equip_if_possible(new /obj/item/clothing/shoes/brown(H), H.slot_shoes) H.equip_if_possible(new /obj/item/device/pda/heads/cmo(H), H.slot_belt) @@ -44,7 +44,7 @@ if(!H) return 0 H.equip_if_possible(new /obj/item/device/radio/headset/headset_med(H), H.slot_ears) if(H.backbag == 2) H.equip_if_possible(new /obj/item/weapon/storage/backpack/medic (H), H.slot_back) - if(H.backbag == 3) H.equip_if_possible(new /obj/item/weapon/storage/backpack/satchel(H), H.slot_back) + if(H.backbag == 3) H.equip_if_possible(new /obj/item/weapon/storage/backpack/satchel_med(H), H.slot_back) H.equip_if_possible(new /obj/item/clothing/under/rank/medical(H), H.slot_w_uniform) H.equip_if_possible(new /obj/item/clothing/shoes/white(H), H.slot_shoes) H.equip_if_possible(new /obj/item/device/pda/medical(H), H.slot_belt) @@ -120,7 +120,7 @@ if(!H) return 0 H.equip_if_possible(new /obj/item/device/radio/headset/headset_med(H), H.slot_ears) if(H.backbag == 2) H.equip_if_possible(new /obj/item/weapon/storage/backpack/medic (H), H.slot_back) - if(H.backbag == 3) H.equip_if_possible(new /obj/item/weapon/storage/backpack/satchel(H), H.slot_back) + if(H.backbag == 3) H.equip_if_possible(new /obj/item/weapon/storage/backpack/satchel_med(H), H.slot_back) H.equip_if_possible(new /obj/item/clothing/under/rank/virologist(H), H.slot_w_uniform) H.equip_if_possible(new /obj/item/device/pda/medical(H), H.slot_belt) H.equip_if_possible(new /obj/item/clothing/mask/surgical(H), H.slot_wear_mask) diff --git a/code/game/jobs/job/security.dm b/code/game/jobs/job/security.dm index c316eab7fc4..7ce8ce1778c 100644 --- a/code/game/jobs/job/security.dm +++ b/code/game/jobs/job/security.dm @@ -13,7 +13,7 @@ equip(var/mob/living/carbon/human/H) if(!H) return 0 if(H.backbag == 2) H.equip_if_possible(new /obj/item/weapon/storage/backpack/security (H), H.slot_back) - if(H.backbag == 3) H.equip_if_possible(new /obj/item/weapon/storage/backpack/satchel(H), H.slot_back) + if(H.backbag == 3) H.equip_if_possible(new /obj/item/weapon/storage/backpack/satchel_sec(H), H.slot_back) H.equip_if_possible(new /obj/item/device/radio/headset/heads/hos(H), H.slot_ears) H.equip_if_possible(new /obj/item/clothing/under/rank/head_of_security(H), H.slot_w_uniform) H.equip_if_possible(new /obj/item/clothing/shoes/jackboots(H), H.slot_shoes) @@ -52,7 +52,7 @@ if(!H) return 0 H.equip_if_possible(new /obj/item/device/radio/headset/headset_sec(H), H.slot_ears) if(H.backbag == 2) H.equip_if_possible(new /obj/item/weapon/storage/backpack/security(H), H.slot_back) - if(H.backbag == 3) H.equip_if_possible(new /obj/item/weapon/storage/backpack/satchel(H), H.slot_back) + if(H.backbag == 3) H.equip_if_possible(new /obj/item/weapon/storage/backpack/satchel_sec(H), H.slot_back) H.equip_if_possible(new /obj/item/clothing/under/rank/warden(H), H.slot_w_uniform) H.equip_if_possible(new /obj/item/clothing/shoes/jackboots(H), H.slot_shoes) H.equip_if_possible(new /obj/item/device/pda/warden(H), H.slot_belt) @@ -90,7 +90,7 @@ if(!H) return 0 H.equip_if_possible(new /obj/item/device/radio/headset/headset_sec(H), H.slot_ears) if(H.backbag == 2) H.equip_if_possible(new /obj/item/weapon/storage/backpack(H), H.slot_back) - if(H.backbag == 3) H.equip_if_possible(new /obj/item/weapon/storage/backpack/satchel(H), H.slot_back) + if(H.backbag == 3) H.equip_if_possible(new /obj/item/weapon/storage/backpack/satchel_norm(H), H.slot_back) H.equip_if_possible(new /obj/item/clothing/under/det(H), H.slot_w_uniform) H.equip_if_possible(new /obj/item/clothing/shoes/brown(H), H.slot_shoes) H.equip_if_possible(new /obj/item/device/pda/detective(H), H.slot_belt) @@ -136,7 +136,7 @@ if(!H) return 0 H.equip_if_possible(new /obj/item/device/radio/headset/headset_sec(H), H.slot_ears) if(H.backbag == 2) H.equip_if_possible(new /obj/item/weapon/storage/backpack/security(H), H.slot_back) - if(H.backbag == 3) H.equip_if_possible(new /obj/item/weapon/storage/backpack/satchel(H), H.slot_back) + if(H.backbag == 3) H.equip_if_possible(new /obj/item/weapon/storage/backpack/satchel_sec(H), H.slot_back) H.equip_if_possible(new /obj/item/clothing/under/rank/security(H), H.slot_w_uniform) H.equip_if_possible(new /obj/item/clothing/shoes/jackboots(H), H.slot_shoes) H.equip_if_possible(new /obj/item/device/pda/security(H), H.slot_belt) diff --git a/code/game/jobs/job_controller.dm b/code/game/jobs/job_controller.dm index 63110bd7b3f..e25f8ad6839 100644 --- a/code/game/jobs/job_controller.dm +++ b/code/game/jobs/job_controller.dm @@ -317,7 +317,7 @@ var/global/datum/controller/occupations/job_master H.equip_if_possible(BPK, H.slot_back,1) if(H.backbag == 3) - var/obj/item/weapon/storage/backpack/BPK = new/obj/item/weapon/storage/backpack/satchel(H) + var/obj/item/weapon/storage/backpack/BPK = new/obj/item/weapon/storage/backpack/satchel_norm(H) new /obj/item/weapon/storage/box/survival(BPK) H.equip_if_possible(BPK, H.slot_back,1) diff --git a/code/game/objects/closets/secure/engineering.dm b/code/game/objects/closets/secure/engineering.dm index bcf5ef629d7..da0115b0949 100644 --- a/code/game/objects/closets/secure/engineering.dm +++ b/code/game/objects/closets/secure/engineering.dm @@ -12,7 +12,10 @@ New() ..() sleep(2) - new /obj/item/weapon/storage/backpack/industrial(src) + if(prob(50)) + new /obj/item/weapon/storage/backpack/industrial(src) + else + new /obj/item/weapon/storage/backpack/satchel_eng(src) new /obj/item/blueprints(src) new /obj/item/clothing/under/rank/chief_engineer(src) new /obj/item/clothing/head/hardhat/white(src) @@ -97,7 +100,10 @@ New() ..() sleep(2) - new /obj/item/weapon/storage/backpack/industrial(src) + if(prob(50)) + new /obj/item/weapon/storage/backpack/industrial(src) + else + new /obj/item/weapon/storage/backpack/satchel_eng(src) new /obj/item/clothing/under/rank/engineer(src) new /obj/item/clothing/shoes/orange(src) new /obj/item/weapon/storage/toolbox/mechanical(src) diff --git a/code/game/objects/closets/secure/medical.dm b/code/game/objects/closets/secure/medical.dm index 262b341728c..5e9925db55a 100644 --- a/code/game/objects/closets/secure/medical.dm +++ b/code/game/objects/closets/secure/medical.dm @@ -64,7 +64,10 @@ New() ..() sleep(2) - new /obj/item/weapon/storage/backpack/medic(src) + if(prob(50)) + new /obj/item/weapon/storage/backpack/medic(src) + else + new /obj/item/weapon/storage/backpack/satchel_med(src) new /obj/item/clothing/under/rank/nursesuit (src) new /obj/item/clothing/head/nursehat (src) switch(pick("blue", "green", "purple")) @@ -104,6 +107,10 @@ New() ..() sleep(2) + if(prob(50)) + new /obj/item/weapon/storage/backpack/medic(src) + else + new /obj/item/weapon/storage/backpack/satchel_med(src) new /obj/item/clothing/suit/bio_suit/cmo(src) new /obj/item/clothing/head/bio_hood/cmo(src) new /obj/item/clothing/under/rank/chief_medical_officer(src) diff --git a/code/game/objects/closets/secure/personal.dm b/code/game/objects/closets/secure/personal.dm index b9ec62f58e9..dd599886150 100644 --- a/code/game/objects/closets/secure/personal.dm +++ b/code/game/objects/closets/secure/personal.dm @@ -4,7 +4,10 @@ /obj/structure/closet/secure_closet/personal/New() ..() spawn(2) - new /obj/item/weapon/storage/backpack( src ) + if(prob(50)) + new /obj/item/weapon/storage/backpack(src) + else + new /obj/item/weapon/storage/backpack/satchel_norm(src) new /obj/item/device/radio/headset( src ) return diff --git a/code/game/objects/closets/secure/security.dm b/code/game/objects/closets/secure/security.dm index 5885ba13788..34e5d08631f 100644 --- a/code/game/objects/closets/secure/security.dm +++ b/code/game/objects/closets/secure/security.dm @@ -67,7 +67,10 @@ New() ..() sleep(2) - new /obj/item/weapon/storage/backpack/security(src) + if(prob(50)) + new /obj/item/weapon/storage/backpack/security(src) + else + new /obj/item/weapon/storage/backpack/satchel_sec(src) new /obj/item/clothing/suit/armor/vest(src) new /obj/item/clothing/under/jensen(src) new /obj/item/clothing/suit/armor/hos/jensen(src) @@ -100,7 +103,10 @@ New() ..() sleep(2) - new /obj/item/weapon/storage/backpack/security(src) + if(prob(50)) + new /obj/item/weapon/storage/backpack/security(src) + else + new /obj/item/weapon/storage/backpack/satchel_sec(src) new /obj/item/clothing/suit/armor/vest(src) new /obj/item/clothing/under/rank/warden(src) new /obj/item/clothing/suit/armor/vest/warden(src) @@ -130,7 +136,10 @@ New() ..() sleep(2) - new /obj/item/weapon/storage/backpack/security(src) + if(prob(50)) + new /obj/item/weapon/storage/backpack/security(src) + else + new /obj/item/weapon/storage/backpack/satchel_sec(src) new /obj/item/clothing/suit/armor/vest(src) new /obj/item/clothing/head/helmet(src) // new /obj/item/weapon/cartridge/security(src) diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm index ad4ea961b57..8a1076b9019 100644 --- a/code/modules/mining/mine_items.dm +++ b/code/modules/mining/mine_items.dm @@ -22,7 +22,10 @@ /obj/structure/closet/secure_closet/miner/New() ..() sleep(2) - new /obj/item/weapon/storage/backpack/industrial(src) + if(prob(50)) + new /obj/item/weapon/storage/backpack/industrial(src) + else + new /obj/item/weapon/storage/backpack/satchel_eng(src) new /obj/item/device/radio/headset/headset_mine(src) new /obj/item/clothing/under/rank/miner(src) new /obj/item/clothing/gloves/black(src) diff --git a/icons/mob/back.dmi b/icons/mob/back.dmi index 63e5140bd4f..2140ad46ff4 100644 Binary files a/icons/mob/back.dmi and b/icons/mob/back.dmi differ diff --git a/icons/mob/human_face.dmi b/icons/mob/human_face.dmi index f6897fab536..611f550db9c 100644 Binary files a/icons/mob/human_face.dmi and b/icons/mob/human_face.dmi differ diff --git a/maps/tgstation.2.0.9.dmm b/maps/tgstation.2.0.9.dmm index 6c5bf97b98e..7ee2ea4a53b 100644 --- a/maps/tgstation.2.0.9.dmm +++ b/maps/tgstation.2.0.9.dmm @@ -7014,7 +7014,7 @@ "cET" = (/obj/machinery/librarycomp,/obj/structure/table/woodentable,/turf/unsimulated/floor{dir = 8; icon_state = "wood"},/area/wizard_station) "cEU" = (/obj/machinery/vending/magivend,/turf/unsimulated/floor{dir = 8; icon_state = "wood"},/area/wizard_station) "cEV" = (/obj/machinery/vending/snack,/turf/unsimulated/floor{dir = 8; icon_state = "wood"},/area/wizard_station) -"cEW" = (/obj/structure/closet{icon_closed = "cabinet_closed"; icon_opened = "cabinet_open"; icon_state = "cabinet_closed"},/turf/unsimulated/floor{dir = 9; icon_state = "carpetside"},/area/wizard_station) +"cEW" = (/obj/structure/closet{icon_closed = "cabinet_closed"; icon_opened = "cabinet_open"; icon_state = "cabinet_closed"},/obj/item/weapon/storage/backpack/satchel,/turf/unsimulated/floor{dir = 9; icon_state = "carpetside"},/area/wizard_station) "cEX" = (/obj/structure/mirror{pixel_y = 28},/turf/unsimulated/floor{dir = 1; icon_state = "carpetside"},/area/wizard_station) "cEY" = (/obj/structure/stool/bed,/obj/item/weapon/bedsheet/rd,/turf/unsimulated/floor{dir = 5; icon_state = "carpetside"},/area/wizard_station) "cEZ" = (/turf/unsimulated/floor{dir = 8; icon_state = "carpetside"},/area/wizard_station)