cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-02 21:44:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
This commit is contained in:
Cael Aislinn
2013-06-23 10:25:16 +10:00
parent 32ca15fdb4
commit 6ccaae583f
4 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/mining/mine_turfs.dm
View File

@@ -311,7 +311,7 @@ commented out in r5061, I left it because of the shroom thingies
if (istype(W, /obj/item/device/measuring_tape)) if (istype(W, /obj/item/device/measuring_tape))
var/obj/item/device/measuring_tape/P = W var/obj/item/device/measuring_tape/P = W
user.visible_message("\blue[user] extends [P] towards [src].","\blue You extend [P] towards [src].") 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." user << "\blue \icon[P] [src] has been excavated to a depth of [2*src.excavation_level]cm."
return return

1
code/modules/research/xenoarchaeology/misc.dm
View File

@@ -100,6 +100,7 @@
new /obj/item/clothing/glasses/meson(src) new /obj/item/clothing/glasses/meson(src)
new /obj/item/weapon/pickaxe(src) new /obj/item/weapon/pickaxe(src)
new /obj/item/device/measuring_tape(src) new /obj/item/device/measuring_tape(src)
new /obj/item/weapon/pickaxe/hand(src)
return return
//---- Isolation room air alarms //---- Isolation room air alarms

1
code/modules/research/xenoarchaeology/tools/gearbelt.dm
View File

@@ -24,4 +24,5 @@
"/obj/item/weapon/anodevice", "/obj/item/weapon/anodevice",
"/obj/item/clothing/glasses", "/obj/item/clothing/glasses",
"/obj/item/weapon/wrench", "/obj/item/weapon/wrench",
"/obj/item/weapon/storage/box/excavation",
"/obj/item/weapon/anobattery") "/obj/item/weapon/anobattery")

24
code/modules/research/xenoarchaeology/tools/tools_pickaxe.dm
View File

