diff --git a/code/datums/wires/wires.dm b/code/datums/wires/wires.dm
index c1ee225dce..435ca82fdc 100644
--- a/code/datums/wires/wires.dm
+++ b/code/datums/wires/wires.dm
@@ -120,6 +120,7 @@ var/list/wireColours = list("red", "blue", "green", "darkred", "orange", "brown"
if(istype(I, /obj/item/weapon/wirecutters))
var/colour = href_list["cut"]
CutWireColour(colour)
+ playsound(holder, I.usesound, 20, 1)
else
L << "You need wirecutters!"
@@ -127,6 +128,7 @@ var/list/wireColours = list("red", "blue", "green", "darkred", "orange", "brown"
if(istype(I, /obj/item/device/multitool))
var/colour = href_list["pulse"]
PulseColour(colour)
+ playsound(holder, 'sound/weapons/empty.ogg', 20, 1)
else
L << "You need a multitool!"
diff --git a/code/game/objects/items/devices/multitool.dm b/code/game/objects/items/devices/multitool.dm
index 2164bf18ce..d79fc021db 100644
--- a/code/game/objects/items/devices/multitool.dm
+++ b/code/game/objects/items/devices/multitool.dm
@@ -38,7 +38,7 @@
desc = "Optimised and stripped-down version of a regular multitool."
toolspeed = 0.5
-/obj/item/device/multitool/ayyy
+/obj/item/device/multitool/alien
name = "alien multitool"
desc = "An omni-technological interface."
icon = 'icons/obj/abductor.dmi'
diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm
index af76dca94b..93549deb71 100644
--- a/code/game/objects/items/weapons/storage/belt.dm
+++ b/code/game/objects/items/weapons/storage/belt.dm
@@ -224,21 +224,21 @@
new /obj/item/device/soulstone(src)
new /obj/item/device/soulstone(src)
-/obj/item/weapon/storage/belt/utility/ayyy
+/obj/item/weapon/storage/belt/utility/alien
name = "alien belt"
desc = "A belt(?) that can hold things."
icon = 'icons/obj/abductor.dmi'
icon_state = "belt"
item_state = "security"
-/obj/item/weapon/storage/belt/utility/ayyy/full/New()
+/obj/item/weapon/storage/belt/utility/alien/full/New()
..()
- new /obj/item/weapon/screwdriver/ayyy(src)
- new /obj/item/weapon/wrench/ayyy(src)
- new /obj/item/weapon/weldingtool/ayyy(src)
- new /obj/item/weapon/crowbar/ayyy(src)
- new /obj/item/weapon/wirecutters/ayyy(src)
- new /obj/item/device/multitool/ayyy(src)
+ new /obj/item/weapon/screwdriver/alien(src)
+ new /obj/item/weapon/wrench/alien(src)
+ new /obj/item/weapon/weldingtool/alien(src)
+ new /obj/item/weapon/crowbar/alien(src)
+ new /obj/item/weapon/wirecutters/alien(src)
+ new /obj/item/device/multitool/alien(src)
new /obj/item/stack/cable_coil(src,30,"white")
/obj/item/weapon/storage/belt/champion
diff --git a/code/game/objects/items/weapons/tools.dm b/code/game/objects/items/weapons/tools.dm
index 31b0d90b9e..3a2746be47 100644
--- a/code/game/objects/items/weapons/tools.dm
+++ b/code/game/objects/items/weapons/tools.dm
@@ -38,7 +38,7 @@
usesound = 'sound/items/drill_use.ogg'
toolspeed = 0.5
-/obj/item/weapon/wrench/ayyy
+/obj/item/weapon/wrench/alien
name = "alien wrench"
desc = "A polarized wrench. It causes anything placed between the jaws to turn."
icon = 'icons/obj/abductor.dmi'
@@ -134,7 +134,7 @@
M = user
return eyestab(M,user)
-/obj/item/weapon/screwdriver/ayyy
+/obj/item/weapon/screwdriver/alien
name = "alien screwdriver"
desc = "An ultrasonic screwdriver."
icon = 'icons/obj/abductor.dmi'
@@ -219,7 +219,7 @@
else
..()
-/obj/item/weapon/wirecutters/ayyy
+/obj/item/weapon/wirecutters/alien
name = "alien wirecutters"
desc = "Extremely sharp wirecutters, made out of a silvery-green metal."
icon = 'icons/obj/abductor.dmi'
@@ -619,7 +619,7 @@
toolspeed = 2
eye_safety_modifier = 1 // Safer on eyes.
-/obj/item/weapon/weldingtool/ayyy
+/obj/item/weapon/weldingtool/alien
name = "alien welding tool"
desc = "An alien welding tool. Whatever fuel it uses, it never runs out."
icon = 'icons/obj/abductor.dmi'
@@ -631,7 +631,7 @@
origin_tech = list(TECH_PHORON = 5 ,TECH_ENGINEERING = 5)
always_process = TRUE
-/obj/item/weapon/weldingtool/ayyy/process()
+/obj/item/weapon/weldingtool/alien/process()
if(get_fuel() <= get_max_fuel())
reagents.add_reagent("fuel", 1)
..()
@@ -823,7 +823,7 @@
else
return ..()
-/obj/item/weapon/crowbar/ayyy
+/obj/item/weapon/crowbar/alien
name = "alien crowbar"
desc = "A hard-light crowbar. It appears to pry by itself, without any effort required."
icon = 'icons/obj/abductor.dmi'
diff --git a/code/game/objects/structures/crates_lockers/closets/fireaxe.dm b/code/game/objects/structures/crates_lockers/closets/fireaxe.dm
index 13a567ca75..fe838a5291 100644
--- a/code/game/objects/structures/crates_lockers/closets/fireaxe.dm
+++ b/code/game/objects/structures/crates_lockers/closets/fireaxe.dm
@@ -34,7 +34,7 @@
if(istype(O, /obj/item/device/multitool))
user << "Resetting circuitry..."
playsound(user, 'sound/machines/lockreset.ogg', 50, 1)
- if(do_after(user, 20))
+ if(do_after(user, 20 * O.toolspeed))
src.locked = 0
user << " You disable the locking modules."
update_icon()
@@ -92,11 +92,8 @@
return
else
user << "Resetting circuitry..."
- sleep(50)
- src.locked = 1
- user << "You re-enable the locking modules."
playsound(user, 'sound/machines/lockenable.ogg', 50, 1)
- if(do_after(user,20))
+ if(do_after(user,20 * O.toolspeed))
src.locked = 1
user << " You re-enable the locking modules."
return