mirror of
https://github.com/vgstation-coders/vgstation13.git
synced 2025-12-10 10:21:11 +00:00
Tool Sound/Speed (#25529)
* Initial work on tool sounds * Crowbars * playtoolsound() * aaaaaaaaaaaaaaaaaaaa * HERE WE GO AGAIN * Wrench * Screwdriver.ogg REDUX, Cuffs * drilling tools toolspeed is now a multiplier too * Wirecutter
This commit is contained in:
@@ -52,12 +52,12 @@ Note: Must be placed within 3 tiles of the R&D Console
|
||||
return -1
|
||||
return ..()
|
||||
|
||||
/obj/machinery/r_n_d/destructive_analyzer/crowbarDestroy(mob/user)
|
||||
if(..() == 1)
|
||||
/obj/machinery/r_n_d/destructive_analyzer/crowbarDestroy(mob/user, obj/item/weapon/crowbar/I)
|
||||
if(..())
|
||||
if(loaded_item)
|
||||
loaded_item.forceMove(loc)
|
||||
return 1
|
||||
return -1
|
||||
return TRUE
|
||||
return FALSE
|
||||
|
||||
/obj/machinery/r_n_d/destructive_analyzer/attackby(var/obj/O as obj, var/mob/user as mob)
|
||||
if(..())
|
||||
|
||||
@@ -125,7 +125,7 @@ var/global/list/rnd_machines = list()
|
||||
return 1
|
||||
|
||||
/obj/machinery/r_n_d/crowbarDestroy(mob/user)
|
||||
if(..() == 1)
|
||||
if(..())
|
||||
if (materials)
|
||||
for(var/matID in materials.storage)
|
||||
if (materials.storage[matID] == 0) // No materials of this type
|
||||
@@ -139,8 +139,8 @@ var/global/list/rnd_machines = list()
|
||||
materials.removeAmount(matID, sheet.amount * sheet.perunit)
|
||||
else
|
||||
qdel(sheet)
|
||||
return 1
|
||||
return -1
|
||||
return TRUE
|
||||
return FALSE
|
||||
|
||||
/obj/machinery/r_n_d/attackby(var/obj/item/O as obj, var/mob/user as mob)
|
||||
if (shocked)
|
||||
|
||||
@@ -304,7 +304,7 @@
|
||||
|
||||
/obj/machinery/computer/rdservercontrol/attackby(var/obj/item/weapon/D as obj, var/mob/user as mob)
|
||||
if(D.is_screwdriver(user))
|
||||
playsound(src, 'sound/items/Screwdriver.ogg', 50, 1)
|
||||
D.playtoolsound(src, 50)
|
||||
if(do_after(user, src, 20))
|
||||
if (src.stat & BROKEN)
|
||||
to_chat(user, "<span class='notice'>The broken glass falls out.</span>")
|
||||
|
||||
@@ -86,7 +86,7 @@
|
||||
|
||||
busy = 1
|
||||
|
||||
if(do_after(user,src, P.digspeed))
|
||||
if(do_after(user,src, (MINE_DURATION * P.toolspeed)))
|
||||
|
||||
busy = 0
|
||||
|
||||
|
||||
@@ -84,7 +84,7 @@
|
||||
if(W.is_wrench(user))
|
||||
user.visible_message("<span class = 'warning'>[user] starts to deconstruct \the [src]!</span>","<span class = 'notice'>You start to deconstruct \the [src].</span>")
|
||||
if(do_after(user, src, 5 SECONDS))
|
||||
playsound(src, 'sound/items/Ratchet.ogg', 50, 1)
|
||||
W.playtoolsound(src, 50)
|
||||
drop_stack(sheet_type, loc, rand(3,4), user)
|
||||
qdel(src)
|
||||
else
|
||||
|
||||
@@ -5,9 +5,9 @@
|
||||
inhand_states = list("left_hand" = 'icons/mob/in-hand/left/xenoarch.dmi', "right_hand" = 'icons/mob/in-hand/right/xenoarch.dmi')
|
||||
item_state = "excavationdrill"
|
||||
excavation_amount = 0.5
|
||||
digspeed = 30
|
||||
toolspeed = 0.3
|
||||
desc = "Basic archaeological drill combining ultrasonic excitation and bluespace manipulation to provide extreme precision. The tip is adjustable from 1 to 30 cms."
|
||||
drill_sound = 'sound/weapons/thudswoosh.ogg'
|
||||
toolsounds = list('sound/weapons/thudswoosh.ogg')
|
||||
drill_verb = "drilling"
|
||||
force = 15.0
|
||||
w_class = W_CLASS_SMALL
|
||||
@@ -50,7 +50,7 @@
|
||||
icon_state = "Dexcavationdrill0"
|
||||
inhand_states = list("left_hand" = 'icons/mob/in-hand/left/xenoarch.dmi', "right_hand" = 'icons/mob/in-hand/right/xenoarch.dmi')
|
||||
item_state = "Dexcavationdrill"
|
||||
digspeed = 15
|
||||
toolspeed = 0.15
|
||||
desc = "Advanced archaeological drill combining ultrasonic excitation and bluespace manipulation to provide extreme precision. The diamond tip is adjustable from 1 to 100 cms."
|
||||
|
||||
/obj/item/weapon/pickaxe/excavationdrill/adv/attack_self(mob/user as mob)
|
||||
|
||||
@@ -7,10 +7,10 @@
|
||||
icon = 'icons/obj/xenoarchaeology.dmi'
|
||||
icon_state = "pick_brush"
|
||||
item_state = "syringe_0"
|
||||
digspeed = 20
|
||||
toolspeed = 0.2
|
||||
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'
|
||||
toolsounds = list('sound/weapons/thudswoosh.ogg')
|
||||
drill_verb = "brushing"
|
||||
w_class = W_CLASS_SMALL
|
||||
|
||||
@@ -19,10 +19,10 @@
|
||||
icon = 'icons/obj/xenoarchaeology.dmi'
|
||||
icon_state = "pick1"
|
||||
item_state = "syringe_0"
|
||||
digspeed = 20
|
||||
toolspeed = 0.2
|
||||
desc = "A miniature excavation tool for precise digging (2 centimetre excavation depth)."
|
||||
excavation_amount = 1
|
||||
drill_sound = 'sound/items/Screwdriver.ogg'
|
||||
toolsounds = list('sound/items/Screwdriver.ogg')
|
||||
drill_verb = "delicately picking"
|
||||
w_class = W_CLASS_SMALL
|
||||
|
||||
@@ -31,10 +31,10 @@
|
||||
icon = 'icons/obj/xenoarchaeology.dmi'
|
||||
icon_state = "pick2"
|
||||
item_state = "syringe_0"
|
||||
digspeed = 20
|
||||
toolspeed = 0.2
|
||||
desc = "A miniature excavation tool for precise digging (4 centimetre excavation depth)."
|
||||
excavation_amount = 2
|
||||
drill_sound = 'sound/items/Screwdriver.ogg'
|
||||
toolsounds = list('sound/items/Screwdriver.ogg')
|
||||
drill_verb = "delicately picking"
|
||||
w_class = W_CLASS_SMALL
|
||||
|
||||
@@ -43,10 +43,10 @@
|
||||
icon = 'icons/obj/xenoarchaeology.dmi'
|
||||
icon_state = "pick3"
|
||||
item_state = "syringe_0"
|
||||
digspeed = 20
|
||||
toolspeed = 0.2
|
||||
desc = "A miniature excavation tool for precise digging (6 centimetre excavation depth)."
|
||||
excavation_amount = 3
|
||||
drill_sound = 'sound/items/Screwdriver.ogg'
|
||||
toolsounds = list('sound/items/Screwdriver.ogg')
|
||||
drill_verb = "delicately picking"
|
||||
w_class = W_CLASS_SMALL
|
||||
|
||||
@@ -55,10 +55,10 @@
|
||||
icon = 'icons/obj/xenoarchaeology.dmi'
|
||||
icon_state = "pick4"
|
||||
item_state = "syringe_0"
|
||||
digspeed = 20
|
||||
toolspeed = 0.2
|
||||
desc = "A miniature excavation tool for precise digging (8 centimetre excavation depth)."
|
||||
excavation_amount = 4
|
||||
drill_sound = 'sound/items/Screwdriver.ogg'
|
||||
toolsounds = list('sound/items/Screwdriver.ogg')
|
||||
drill_verb = "delicately picking"
|
||||
w_class = W_CLASS_SMALL
|
||||
|
||||
@@ -67,10 +67,10 @@
|
||||
icon = 'icons/obj/xenoarchaeology.dmi'
|
||||
icon_state = "pick5"
|
||||
item_state = "syringe_0"
|
||||
digspeed = 20
|
||||
toolspeed = 0.2
|
||||
desc = "A miniature excavation tool for precise digging (10 centimetre excavation depth)."
|
||||
excavation_amount = 5
|
||||
drill_sound = 'sound/items/Screwdriver.ogg'
|
||||
toolsounds = list('sound/items/Screwdriver.ogg')
|
||||
drill_verb = "delicately picking"
|
||||
w_class = W_CLASS_SMALL
|
||||
|
||||
@@ -79,10 +79,10 @@
|
||||
icon = 'icons/obj/xenoarchaeology.dmi'
|
||||
icon_state = "pick6"
|
||||
item_state = "syringe_0"
|
||||
digspeed = 20
|
||||
toolspeed = 0.2
|
||||
desc = "A miniature excavation tool for precise digging (12 centimetre excavation depth)."
|
||||
excavation_amount = 6
|
||||
drill_sound = 'sound/items/Screwdriver.ogg'
|
||||
toolsounds = list('sound/items/Screwdriver.ogg')
|
||||
drill_verb = "delicately picking"
|
||||
w_class = W_CLASS_SMALL
|
||||
|
||||
@@ -91,10 +91,10 @@
|
||||
icon = 'icons/obj/xenoarchaeology.dmi'
|
||||
icon_state = "pick_hand"
|
||||
item_state = "syringe_0"
|
||||
digspeed = 30
|
||||
toolspeed = 0.3
|
||||
desc = "A smaller, more precise version of the pickaxe (30 centimetre excavation depth)."
|
||||
excavation_amount = 15
|
||||
drill_sound = 'sound/items/Crowbar.ogg'
|
||||
toolsounds = list('sound/items/Crowbar.ogg')
|
||||
drill_verb = "clearing"
|
||||
w_class = W_CLASS_MEDIUM
|
||||
|
||||
|
||||
Reference in New Issue
Block a user