From 6ccaae583f1de5a9ca25f752c248a9ad95aea8eb Mon Sep 17 00:00:00 2001 From: Cael Aislinn Date: Sun, 23 Jun 2013 10:25:16 +1000 Subject: [PATCH] excavation gear belts can now hold pick sets, pick sets can no longer hold hand picks (they spawn in the locker instead), picks and measuring tapes now work much faster Signed-off-by: Cael Aislinn --- code/modules/mining/mine_turfs.dm | 2 +- code/modules/research/xenoarchaeology/misc.dm | 1 + .../xenoarchaeology/tools/gearbelt.dm | 1 + .../xenoarchaeology/tools/tools_pickaxe.dm | 24 +++++++++---------- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/code/modules/mining/mine_turfs.dm b/code/modules/mining/mine_turfs.dm index 43dbadb4c21..3197a14a834 100644 --- a/code/modules/mining/mine_turfs.dm +++ b/code/modules/mining/mine_turfs.dm @@ -311,7 +311,7 @@ commented out in r5061, I left it because of the shroom thingies if (istype(W, /obj/item/device/measuring_tape)) var/obj/item/device/measuring_tape/P = W user.visible_message("\blue[user] extends [P] towards [src].","\blue You extend [P] towards [src].") - if(do_after(user,40)) + if(do_after(user,25)) user << "\blue \icon[P] [src] has been excavated to a depth of [2*src.excavation_level]cm." return diff --git a/code/modules/research/xenoarchaeology/misc.dm b/code/modules/research/xenoarchaeology/misc.dm index fd2f506330a..72cee56e2c6 100644 --- a/code/modules/research/xenoarchaeology/misc.dm +++ b/code/modules/research/xenoarchaeology/misc.dm @@ -100,6 +100,7 @@ new /obj/item/clothing/glasses/meson(src) new /obj/item/weapon/pickaxe(src) new /obj/item/device/measuring_tape(src) + new /obj/item/weapon/pickaxe/hand(src) return //---- Isolation room air alarms diff --git a/code/modules/research/xenoarchaeology/tools/gearbelt.dm b/code/modules/research/xenoarchaeology/tools/gearbelt.dm index f86e7d3dd1c..e2d4839d2b4 100644 --- a/code/modules/research/xenoarchaeology/tools/gearbelt.dm +++ b/code/modules/research/xenoarchaeology/tools/gearbelt.dm @@ -24,4 +24,5 @@ "/obj/item/weapon/anodevice", "/obj/item/clothing/glasses", "/obj/item/weapon/wrench", + "/obj/item/weapon/storage/box/excavation", "/obj/item/weapon/anobattery") diff --git a/code/modules/research/xenoarchaeology/tools/tools_pickaxe.dm b/code/modules/research/xenoarchaeology/tools/tools_pickaxe.dm index ebb73a47d6b..31b6026981b 100644 --- a/code/modules/research/xenoarchaeology/tools/tools_pickaxe.dm +++ b/code/modules/research/xenoarchaeology/tools/tools_pickaxe.dm @@ -7,7 +7,7 @@ icon = 'icons/obj/xenoarchaeology.dmi' icon_state = "pick_brush" item_state = "syringe_0" - digspeed = 50 + digspeed = 20 desc = "Thick metallic wires for clearing away dust and loose scree (1 centimetre excavation depth)." excavation_amount = 0.5 drill_sound = 'sound/weapons/thudswoosh.ogg' @@ -19,7 +19,7 @@ icon = 'icons/obj/xenoarchaeology.dmi' icon_state = "pick1" item_state = "syringe_0" - digspeed = 50 + digspeed = 20 desc = "A miniature excavation tool for precise digging (2 centimetre excavation depth)." excavation_amount = 1 drill_sound = 'sound/items/Screwdriver.ogg' @@ -31,7 +31,7 @@ icon = 'icons/obj/xenoarchaeology.dmi' icon_state = "pick2" item_state = "syringe_0" - digspeed = 50 + digspeed = 20 desc = "A miniature excavation tool for precise digging (4 centimetre excavation depth)." excavation_amount = 2 drill_sound = 'sound/items/Screwdriver.ogg' @@ -43,7 +43,7 @@ icon = 'icons/obj/xenoarchaeology.dmi' icon_state = "pick3" item_state = "syringe_0" - digspeed = 50 + digspeed = 20 desc = "A miniature excavation tool for precise digging (6 centimetre excavation depth)." excavation_amount = 3 drill_sound = 'sound/items/Screwdriver.ogg' @@ -55,7 +55,7 @@ icon = 'icons/obj/xenoarchaeology.dmi' icon_state = "pick4" item_state = "syringe_0" - digspeed = 50 + digspeed = 20 desc = "A miniature excavation tool for precise digging (8 centimetre excavation depth)." excavation_amount = 4 drill_sound = 'sound/items/Screwdriver.ogg' @@ -67,7 +67,7 @@ icon = 'icons/obj/xenoarchaeology.dmi' icon_state = "pick5" item_state = "syringe_0" - digspeed = 50 + digspeed = 20 desc = "A miniature excavation tool for precise digging (10 centimetre excavation depth)." excavation_amount = 5 drill_sound = 'sound/items/Screwdriver.ogg' @@ -79,7 +79,7 @@ icon = 'icons/obj/xenoarchaeology.dmi' icon_state = "pick6" item_state = "syringe_0" - digspeed = 50 + digspeed = 20 desc = "A miniature excavation tool for precise digging (12 centimetre excavation depth)." excavation_amount = 6 drill_sound = 'sound/items/Screwdriver.ogg' @@ -91,7 +91,7 @@ icon = 'icons/obj/xenoarchaeology.dmi' icon_state = "pick_hand" item_state = "syringe_0" - digspeed = 50 + digspeed = 30 desc = "A smaller, more precise version of the pickaxe (30 centimetre excavation depth)." excavation_amount = 15 drill_sound = 'sound/items/Crowbar.ogg' @@ -108,16 +108,15 @@ desc = "A set of picks for excavation." item_state = "syringe_kit" foldable = /obj/item/stack/sheet/cardboard //BubbleWrap - storage_slots = 8 - w_class = 3 + storage_slots = 7 + w_class = 2 can_hold = list("/obj/item/weapon/pickaxe/brush",\ "/obj/item/weapon/pickaxe/one_pick",\ "/obj/item/weapon/pickaxe/two_pick",\ "/obj/item/weapon/pickaxe/three_pick",\ "/obj/item/weapon/pickaxe/four_pick",\ "/obj/item/weapon/pickaxe/five_pick",\ - "/obj/item/weapon/pickaxe/six_pick",\ - "/obj/item/weapon/pickaxe/hand") + "/obj/item/weapon/pickaxe/six_pick") max_combined_w_class = 17 max_w_class = 4 use_to_pickup = 1 // for picking up broken bulbs, not that most people will try @@ -131,4 +130,3 @@ new /obj/item/weapon/pickaxe/four_pick(src) new /obj/item/weapon/pickaxe/five_pick(src) new /obj/item/weapon/pickaxe/six_pick(src) - new /obj/item/weapon/pickaxe/hand(src)