@@ -7,7 +7,7 @@
icon = 'icons/obj/xenoarchaeology.dmi' icon = 'icons/obj/xenoarchaeology.dmi'
icon_state = "pick_brush" icon_state = "pick_brush"
item_state = "syringe_0" item_state = "syringe_0"
digspeed = 50 digspeed = 20
desc = "Thick metallic wires for clearing away dust and loose scree (1 centimetre excavation depth)." desc = "Thick metallic wires for clearing away dust and loose scree (1 centimetre excavation depth)."
excavation_amount = 0.5 excavation_amount = 0.5
drill_sound = 'sound/weapons/thudswoosh.ogg' drill_sound = 'sound/weapons/thudswoosh.ogg'
@@ -19,7 +19,7 @@
icon = 'icons/obj/xenoarchaeology.dmi' icon = 'icons/obj/xenoarchaeology.dmi'
icon_state = "pick1" icon_state = "pick1"
item_state = "syringe_0" item_state = "syringe_0"
digspeed = 50 digspeed = 20
desc = "A miniature excavation tool for precise digging (2 centimetre excavation depth)." desc = "A miniature excavation tool for precise digging (2 centimetre excavation depth)."
excavation_amount = 1 excavation_amount = 1
drill_sound = 'sound/items/Screwdriver.ogg' drill_sound = 'sound/items/Screwdriver.ogg'
@@ -31,7 +31,7 @@
icon = 'icons/obj/xenoarchaeology.dmi' icon = 'icons/obj/xenoarchaeology.dmi'
icon_state = "pick2" icon_state = "pick2"
item_state = "syringe_0" item_state = "syringe_0"
digspeed = 50 digspeed = 20
desc = "A miniature excavation tool for precise digging (4 centimetre excavation depth)." desc = "A miniature excavation tool for precise digging (4 centimetre excavation depth)."
excavation_amount = 2 excavation_amount = 2
drill_sound = 'sound/items/Screwdriver.ogg' drill_sound = 'sound/items/Screwdriver.ogg'
@@ -43,7 +43,7 @@
icon = 'icons/obj/xenoarchaeology.dmi' icon = 'icons/obj/xenoarchaeology.dmi'
icon_state = "pick3" icon_state = "pick3"
item_state = "syringe_0" item_state = "syringe_0"
digspeed = 50 digspeed = 20
desc = "A miniature excavation tool for precise digging (6 centimetre excavation depth)." desc = "A miniature excavation tool for precise digging (6 centimetre excavation depth)."
excavation_amount = 3 excavation_amount = 3
drill_sound = 'sound/items/Screwdriver.ogg' drill_sound = 'sound/items/Screwdriver.ogg'
@@ -55,7 +55,7 @@
icon = 'icons/obj/xenoarchaeology.dmi' icon = 'icons/obj/xenoarchaeology.dmi'
icon_state = "pick4" icon_state = "pick4"
item_state = "syringe_0" item_state = "syringe_0"
digspeed = 50 digspeed = 20
desc = "A miniature excavation tool for precise digging (8 centimetre excavation depth)." desc = "A miniature excavation tool for precise digging (8 centimetre excavation depth)."
excavation_amount = 4 excavation_amount = 4
drill_sound = 'sound/items/Screwdriver.ogg' drill_sound = 'sound/items/Screwdriver.ogg'
@@ -67,7 +67,7 @@
icon = 'icons/obj/xenoarchaeology.dmi' icon = 'icons/obj/xenoarchaeology.dmi'
icon_state = "pick5" icon_state = "pick5"
item_state = "syringe_0" item_state = "syringe_0"
digspeed = 50 digspeed = 20
desc = "A miniature excavation tool for precise digging (10 centimetre excavation depth)." desc = "A miniature excavation tool for precise digging (10 centimetre excavation depth)."
excavation_amount = 5 excavation_amount = 5
drill_sound = 'sound/items/Screwdriver.ogg' drill_sound = 'sound/items/Screwdriver.ogg'
@@ -79,7 +79,7 @@
icon = 'icons/obj/xenoarchaeology.dmi' icon = 'icons/obj/xenoarchaeology.dmi'
icon_state = "pick6" icon_state = "pick6"
item_state = "syringe_0" item_state = "syringe_0"
digspeed = 50 digspeed = 20
desc = "A miniature excavation tool for precise digging (12 centimetre excavation depth)." desc = "A miniature excavation tool for precise digging (12 centimetre excavation depth)."
excavation_amount = 6 excavation_amount = 6
drill_sound = 'sound/items/Screwdriver.ogg' drill_sound = 'sound/items/Screwdriver.ogg'
@@ -91,7 +91,7 @@
icon = 'icons/obj/xenoarchaeology.dmi' icon = 'icons/obj/xenoarchaeology.dmi'
icon_state = "pick_hand" icon_state = "pick_hand"
item_state = "syringe_0" item_state = "syringe_0"
digspeed = 50 digspeed = 30
desc = "A smaller, more precise version of the pickaxe (30 centimetre excavation depth)." desc = "A smaller, more precise version of the pickaxe (30 centimetre excavation depth)."
excavation_amount = 15 excavation_amount = 15
drill_sound = 'sound/items/Crowbar.ogg' drill_sound = 'sound/items/Crowbar.ogg'
@@ -108,16 +108,15 @@
desc = "A set of picks for excavation." desc = "A set of picks for excavation."
item_state = "syringe_kit" item_state = "syringe_kit"
foldable = /obj/item/stack/sheet/cardboard //BubbleWrap foldable = /obj/item/stack/sheet/cardboard //BubbleWrap
storage_slots = 8 storage_slots = 7
w_class = 3 w_class = 2
can_hold = list("/obj/item/weapon/pickaxe/brush",\ can_hold = list("/obj/item/weapon/pickaxe/brush",\
"/obj/item/weapon/pickaxe/one_pick",\ "/obj/item/weapon/pickaxe/one_pick",\
"/obj/item/weapon/pickaxe/two_pick",\ "/obj/item/weapon/pickaxe/two_pick",\
"/obj/item/weapon/pickaxe/three_pick",\ "/obj/item/weapon/pickaxe/three_pick",\
"/obj/item/weapon/pickaxe/four_pick",\ "/obj/item/weapon/pickaxe/four_pick",\
"/obj/item/weapon/pickaxe/five_pick",\ "/obj/item/weapon/pickaxe/five_pick",\
"/obj/item/weapon/pickaxe/six_pick",\ "/obj/item/weapon/pickaxe/six_pick")
"/obj/item/weapon/pickaxe/hand")
max_combined_w_class = 17 max_combined_w_class = 17
max_w_class = 4 max_w_class = 4
use_to_pickup = 1 // for picking up broken bulbs, not that most people will try 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/four_pick(src)
new /obj/item/weapon/pickaxe/five_pick(src) new /obj/item/weapon/pickaxe/five_pick(src)
new /obj/item/weapon/pickaxe/six_pick(src) new /obj/item/weapon/pickaxe/six_pick(src)
new /obj/item/weapon/pickaxe/hand(src)