diff --git a/code/game/objects/items/devices/radio/radiopack.dm b/code/game/objects/items/devices/radio/radiopack.dm index 010ed4935a..b48862ad17 100644 --- a/code/game/objects/items/devices/radio/radiopack.dm +++ b/code/game/objects/items/devices/radio/radiopack.dm @@ -2,7 +2,7 @@ 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/device_vr.dmi' // VOREStation Edit - icon_override = 'icons/inventory/back/mob_vr.dmi' // VOREStation Edit + icon_override = 'icons/inventory/back/mob.dmi' icon_state = "radiopack" item_state = "radiopack" slot_flags = SLOT_BACK diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm index de9a03cbbb..cc6c4ff34b 100644 --- a/code/game/objects/items/weapons/storage/backpack.dm +++ b/code/game/objects/items/weapons/storage/backpack.dm @@ -8,7 +8,8 @@ icon = 'icons/inventory/back/item.dmi' icon_state = "backpack" sprite_sheets = list( - SPECIES_TESHARI = 'icons/inventory/back/mob_teshari.dmi' + SPECIES_TESHARI = 'icons/inventory/back/mob_teshari.dmi', + SPECIES_WEREBEAST = 'icons/inventory/back/mob_werebeast.dmi' ) w_class = ITEMSIZE_LARGE slot_flags = SLOT_BACK @@ -351,6 +352,7 @@ name = "emergency response team backpack" desc = "A spacious backpack with lots of pockets, used by members of the Emergency Response Team." icon_state = "ert_commander" + max_storage_space = INVENTORY_DUFFLEBAG_SPACE //Commander /obj/item/storage/backpack/ert/commander @@ -563,3 +565,164 @@ Unlike the show claims, it is not a phoron-enhanced satchel of holding with plot-relevant content." icon = 'icons/obj/clothing/ranger.dmi' icon_state = "ranger_satchel" + +//Virgo-added items + +/obj/item/storage/backpack/saddlebag + name = "Horse Saddlebags" + desc = "A saddle that holds items. Seems slightly bulky." + item_state = "saddlebag" + icon_state = "saddlebag" + max_storage_space = INVENTORY_DUFFLEBAG_SPACE //Saddlebags can hold more, like dufflebags + slowdown = 0.5 //And are slower, too... + var/taurtype = /datum/sprite_accessory/tail/taur/horse //Acceptable taur type to be wearing this + var/no_message = "You aren't the appropriate taur type to wear this!" + +/obj/item/storage/backpack/saddlebag/mob_can_equip(var/mob/living/carbon/human/H, slot, disable_warning = 0) + if(..()) + if(istype(H) && istype(H.tail_style, taurtype)) + return 1 + else + to_chat(H, span_warning("[no_message]")) + return 0 + +/* If anyone wants to make some... this is how you would. +/obj/item/storage/backpack/saddlebag/spider + name = "Drider Saddlebags" + item_state = "saddlebag_drider" + icon_state = "saddlebag_drider" + var/taurtype = /datum/sprite_accessory/tail/taur/spider +*/ + +/obj/item/storage/backpack/saddlebag_common //Shared bag for other taurs with sturdy backs + name = "Taur Saddlebags" + desc = "A saddle that holds items. Seems slightly bulky." + item_state = "saddlebag" + icon_state = "saddlebag" + var/icon_base = "saddlebag" + max_storage_space = INVENTORY_DUFFLEBAG_SPACE //Saddlebags can hold more, like dufflebags + slowdown = 0.5 //And are slower, too... + var/no_message = "You aren't the appropriate taur type to wear this!" + +/obj/item/storage/backpack/saddlebag_common/mob_can_equip(var/mob/living/carbon/human/H, slot, disable_warning = 0) + if(..()) + if(!istype(H))//Error, non HUMAN. + log_runtime("[H] was not a valid human!") + return + + var/datum/sprite_accessory/tail/taur/TT = H.tail_style + if(istype(TT)) + item_state = "[icon_base]_[TT.icon_sprite_tag]" //icon_sprite_tag is something like "deer" + return 1 + + + +/obj/item/storage/backpack/saddlebag_common/robust //Shared bag for other taurs with sturdy backs + name = "Robust Saddlebags" + desc = "A saddle that holds items. Seems robust." + item_state = "robustsaddle" + icon_state = "robustsaddle" + icon_base = "robustsaddle" + +/obj/item/storage/backpack/saddlebag_common/vest //Shared bag for other taurs with sturdy backs + name = "Taur Duty Vest" + desc = "An armored vest with the armor modules replaced with various handy compartments with decent storage capacity. Useless for protection though. Holds less than a saddle." + item_state = "taurvest" + icon_state = "taurvest" + icon_base = "taurvest" + max_storage_space = INVENTORY_STANDARD_SPACE + slowdown = 0 + +/obj/item/storage/backpack/dufflebag/fluff //Black dufflebag without syndie buffs. + name = "plain black dufflebag" + desc = "A large dufflebag for holding extra tactical supplies." + icon_state = "duffle_syndie" + +///Exploration Bags/// + +/obj/item/storage/backpack/explorer + name = "exploration backpack" + desc = "A backpack for carrying a large number of supplies easily." + icon_state = "explorer" + +/obj/item/storage/backpack/satchel/explorer + name = "exploration satchel" + desc = "A satchel for carrying a large number of supplies easily." + icon_state = "explorer_satchel" + item_state_slots = null + +/obj/item/storage/backpack/messenger/explorer + name = "exploration messenger bag" + desc = "A sturdy backpack worn over one shoulder." + icon_state = "explorer_courier" + item_state_slots = null + +/obj/item/storage/backpack/dufflebag/explorer + name = "exploration dufflebag" + desc = "A large dufflebag for holding extra supplies." + icon_state = "explorer_duffle" + +///Talon Bags/// + +/obj/item/storage/backpack/talon + name = "Talon backpack" + desc = "A backpack for carrying a large number of supplies easily." + icon_state = "talon" + +/obj/item/storage/backpack/satchel/talon + name = "Talon satchel" + desc = "A satchel for carrying a large number of supplies easily." + icon_state = "talon_satchel" + item_state_slots = null + +/obj/item/storage/backpack/messenger/talon + name = "Talon messenger bag" + desc = "A sturdy backpack worn over one shoulder." + icon_state = "talon_courier" + item_state_slots = null + +/obj/item/storage/backpack/dufflebag/talon + name = "Talon dufflebag" + desc = "A large dufflebag for holding extra supplies." + icon_state = "talon_duffle" + +///Roboticist Bags/// + +/obj/item/storage/backpack/satchel/roboticist + name = "roboticist satchel" + desc = "A satchel for carrying a large number of spare parts easily." + item_state = "satchel-robo" + icon_state = "satchel-robo" + +/obj/item/storage/backpack/roboticist + name = "roboticist backpack" + desc = "A backpack for carrying a large number of spare parts easily." + item_state = "backpack-robo" + icon_state = "backpack-robo" + +///Vintage Military Bags/// + +/obj/item/storage/backpack/vietnam + name = "vietnam backpack" + desc = "There are tangos in the trees! We need napalm right now! Why is my gun jammed?" + item_state = "nambackpack" + icon_state = "nambackpack" + +/obj/item/storage/backpack/russian + name = "russian backpack" + desc = "Useful for carrying large quantities of vodka." + item_state = "ru_rucksack" + icon_state = "ru_rucksack" + +/obj/item/storage/backpack/korean + name = "korean backpack" + desc = "Insert witty description here." + item_state = "kr_rucksack" + icon_state = "kr_rucksack" + +//strapless +/obj/item/storage/backpack/satchel/strapless + name = "strapless satchel" + desc = "A satchel for carrying a large number of supplies easily. Without Straps" + icon_state = "satchel_strapless" + item_state_slots = null diff --git a/code/game/objects/items/weapons/storage/backpack_vr.dm b/code/game/objects/items/weapons/storage/backpack_vr.dm deleted file mode 100644 index 9b089e106e..0000000000 --- a/code/game/objects/items/weapons/storage/backpack_vr.dm +++ /dev/null @@ -1,203 +0,0 @@ -/obj/item/storage/backpack/saddlebag - name = "Horse Saddlebags" - desc = "A saddle that holds items. Seems slightly bulky." - icon = 'icons/inventory/back/item_vr.dmi' - icon_override = 'icons/inventory/back/mob_vr.dmi' - item_state = "saddlebag" - icon_state = "saddlebag" - max_storage_space = INVENTORY_DUFFLEBAG_SPACE //Saddlebags can hold more, like dufflebags - slowdown = 0.5 //And are slower, too... - var/taurtype = /datum/sprite_accessory/tail/taur/horse //Acceptable taur type to be wearing this - var/no_message = "You aren't the appropriate taur type to wear this!" - -/obj/item/storage/backpack/saddlebag/mob_can_equip(var/mob/living/carbon/human/H, slot, disable_warning = 0) - if(..()) - if(istype(H) && istype(H.tail_style, taurtype)) - return 1 - else - to_chat(H, span_warning("[no_message]")) - return 0 - -/* If anyone wants to make some... this is how you would. -/obj/item/storage/backpack/saddlebag/spider - name = "Drider Saddlebags" - item_state = "saddlebag_drider" - icon_state = "saddlebag_drider" - var/taurtype = /datum/sprite_accessory/tail/taur/spider -*/ - -/obj/item/storage/backpack/saddlebag_common //Shared bag for other taurs with sturdy backs - name = "Taur Saddlebags" - desc = "A saddle that holds items. Seems slightly bulky." - icon = 'icons/inventory/back/item_vr.dmi' - icon_override = 'icons/inventory/back/mob_vr.dmi' - item_state = "saddlebag" - icon_state = "saddlebag" - var/icon_base = "saddlebag" - max_storage_space = INVENTORY_DUFFLEBAG_SPACE //Saddlebags can hold more, like dufflebags - slowdown = 0.5 //And are slower, too... - var/no_message = "You aren't the appropriate taur type to wear this!" - -/obj/item/storage/backpack/saddlebag_common/mob_can_equip(var/mob/living/carbon/human/H, slot, disable_warning = 0) - if(..()) - if(!istype(H))//Error, non HUMAN. - log_runtime("[H] was not a valid human!") - return - - var/datum/sprite_accessory/tail/taur/TT = H.tail_style - if(istype(TT)) - item_state = "[icon_base]_[TT.icon_sprite_tag]" //icon_sprite_tag is something like "deer" - return 1 - - - -/obj/item/storage/backpack/saddlebag_common/robust //Shared bag for other taurs with sturdy backs - name = "Robust Saddlebags" - desc = "A saddle that holds items. Seems robust." - icon = 'icons/inventory/back/item_vr.dmi' - icon_override = 'icons/inventory/back/mob_vr.dmi' - item_state = "robustsaddle" - icon_state = "robustsaddle" - icon_base = "robustsaddle" - -/obj/item/storage/backpack/saddlebag_common/vest //Shared bag for other taurs with sturdy backs - name = "Taur Duty Vest" - desc = "An armored vest with the armor modules replaced with various handy compartments with decent storage capacity. Useless for protection though. Holds less than a saddle." - icon = 'icons/inventory/back/item_vr.dmi' - icon_override = 'icons/inventory/back/mob_vr.dmi' - item_state = "taurvest" - icon_state = "taurvest" - icon_base = "taurvest" - max_storage_space = INVENTORY_STANDARD_SPACE - slowdown = 0 - -/obj/item/storage/backpack/dufflebag/fluff //Black dufflebag without syndie buffs. - name = "plain black dufflebag" - desc = "A large dufflebag for holding extra tactical supplies." - icon_state = "duffle_syndie" - -/obj/item/storage/backpack - sprite_sheets = list( - SPECIES_TESHARI = 'icons/inventory/back/mob_teshari.dmi', - SPECIES_WEREBEAST = 'icons/inventory/back/mob_vr_werebeast.dmi') - -/obj/item/storage/backpack/ert - max_storage_space = INVENTORY_DUFFLEBAG_SPACE - -///Exploration Bags/// - -/obj/item/storage/backpack/explorer - name = "exploration backpack" - desc = "A backpack for carrying a large number of supplies easily." - icon = 'icons/inventory/back/item_vr.dmi' - icon_override = 'icons/inventory/back/mob_vr.dmi' - icon_state = "explorer" - -/obj/item/storage/backpack/satchel/explorer - name = "exploration satchel" - desc = "A satchel for carrying a large number of supplies easily." - icon = 'icons/inventory/back/item_vr.dmi' - icon_override = 'icons/inventory/back/mob_vr.dmi' - icon_state = "explorer_satchel" - item_state_slots = null - -/obj/item/storage/backpack/messenger/explorer - name = "exploration messenger bag" - desc = "A sturdy backpack worn over one shoulder." - icon = 'icons/inventory/back/item_vr.dmi' - icon_override = 'icons/inventory/back/mob_vr.dmi' - icon_state = "explorer_courier" - item_state_slots = null - -/obj/item/storage/backpack/dufflebag/explorer - name = "exploration dufflebag" - desc = "A large dufflebag for holding extra supplies." - icon = 'icons/inventory/back/item_vr.dmi' - icon_override = 'icons/inventory/back/mob_vr.dmi' - icon_state = "explorer_duffle" - -///Talon Bags/// - -/obj/item/storage/backpack/talon - name = "Talon backpack" - desc = "A backpack for carrying a large number of supplies easily." - icon = 'icons/inventory/back/item_vr.dmi' - icon_override = 'icons/inventory/back/mob_vr.dmi' - icon_state = "talon" - -/obj/item/storage/backpack/satchel/talon - name = "Talon satchel" - desc = "A satchel for carrying a large number of supplies easily." - icon = 'icons/inventory/back/item_vr.dmi' - icon_override = 'icons/inventory/back/mob_vr.dmi' - icon_state = "talon_satchel" - item_state_slots = null - -/obj/item/storage/backpack/messenger/talon - name = "Talon messenger bag" - desc = "A sturdy backpack worn over one shoulder." - icon = 'icons/inventory/back/item_vr.dmi' - icon_override = 'icons/inventory/back/mob_vr.dmi' - icon_state = "talon_courier" - item_state_slots = null - -/obj/item/storage/backpack/dufflebag/talon - name = "Talon dufflebag" - desc = "A large dufflebag for holding extra supplies." - icon = 'icons/inventory/back/item_vr.dmi' - icon_override = 'icons/inventory/back/mob_vr.dmi' - icon_state = "talon_duffle" - -///Roboticist Bags/// - -/obj/item/storage/backpack/satchel/roboticist - name = "roboticist satchel" - desc = "A satchel for carrying a large number of spare parts easily." - icon = 'icons/inventory/back/item_vr.dmi' - icon_override = 'icons/inventory/back/mob_vr.dmi' - item_state = "satchel-robo" - icon_state = "satchel-robo" - -/obj/item/storage/backpack/roboticist - name = "roboticist backpack" - desc = "A backpack for carrying a large number of spare parts easily." - icon = 'icons/inventory/back/item_vr.dmi' - icon_override = 'icons/inventory/back/mob_vr.dmi' - item_state = "backpack-robo" - icon_state = "backpack-robo" - -///Vintage Military Bags/// - -/obj/item/storage/backpack/vietnam - name = "vietnam backpack" - desc = "There are tangos in the trees! We need napalm right now! Why is my gun jammed?" - icon = 'icons/inventory/back/item_vr.dmi' - icon_override = 'icons/inventory/back/mob_vr.dmi' - item_state = "nambackpack" - icon_state = "nambackpack" - -/obj/item/storage/backpack/russian - name = "russian backpack" - desc = "Useful for carrying large quantities of vodka." - icon = 'icons/inventory/back/item_vr.dmi' - icon_override = 'icons/inventory/back/mob_vr.dmi' - item_state = "ru_rucksack" - icon_state = "ru_rucksack" - -/obj/item/storage/backpack/korean - name = "korean backpack" - desc = "Insert witty description here." - icon = 'icons/inventory/back/item_vr.dmi' - icon_override = 'icons/inventory/back/mob_vr.dmi' - item_state = "kr_rucksack" - icon_state = "kr_rucksack" - - -//strapless -/obj/item/storage/backpack/satchel/strapless - name = "strapless satchel" - desc = "A satchel for carrying a large number of supplies easily. Without Straps" - icon = 'icons/inventory/back/item_vr.dmi' - icon_override = 'icons/inventory/back/mob_vr.dmi' - icon_state = "satchel_strapless" - item_state_slots = null diff --git a/code/game/objects/items/weapons/storage/bags.dm b/code/game/objects/items/weapons/storage/bags.dm index 324e681ea4..332e481b1a 100644 --- a/code/game/objects/items/weapons/storage/bags.dm +++ b/code/game/objects/items/weapons/storage/bags.dm @@ -448,7 +448,8 @@ max_storage_space = 200 w_class = ITEMSIZE_LARGE slowdown = 1 //you probably shouldn't be running with chemicals - can_hold = list(/obj/item/reagent_containers/pill,/obj/item/reagent_containers/glass/beaker,/obj/item/reagent_containers/glass/bottle, /obj/item/reagent_containers/hypospray/autoinjector/) // CHOMPEdit - Adds autoinjectors to the bag + can_hold = list(/obj/item/reagent_containers/pill,/obj/item/reagent_containers/glass/beaker,/obj/item/reagent_containers/glass/bottle, /obj/item/reagent_containers/hypospray/autoinjector) + slot_flags = null // ----------------------------- // Xeno Bag diff --git a/code/game/objects/items/weapons/storage/bags_vr.dm b/code/game/objects/items/weapons/storage/bags_vr.dm deleted file mode 100644 index 0f6368f9ac..0000000000 --- a/code/game/objects/items/weapons/storage/bags_vr.dm +++ /dev/null @@ -1,2 +0,0 @@ -/obj/item/storage/bag/chemistry - slot_flags = null diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm index f93821bf66..1f275e5b62 100644 --- a/code/game/objects/items/weapons/storage/belt.dm +++ b/code/game/objects/items/weapons/storage/belt.dm @@ -11,7 +11,10 @@ equip_sound = 'sound/items/toolbelt_equip.ogg' drop_sound = 'sound/items/drop/toolbelt.ogg' pickup_sound = 'sound/items/pickup/toolbelt.ogg' - sprite_sheets = list(SPECIES_TESHARI = 'icons/inventory/belt/mob_teshari.dmi') + sprite_sheets = list( + SPECIES_TESHARI = 'icons/inventory/belt/mob_teshari.dmi', + SPECIES_WEREBEAST = 'icons/inventory/belt/mob_werebeast.dmi' + ) var/show_above_suit = 0 @@ -75,13 +78,13 @@ /obj/item/extinguisher/mini, /obj/item/tape_roll, /obj/item/integrated_electronics/wirer, - /obj/item/pipe_dispenser, //CHOMPAdd - /obj/item/holosign_creator/combifan, //CHOMPAdd - /obj/item/rcd, //CHOMPAdd - /obj/item/integrated_electronics/debugger, //Vorestation edit adding debugger to toolbelt can hold list - /obj/item/shovel/spade, //VOREStation edit. If it can hold minihoes and hatchers, why not the gardening spade? - /obj/item/stack/nanopaste, //VOREStation edit. Think of it as a tube of superglue. Belts hold that all the time. - /obj/item/geiger //VOREStation edit. Engineers work with rad-slinging stuff sometimes too + /obj/item/pipe_dispenser, + /obj/item/holosign_creator/combifan, + /obj/item/rcd, + /obj/item/integrated_electronics/debugger, + /obj/item/shovel/spade, + /obj/item/stack/nanopaste, + /obj/item/geiger ) /obj/item/storage/belt/utility/full @@ -604,3 +607,177 @@ can_hold = list( /obj/item/ammo_casing/afoam_dart ) + +/obj/item/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 = "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 + can_hold = list( + /obj/item/grenade, + /obj/item/tool, + /obj/item/weldingtool, + /obj/item/pickaxe, + /obj/item/multitool, + /obj/item/stack/cable_coil, + /obj/item/analyzer, + /obj/item/flashlight, + /obj/item/cell, + /obj/item/gun, + /obj/item/material, + /obj/item/melee, + /obj/item/shield, + /obj/item/ammo_casing, + /obj/item/ammo_magazine, + /obj/item/healthanalyzer, + /obj/item/robotanalyzer, + /obj/item/reagent_containers/glass/beaker, + /obj/item/reagent_containers/glass/bottle, + /obj/item/storage/pill_bottle, + /obj/item/stack/medical, + /obj/item/stack/marker_beacon, + /obj/item/extinguisher/mini, + /obj/item/storage/quickdraw/syringe_case, + /obj/item/photo, + /obj/item/camera_film, + /obj/item/camera, + /obj/item/taperecorder, + /obj/item/tape, + /obj/item/geiger, + /obj/item/gps, + /obj/item/ano_scanner, + /obj/item/cataloguer, + /obj/item/radio, + /obj/item/mapping_unit, + /obj/item/binoculars, + /obj/item/kinetic_crusher, + /obj/item/analyzer, + /obj/item/storage/sample_container + ) + +/obj/item/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_state = "pathfinder_belt" + item_state = "pathfinder_belt" + storage_slots = 7 //two more, bringing it on par with normal belts + max_storage_space = ITEMSIZE_COST_NORMAL * 7 + +/obj/item/storage/belt/miner + name = "mining belt" + desc = "A versatile and durable looking belt with several pouches and straps. It can hold a very wide variety of items that any typical miner might need out in the deep." + icon_state = "mining" + item_state = "mining" + storage_slots = 6 + max_w_class = ITEMSIZE_LARGE + max_storage_space = ITEMSIZE_COST_NORMAL * 6 + can_hold = list( + /obj/item/fulton_core, + /obj/item/extraction_pack, + /obj/item/resonator, + /obj/item/stack/marker_beacon, + /obj/item/stack/flag, + /obj/item/modular_computer/tablet, + /obj/item/clothing/glasses, + /obj/item/clothing/shoes/bhop, + /obj/item/multitool, + /obj/item/core_sampler, + /obj/item/beacon_locator, + /obj/item/radio, + /obj/item/measuring_tape, + /obj/item/flashlight, + /obj/item/depth_scanner, + /obj/item/camera, + /obj/item/ano_scanner, + /obj/item/xenoarch_multi_tool, + /obj/item/geiger, + /obj/item/gps, + /obj/item/laser_pointer, + /obj/item/survivalcapsule, + /obj/item/perfect_tele/one_beacon, + /obj/item/binoculars, + /obj/item/storage/box/samplebags, + /obj/item/cell/device, + /obj/item/pickaxe, + /obj/item/shovel, + /obj/item/paper, + /obj/item/photo, + /obj/item/folder, + /obj/item/pen, + /obj/item/folder, + /obj/item/clipboard, + /obj/item/anodevice, + /obj/item/tool/wrench, + /obj/item/tool/screwdriver, + /obj/item/tool/transforming/powerdrill, + /obj/item/storage/excavation, + /obj/item/anobattery, + /obj/item/reagent_containers/hypospray/autoinjector, + /obj/item/plastique/seismic/locked, + /obj/item/gun/magnetic/matfed/phoronbore, + /obj/item/storage/bag/sheetsnatcher, + /obj/item/melee, + /obj/item/kinetic_crusher, + /obj/item/mining_scanner, + /obj/item/storage/bag/ore, + /obj/item/storage/sample_container + ) + //Pretty much, if it's in the mining vendor, they should be able to put it on the belt. + +/obj/item/storage/belt/archaeology + can_hold = list( + /obj/item/stack/marker_beacon, + /obj/item/clothing/glasses, + /obj/item/storage/box/samplebags, + /obj/item/xenoarch_multi_tool, + /obj/item/core_sampler, + /obj/item/beacon_locator, + /obj/item/radio/beacon, + /obj/item/gps, + /obj/item/measuring_tape, + /obj/item/flashlight, + /obj/item/depth_scanner, + /obj/item/camera, + /obj/item/ano_scanner, + /obj/item/geiger, + /obj/item/cell/device, + /obj/item/pickaxe, + /obj/item/paper, + /obj/item/photo, + /obj/item/folder, + /obj/item/pen, + /obj/item/folder, + /obj/item/clipboard, + /obj/item/anodevice, + /obj/item/tool/wrench, + /obj/item/tool/transforming/powerdrill, + /obj/item/multitool, + /obj/item/storage/excavation, + /obj/item/anobattery, + /obj/item/pickaxe + ) + +/obj/item/storage/belt/hydro + name = "hydroponics belt" + desc = "A belt used to hold most hydroponics supplies. Suprisingly, not green." + icon_state = "plantbelt" + item_state = "plantbelt" + storage_slots = 5 + max_w_class = ITEMSIZE_LARGE + max_storage_space = ITEMSIZE_COST_NORMAL * 5 + can_hold = list( + /obj/item/analyzer/plant_analyzer, + /obj/item/reagent_containers/glass/beaker, + /obj/item/reagent_containers/glass/bottle, + /obj/item/shovel/spade, + /obj/item/tool/wirecutters, + /obj/item/material/minihoe, + /obj/item/material/knife/machete/hatchet, + /obj/item/reagent_containers/spray/plantbgone, + /obj/item/plantspray, + /obj/item/gun/energy/floragun, + /obj/item/seeds + ) diff --git a/code/game/objects/items/weapons/storage/belt_vr.dm b/code/game/objects/items/weapons/storage/belt_vr.dm deleted file mode 100644 index 758fba4f9e..0000000000 --- a/code/game/objects/items/weapons/storage/belt_vr.dm +++ /dev/null @@ -1,184 +0,0 @@ -/obj/item/storage/belt - sprite_sheets = list( - SPECIES_TESHARI = 'icons/inventory/belt/mob_teshari.dmi', - SPECIES_WEREBEAST = 'icons/inventory/belt/mob_vr_werebeast.dmi') - -/obj/item/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 = 'icons/inventory/belt/item_vr.dmi' - icon_override = 'icons/inventory/belt/mob_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 - can_hold = list( - /obj/item/grenade, - /obj/item/tool, - /obj/item/weldingtool, - /obj/item/pickaxe, - /obj/item/multitool, - /obj/item/stack/cable_coil, - /obj/item/analyzer, - /obj/item/flashlight, - /obj/item/cell, - /obj/item/gun, - /obj/item/material, - /obj/item/melee, - /obj/item/shield, - /obj/item/ammo_casing, - /obj/item/ammo_magazine, - /obj/item/healthanalyzer, - /obj/item/robotanalyzer, - /obj/item/reagent_containers/glass/beaker, - /obj/item/reagent_containers/glass/bottle, - /obj/item/storage/pill_bottle, - /obj/item/stack/medical, - /obj/item/stack/marker_beacon, - /obj/item/extinguisher/mini, - /obj/item/storage/quickdraw/syringe_case, - /obj/item/photo, - /obj/item/camera_film, - /obj/item/camera, - /obj/item/taperecorder, - /obj/item/tape, - /obj/item/geiger, - /obj/item/gps, - /obj/item/ano_scanner, - /obj/item/cataloguer, - /obj/item/radio, - /obj/item/mapping_unit, - /obj/item/binoculars, //CHOMPADD - /obj/item/kinetic_crusher, - /obj/item/analyzer, - /obj/item/storage/sample_container - ) - -/obj/item/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/inventory/belt/item_vr.dmi' - icon_state = "pathfinder_belt" - item_state = "pathfinder_belt" - storage_slots = 7 //two more, bringing it on par with normal belts - max_storage_space = ITEMSIZE_COST_NORMAL * 7 - -/obj/item/storage/belt/miner - name = "mining belt" - desc = "A versatile and durable looking belt with several pouches and straps. It can hold a very wide variety of items that any typical miner might need out in the deep." - icon = 'icons/inventory/belt/item_vr.dmi' - icon_state = "mining" - item_state = "mining" - storage_slots = 6 - max_w_class = ITEMSIZE_LARGE - max_storage_space = ITEMSIZE_COST_NORMAL * 6 - can_hold = list( - /obj/item/fulton_core, - /obj/item/extraction_pack, - /obj/item/resonator, - /obj/item/stack/marker_beacon, - /obj/item/stack/flag, - /obj/item/modular_computer/tablet, - /obj/item/clothing/glasses, - /obj/item/clothing/shoes/bhop, - /obj/item/multitool, - /obj/item/core_sampler, - /obj/item/beacon_locator, - /obj/item/radio, - /obj/item/measuring_tape, - /obj/item/flashlight, - /obj/item/depth_scanner, - /obj/item/camera, - /obj/item/ano_scanner, - /obj/item/xenoarch_multi_tool, - /obj/item/geiger, - /obj/item/gps, - /obj/item/laser_pointer, - /obj/item/survivalcapsule, - /obj/item/perfect_tele/one_beacon, - /obj/item/binoculars, - /obj/item/storage/box/samplebags, - /obj/item/cell/device, - /obj/item/pickaxe, - /obj/item/shovel, - /obj/item/paper, - /obj/item/photo, - /obj/item/folder, - /obj/item/pen, - /obj/item/folder, - /obj/item/clipboard, - /obj/item/anodevice, - /obj/item/tool/wrench, - /obj/item/tool/screwdriver, - /obj/item/tool/transforming/powerdrill, - /obj/item/storage/excavation, - /obj/item/anobattery, - /obj/item/reagent_containers/hypospray/autoinjector, - /obj/item/plastique/seismic/locked, - /obj/item/gun/magnetic/matfed/phoronbore, - /obj/item/storage/bag/sheetsnatcher, - /obj/item/melee, - /obj/item/kinetic_crusher, - /obj/item/mining_scanner, - /obj/item/storage/bag/ore, - /obj/item/storage/sample_container - ) - //Pretty much, if it's in the mining vendor, they should be able to put it on the belt. - -/obj/item/storage/belt/archaeology - can_hold = list( - /obj/item/stack/marker_beacon, - /obj/item/clothing/glasses, - /obj/item/storage/box/samplebags, - /obj/item/xenoarch_multi_tool, - /obj/item/core_sampler, - /obj/item/beacon_locator, - /obj/item/radio/beacon, - /obj/item/gps, - /obj/item/measuring_tape, - /obj/item/flashlight, - /obj/item/depth_scanner, - /obj/item/camera, - /obj/item/ano_scanner, - /obj/item/geiger, - /obj/item/cell/device, - /obj/item/pickaxe, - /obj/item/paper, - /obj/item/photo, - /obj/item/folder, - /obj/item/pen, - /obj/item/folder, - /obj/item/clipboard, - /obj/item/anodevice, - /obj/item/tool/wrench, - /obj/item/tool/transforming/powerdrill, - /obj/item/multitool, - /obj/item/storage/excavation, - /obj/item/anobattery, - /obj/item/pickaxe - ) - -/obj/item/storage/belt/hydro - name = "hydroponics belt" - desc = "A belt used to hold most hydroponics supplies. Suprisingly, not green." - icon = 'icons/inventory/belt/item_vr.dmi' - icon_override = 'icons/inventory/belt/mob_vr.dmi' - icon_state = "plantbelt" - item_state = "plantbelt" - storage_slots = 5 - max_w_class = ITEMSIZE_LARGE - max_storage_space = ITEMSIZE_COST_NORMAL * 5 - can_hold = list( - /obj/item/analyzer/plant_analyzer, - /obj/item/reagent_containers/glass/beaker, - /obj/item/reagent_containers/glass/bottle, - /obj/item/shovel/spade, - /obj/item/tool/wirecutters, - /obj/item/material/minihoe, - /obj/item/material/knife/machete/hatchet, - /obj/item/reagent_containers/spray/plantbgone, - /obj/item/plantspray, - /obj/item/gun/energy/floragun, - /obj/item/seeds - ) diff --git a/code/game/objects/items/weapons/tanks/tank_types_vr.dm b/code/game/objects/items/weapons/tanks/tank_types_vr.dm index 17a839b34f..425181eb00 100644 --- a/code/game/objects/items/weapons/tanks/tank_types_vr.dm +++ b/code/game/objects/items/weapons/tanks/tank_types_vr.dm @@ -2,7 +2,7 @@ name = "double emergency phoron tank" desc = "Contains dangerous phoron. Do not inhale. Warning: extremely flammable." icon = 'icons/obj/tank_vr.dmi' - icon_override = 'icons/inventory/belt/mob_vr.dmi' + icon_override = 'icons/inventory/belt/mob.dmi' icon_state = "emergency_double_vox" gauge_icon = "indicator_double" gauge_cap = 3 @@ -39,7 +39,6 @@ /obj/item/tank/vox //Can't be a child of phoron or the gas amount gets screwey. icon = 'icons/obj/tank_vr.dmi' - icon_override = 'icons/inventory/back/mob_vr.dmi' icon_state = "phoron_vox" gauge_cap = 3 gauge_icon = "indicator_double" @@ -84,7 +83,6 @@ /obj/item/tank/emergency/phoron icon = 'icons/obj/tank_vr.dmi' - icon_override = 'icons/inventory/belt/mob_vr.dmi' icon_state = "emergency_phoron_vox" gauge_icon = "indicator_smalltank" volume = 6 diff --git a/code/modules/projectiles/guns/energy/gunsword_vr.dm b/code/modules/projectiles/guns/energy/gunsword_vr.dm index f5bc27357c..a0091145e7 100644 --- a/code/modules/projectiles/guns/energy/gunsword_vr.dm +++ b/code/modules/projectiles/guns/energy/gunsword_vr.dm @@ -7,7 +7,7 @@ icon_override = 'icons/vore/custom_guns_vr.dmi' item_state = "gbuster" - item_icons = list(slot_r_hand_str = 'icons/vore/custom_guns_vr.dmi', slot_l_hand_str = 'icons/vore/custom_guns_vr.dmi', "slot_belt" = 'icons/inventory/belt/mob_vr.dmi') + item_icons = list(slot_r_hand_str = 'icons/vore/custom_guns_vr.dmi', slot_l_hand_str = 'icons/vore/custom_guns_vr.dmi', "slot_belt" = 'icons/inventory/belt/mob.dmi') w_class = ITEMSIZE_NORMAL origin_tech = list(TECH_COMBAT = 8, TECH_MATERIAL = 4) diff --git a/code/modules/projectiles/guns/energy/pump.dm b/code/modules/projectiles/guns/energy/pump.dm index 95b40e961a..5cabe8aef4 100644 --- a/code/modules/projectiles/guns/energy/pump.dm +++ b/code/modules/projectiles/guns/energy/pump.dm @@ -61,7 +61,7 @@ that can be recharged away from civilization." icon_state = "phaserkill" item_state = "phaser" - item_icons = list(slot_l_hand_str = 'icons/mob/items/lefthand_guns_vr.dmi', slot_r_hand_str = 'icons/mob/items/righthand_guns_vr.dmi', "slot_belt" = 'icons/inventory/belt/mob_vr.dmi') + item_icons = list(slot_l_hand_str = 'icons/mob/items/lefthand_guns_vr.dmi', slot_r_hand_str = 'icons/mob/items/righthand_guns_vr.dmi', "slot_belt" = 'icons/inventory/belt/mob.dmi') fire_sound = 'sound/weapons/laser2.ogg' origin_tech = list(TECH_COMBAT = 4, TECH_MAGNET = 2, TECH_POWER = 4) charge_cost = 300 diff --git a/code/modules/projectiles/guns/energy/pump_ch.dm b/code/modules/projectiles/guns/energy/pump_ch.dm index 9ec4f24cd4..b61b94e733 100644 --- a/code/modules/projectiles/guns/energy/pump_ch.dm +++ b/code/modules/projectiles/guns/energy/pump_ch.dm @@ -121,7 +121,7 @@ icon = 'icons/obj/gun_vr.dmi' icon_state = "phaserkill" item_state = "phaser" - item_icons = list(slot_l_hand_str = 'icons/mob/items/lefthand_guns_vr.dmi', slot_r_hand_str = 'icons/mob/items/righthand_guns_vr.dmi', "slot_belt" = 'icons/inventory/belt/mob_vr.dmi') + item_icons = list(slot_l_hand_str = 'icons/mob/items/lefthand_guns_vr.dmi', slot_r_hand_str = 'icons/mob/items/righthand_guns_vr.dmi', "slot_belt" = 'icons/inventory/belt/mob.dmi') fire_sound = 'sound/weapons/laser2.ogg' origin_tech = list(TECH_COMBAT = 4, TECH_MAGNET = 2, TECH_POWER = 4) charge_cost = 100 //Chompedit Reduced cost diff --git a/icons/inventory/back/item.dmi b/icons/inventory/back/item.dmi index 7cbb551d6e..a13e8f8fb0 100644 Binary files a/icons/inventory/back/item.dmi and b/icons/inventory/back/item.dmi differ diff --git a/icons/inventory/back/item_vr.dmi b/icons/inventory/back/item_vr.dmi deleted file mode 100644 index 0f6ecc5179..0000000000 Binary files a/icons/inventory/back/item_vr.dmi and /dev/null differ diff --git a/icons/inventory/back/mob.dmi b/icons/inventory/back/mob.dmi index 89df611fe6..c6d07be6c9 100644 Binary files a/icons/inventory/back/mob.dmi and b/icons/inventory/back/mob.dmi differ diff --git a/icons/inventory/back/mob_vr.dmi b/icons/inventory/back/mob_vr.dmi deleted file mode 100644 index 1957895c8c..0000000000 Binary files a/icons/inventory/back/mob_vr.dmi and /dev/null differ diff --git a/icons/inventory/back/mob_vr_werebeast.dmi b/icons/inventory/back/mob_werebeast.dmi similarity index 100% rename from icons/inventory/back/mob_vr_werebeast.dmi rename to icons/inventory/back/mob_werebeast.dmi diff --git a/icons/inventory/belt/item.dmi b/icons/inventory/belt/item.dmi index 3437eb4a46..a4ca3f6ed8 100644 Binary files a/icons/inventory/belt/item.dmi and b/icons/inventory/belt/item.dmi differ diff --git a/icons/inventory/belt/item_vr.dmi b/icons/inventory/belt/item_vr.dmi deleted file mode 100644 index 352f5e547b..0000000000 Binary files a/icons/inventory/belt/item_vr.dmi and /dev/null differ diff --git a/icons/inventory/belt/mob.dmi b/icons/inventory/belt/mob.dmi index f766fbc2d9..b2224839d0 100644 Binary files a/icons/inventory/belt/mob.dmi and b/icons/inventory/belt/mob.dmi differ diff --git a/icons/inventory/belt/mob_vr.dmi b/icons/inventory/belt/mob_vr.dmi deleted file mode 100644 index e8770be8ee..0000000000 Binary files a/icons/inventory/belt/mob_vr.dmi and /dev/null differ diff --git a/icons/inventory/belt/mob_vr_werebeast.dmi b/icons/inventory/belt/mob_werebeast.dmi similarity index 100% rename from icons/inventory/belt/mob_vr_werebeast.dmi rename to icons/inventory/belt/mob_werebeast.dmi diff --git a/vorestation.dme b/vorestation.dme index a48fcd390b..c8f511e143 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -1795,10 +1795,8 @@ #include "code\game\objects\items\weapons\melee\misc_vr.dm" #include "code\game\objects\items\weapons\melee\shock_maul.dm" #include "code\game\objects\items\weapons\storage\backpack.dm" -#include "code\game\objects\items\weapons\storage\backpack_vr.dm" #include "code\game\objects\items\weapons\storage\bags.dm" #include "code\game\objects\items\weapons\storage\belt.dm" -#include "code\game\objects\items\weapons\storage\belt_vr.dm" #include "code\game\objects\items\weapons\storage\bible.dm" #include "code\game\objects\items\weapons\storage\boxes.dm" #include "code\game\objects\items\weapons\storage\boxes_ch.dm" @@ -2141,8 +2139,8 @@ #include "code\modules\admin\verbs\smite.dm" #include "code\modules\admin\verbs\special_verbs.dm" #include "code\modules\admin\verbs\striketeam.dm" -#include "code\modules\admin\verbs\trader.dm" #include "code\modules\admin\verbs\tgui_verbs.dm" +#include "code\modules\admin\verbs\trader.dm" #include "code\modules\admin\verbs\tripAI.dm" #include "code\modules\admin\verbs\SDQL2\SDQL_2.dm" #include "code\modules\admin\verbs\SDQL2\SDQL_2_parser.dm"