diff --git a/code/game/objects/structures/crates_lockers/closets/secure/cargo_lockers.dm b/code/game/objects/structures/crates_lockers/closets/secure/cargo_lockers.dm index 22a66d59b2b..3333f793ce9 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/cargo_lockers.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/cargo_lockers.dm @@ -12,13 +12,57 @@ new /obj/item/clothing/head/soft/cargo(src) new /obj/item/storage/bag/mail(src) +/obj/structure/closet/wardrobe/miner + name = "mining wardrobe" + closed_door_sprite = "mixed" + +/obj/structure/closet/wardrobe/miner/populate_contents() + new /obj/item/clothing/under/rank/cargo/miner(src) + new /obj/item/clothing/under/rank/cargo/miner(src) + new /obj/item/clothing/under/rank/cargo/miner/skirt(src) + new /obj/item/clothing/under/rank/cargo/miner/skirt(src) + new /obj/item/clothing/shoes/workboots/mining(src) + new /obj/item/clothing/shoes/workboots/mining(src) + new /obj/item/clothing/gloves/color/black(src) + new /obj/item/clothing/gloves/color/black(src) + new /obj/item/clothing/suit/jacket/bomber/mining(src) + new /obj/item/clothing/suit/jacket/bomber/mining(src) + new /obj/item/clothing/suit/hooded/wintercoat/miner(src) + new /obj/item/clothing/suit/hooded/wintercoat/miner(src) + new /obj/item/clothing/head/helmet/space/plasmaman/mining(src) + new /obj/item/clothing/head/helmet/space/plasmaman/mining(src) + new /obj/item/clothing/under/plasmaman/mining(src) + new /obj/item/clothing/under/plasmaman/mining(src) + new /obj/item/storage/backpack/duffel(src) + new /obj/item/storage/backpack/explorer(src) + new /obj/item/storage/backpack/satchel/explorer(src) + +/obj/structure/closet/secure_closet/miner + name = "miner's equipment" + icon_state = "mining" + opened_door_sprite = "cargo" + req_access = list(ACCESS_MINING) + +/obj/structure/closet/secure_closet/miner/populate_contents() + new /obj/item/stack/sheet/mineral/sandbags(src, 5) + new /obj/item/storage/box/emptysandbags(src) + new /obj/item/shovel(src) + new /obj/item/pickaxe/mini(src) + new /obj/item/radio/headset/headset_cargo/mining(src) + new /obj/item/flashlight/seclite(src) + new /obj/item/storage/bag/plants(src) + new /obj/item/storage/bag/ore(src) + new /obj/item/t_scanner/adv_mining_scanner/lesser(src) + new /obj/item/gun/energy/kinetic_accelerator(src) + new /obj/item/clothing/glasses/meson(src) + new /obj/item/survivalcapsule(src) + /obj/structure/closet/secure_closet/explorer name = "explorer's locker" req_access = list(ACCESS_EXPEDITION) icon_state = "explorer" opened_door_sprite = "cargo" - /obj/structure/closet/secure_closet/explorer/populate_contents() new /obj/item/radio/headset/headset_cargo/expedition(src) new /obj/item/gun/energy/kinetic_accelerator/pistol(src) @@ -31,6 +75,7 @@ new /obj/item/storage/bag/ore(src) new /obj/item/t_scanner/adv_mining_scanner/lesser(src) new /obj/item/storage/bag/expedition(src) + new /obj/item/clothing/glasses/meson(src) /obj/structure/closet/secure_closet/smith name = "smith's locker" diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm index 8115deb7435..63469656718 100644 --- a/code/modules/mining/mine_items.dm +++ b/code/modules/mining/mine_items.dm @@ -17,53 +17,6 @@ /obj/effect/light_emitter/singularity_act() return -/**********************Miner Lockers**************************/ - -/obj/structure/closet/wardrobe/miner - name = "mining wardrobe" - closed_door_sprite = "mixed" - -/obj/structure/closet/wardrobe/miner/populate_contents() - new /obj/item/clothing/under/rank/cargo/miner(src) - new /obj/item/clothing/under/rank/cargo/miner(src) - new /obj/item/clothing/under/rank/cargo/miner/skirt(src) - new /obj/item/clothing/under/rank/cargo/miner/skirt(src) - new /obj/item/clothing/shoes/workboots/mining(src) - new /obj/item/clothing/shoes/workboots/mining(src) - new /obj/item/clothing/gloves/color/black(src) - new /obj/item/clothing/gloves/color/black(src) - new /obj/item/clothing/suit/jacket/bomber/mining(src) - new /obj/item/clothing/suit/jacket/bomber/mining(src) - new /obj/item/clothing/suit/hooded/wintercoat/miner(src) - new /obj/item/clothing/suit/hooded/wintercoat/miner(src) - new /obj/item/clothing/head/helmet/space/plasmaman/mining(src) - new /obj/item/clothing/head/helmet/space/plasmaman/mining(src) - new /obj/item/clothing/under/plasmaman/mining(src) - new /obj/item/clothing/under/plasmaman/mining(src) - new /obj/item/storage/backpack/duffel(src) - new /obj/item/storage/backpack/explorer(src) - new /obj/item/storage/backpack/satchel/explorer(src) - -/obj/structure/closet/secure_closet/miner - name = "miner's equipment" - icon_state = "mining" - opened_door_sprite = "cargo" - req_access = list(ACCESS_MINING) - -/obj/structure/closet/secure_closet/miner/populate_contents() - new /obj/item/stack/sheet/mineral/sandbags(src, 5) - new /obj/item/storage/box/emptysandbags(src) - new /obj/item/shovel(src) - new /obj/item/pickaxe/mini(src) - new /obj/item/radio/headset/headset_cargo/mining(src) - new /obj/item/flashlight/seclite(src) - new /obj/item/storage/bag/plants(src) - new /obj/item/storage/bag/ore(src) - new /obj/item/t_scanner/adv_mining_scanner/lesser(src) - new /obj/item/gun/energy/kinetic_accelerator(src) - new /obj/item/clothing/glasses/meson(src) - new /obj/item/survivalcapsule(src) - /**********************Shuttle Computer**************************/ /obj/machinery/computer/shuttle/mining