diff --git a/code/modules/research/xenoarchaeology/tools/tools.dm b/code/modules/research/xenoarchaeology/tools/tools.dm index 70ce18d2abe..60eb7ca5705 100644 --- a/code/modules/research/xenoarchaeology/tools/tools.dm +++ b/code/modules/research/xenoarchaeology/tools/tools.dm @@ -8,6 +8,7 @@ icon = 'device.dmi' icon_state = "locator" item_state = "locator" + w_class = 2 /obj/item/device/gps/attack_self(var/mob/user as mob) var/turf/T = get_turf(src) @@ -18,5 +19,6 @@ desc = "A coiled metallic tape used to check dimensions and lengths." icon = 'icons/obj/xenoarchaeology.dmi' icon_state = "measuring" + w_class = 2 //todo: dig site tape diff --git a/code/modules/research/xenoarchaeology/tools/tools_depthscanner.dm b/code/modules/research/xenoarchaeology/tools/tools_depthscanner.dm index ff934222977..0eeb52d533a 100644 --- a/code/modules/research/xenoarchaeology/tools/tools_depthscanner.dm +++ b/code/modules/research/xenoarchaeology/tools/tools_depthscanner.dm @@ -22,6 +22,7 @@ var/clearance = 0 var/record_index = 1 var/dissonance_spread = 1 + var/material = "unknown" /obj/item/device/depth_scanner/proc/scan_atom(var/mob/user, var/atom/A) user.visible_message("\blue [user] scans [A], the air around them humming gently.") @@ -34,12 +35,14 @@ D.coords = "[M.x].[rand(0,9)]:[M.y].[rand(0,9)]:[10 * M.z].[rand(0,9)]" D.time = worldtime2text() D.record_index = positive_locations.len + 1 + D.material = M.mineralName //find whichever is closer: find or mineral if(M.finds.len) var/datum/find/F = M.finds[1] D.depth = F.excavation_required * 2 D.clearance = F.clearance_range * 2 + D.material = get_responsive_reagent(F.find_type) if(M.excavation_minerals.len) if(M.excavation_minerals[1] < D.depth) D.depth = M.excavation_minerals[1] diff --git a/code/modules/research/xenoarchaeology/tools/tools_pickaxe.dm b/code/modules/research/xenoarchaeology/tools/tools_pickaxe.dm index a850a1dab98..c753690ef59 100644 --- a/code/modules/research/xenoarchaeology/tools/tools_pickaxe.dm +++ b/code/modules/research/xenoarchaeology/tools/tools_pickaxe.dm @@ -109,7 +109,7 @@ item_state = "syringe_kit" foldable = /obj/item/stack/sheet/cardboard //BubbleWrap storage_slots = 8 - w_class = 4 + w_class = 3 can_hold = list("/obj/item/weapon/pickaxe/brush",\ "/obj/item/weapon/pickaxe/one_pick",\ "/obj/item/weapon/pickaxe/two_pick",\ @@ -118,7 +118,7 @@ "/obj/item/weapon/pickaxe/five_pick",\ "/obj/item/weapon/pickaxe/six_pick",\ "/obj/item/weapon/pickaxe/hand") - max_combined_w_class = 20 + max_combined_w_class = 11 max_w_class = 4 use_to_pickup = 1 // for picking up broken bulbs, not that most people will try