diff --git a/code/datums/outfits/outfit_vr.dm b/code/datums/outfits/outfit_vr.dm index c41b5673aa..5d00d7980b 100644 --- a/code/datums/outfits/outfit_vr.dm +++ b/code/datums/outfits/outfit_vr.dm @@ -118,6 +118,9 @@ Keep outfits simple. Spawn with basic uniforms and minimal gear. Gear instead go pda_type = /obj/item/device/pda/explorer id_type = /obj/item/weapon/card/id/exploration id_pda_assignment = "Explorer" + backpack = /obj/item/weapon/storage/backpack/explorer + satchel_one = /obj/item/weapon/storage/backpack/satchel/explorer + messenger_bag = /obj/item/weapon/storage/backpack/messenger/explorer flags = OUTFIT_HAS_BACKPACK|OUTFIT_COMPREHENSIVE_SURVIVAL /decl/hierarchy/outfit/job/pilot @@ -148,6 +151,9 @@ Keep outfits simple. Spawn with basic uniforms and minimal gear. Gear instead go pda_type = /obj/item/device/pda/sar id_type = /obj/item/weapon/card/id/exploration/fm id_pda_assignment = "Field Medic" + backpack = /obj/item/weapon/storage/backpack/explorer + satchel_one = /obj/item/weapon/storage/backpack/satchel/explorer + messenger_bag = /obj/item/weapon/storage/backpack/messenger/explorer flags = OUTFIT_HAS_BACKPACK|OUTFIT_EXTENDED_SURVIVAL|OUTFIT_COMPREHENSIVE_SURVIVAL /decl/hierarchy/outfit/job/pathfinder diff --git a/code/game/objects/items/devices/radio/radiopack.dm b/code/game/objects/items/devices/radio/radiopack.dm index 5da91422ae..3bc222373f 100644 --- a/code/game/objects/items/devices/radio/radiopack.dm +++ b/code/game/objects/items/devices/radio/radiopack.dm @@ -1,7 +1,8 @@ /obj/item/device/bluespaceradio name = "bluespace radio" desc = "A powerful radio that uses a tiny bluespace wormhole to send signals directly to subspace receivers and transmitters, bypassing the limitations of subspace." - icon = 'icons/obj/radio.dmi' + icon = 'icons/obj/device_vr.dmi' // VOREStation Edit + icon_override = 'icons/mob/back_vr.dmi' // VOREStation Edit icon_state = "radiopack" item_state = "radiopack" slot_flags = SLOT_BACK @@ -99,7 +100,8 @@ name = "bluespace radio handset" desc = "A large walkie talkie attached to the bluespace radio by a retractable cord. It sits comfortably on a slot in the radio when not in use." bluespace_radio = TRUE - icon_state = "signaller" + icon = 'icons/obj/device_vr.dmi' //VOREStation Edit + icon_state = "handset" //VOREStation Edit slot_flags = null w_class = ITEMSIZE_LARGE canhear_range = 1 diff --git a/code/game/objects/items/weapons/storage/backpack_vr.dm b/code/game/objects/items/weapons/storage/backpack_vr.dm index ab83c87752..0750ef7134 100644 --- a/code/game/objects/items/weapons/storage/backpack_vr.dm +++ b/code/game/objects/items/weapons/storage/backpack_vr.dm @@ -83,21 +83,39 @@ /obj/item/weapon/storage/backpack/ert max_storage_space = INVENTORY_DUFFLEBAG_SPACE -/obj/item/weapon/storage/backpack/satchel/explorer - name = "explorer satchel" - desc = "A satchel for carrying a large number of supplies easily." - icon = 'icons/obj/clothing/backpack_vr.dmi' - icon_override = 'icons/mob/back_vr.dmi' - item_state = "satchel-explorer" - icon_state = "satchel-explorer" +///Exploration Bags/// /obj/item/weapon/storage/backpack/explorer - name = "explorer backpack" + name = "exploration backpack" desc = "A backpack for carrying a large number of supplies easily." icon = 'icons/obj/clothing/backpack_vr.dmi' icon_override = 'icons/mob/back_vr.dmi' - item_state = "explorerpack" - icon_state = "explorerpack" + icon_state = "explorer" + +/obj/item/weapon/storage/backpack/satchel/explorer + name = "exploration satchel" + desc = "A satchel for carrying a large number of supplies easily." + icon = 'icons/obj/clothing/backpack_vr.dmi' + icon_override = 'icons/mob/back_vr.dmi' + icon_state = "explorer_satchel" + item_state_slots = null + +/obj/item/weapon/storage/backpack/messenger/explorer + name = "exploration messenger bag" + desc = "A sturdy backpack worn over one shoulder." + icon = 'icons/obj/clothing/backpack_vr.dmi' + icon_override = 'icons/mob/back_vr.dmi' + icon_state = "explorer_courier" + item_state_slots = null + +/obj/item/weapon/storage/backpack/dufflebag/explorer + name = "exploration dufflebag" + desc = "A large dufflebag for holding extra supplies." + icon = 'icons/obj/clothing/backpack_vr.dmi' + icon_override = 'icons/mob/back_vr.dmi' + icon_state = "explorer_duffle" + + /obj/item/weapon/storage/backpack/satchel/roboticist name = "roboticist satchel" diff --git a/code/game/objects/items/weapons/storage/belt_vr.dm b/code/game/objects/items/weapons/storage/belt_vr.dm index defdcc296b..b07630de39 100644 --- a/code/game/objects/items/weapons/storage/belt_vr.dm +++ b/code/game/objects/items/weapons/storage/belt_vr.dm @@ -6,9 +6,10 @@ /obj/item/weapon/storage/belt/explorer name = "explorer's belt" desc = "A versatile belt with several pouches. It can hold a very wide variety of items, but less items overall than a dedicated belt. Still, it's useful for any explorer who wants to be prepared for anything they might find." - icon_state = "explorer_belt" icon = 'icons/obj/clothing/belts_vr.dmi' icon_override = 'icons/mob/belt_vr.dmi' + icon_state = "explo_belt" + item_state = "explorer_belt" storage_slots = 5 //makes it strictly inferior to any specialized belt as they have seven slots, but it's far more versatile max_w_class = ITEMSIZE_NORMAL //limits the max size of thing that can be put in, so no using it to hold five laser cannons max_storage_space = ITEMSIZE_COST_NORMAL * 5 @@ -45,11 +46,16 @@ /obj/item/device/geiger, /obj/item/device/gps, /obj/item/device/ano_scanner, - /obj/item/device/cataloguer + /obj/item/device/cataloguer, + /obj/item/device/radio, + /obj/item/device/mapping_unit ) /obj/item/weapon/storage/belt/explorer/pathfinder name = "pathfinder's belt" desc = "A deluxe belt with many pouches. It can hold a very wide variety of items, but less items overall than a dedicated belt. Still, it's useful for any explorer who wants to be prepared for anything they might find." + icon = 'icons/obj/clothing/belts_vr.dmi' + icon_state = "pathfinder_belt" + item_state = "explorer_belt" storage_slots = 7 //two more, bringing it on par with normal belts - max_storage_space = ITEMSIZE_COST_NORMAL * 7 \ No newline at end of file + max_storage_space = ITEMSIZE_COST_NORMAL * 7 diff --git a/icons/mob/back_vr.dmi b/icons/mob/back_vr.dmi index cfd5604657..823222a96f 100644 Binary files a/icons/mob/back_vr.dmi and b/icons/mob/back_vr.dmi differ diff --git a/icons/mob/belt_vr.dmi b/icons/mob/belt_vr.dmi index af2fac3242..b03d95c430 100644 Binary files a/icons/mob/belt_vr.dmi and b/icons/mob/belt_vr.dmi differ diff --git a/icons/obj/clothing/backpack_vr.dmi b/icons/obj/clothing/backpack_vr.dmi index 3a376ae8e5..d9bf6376e8 100644 Binary files a/icons/obj/clothing/backpack_vr.dmi and b/icons/obj/clothing/backpack_vr.dmi differ diff --git a/icons/obj/clothing/belts_vr.dmi b/icons/obj/clothing/belts_vr.dmi index 22791da010..d7a769224c 100644 Binary files a/icons/obj/clothing/belts_vr.dmi and b/icons/obj/clothing/belts_vr.dmi differ diff --git a/icons/obj/device_vr.dmi b/icons/obj/device_vr.dmi index d74e254079..5b3e3c040b 100644 Binary files a/icons/obj/device_vr.dmi and b/icons/obj/device_vr.dmi differ