mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-25 05:51:56 +01:00
More new sounds and fixes equip sounds (#9464)
This commit is contained in:
@@ -78,6 +78,8 @@
|
||||
|
||||
var/excavation_amount = 40
|
||||
var/wielded = FALSE
|
||||
var/wield_sound = "wield_generic"
|
||||
var/unwield_sound = null
|
||||
var/force_unwielded = 5.0
|
||||
var/force_wielded = 15.0
|
||||
var/digspeed_unwielded = 30
|
||||
@@ -91,12 +93,16 @@
|
||||
force = force_unwielded
|
||||
digspeed = digspeed_unwielded
|
||||
name = initial(name)
|
||||
if(src.unwield_sound)
|
||||
playsound(src.loc, unwield_sound, 25, 1)
|
||||
update_icon()
|
||||
|
||||
/obj/item/pickaxe/proc/wield()
|
||||
wielded = TRUE
|
||||
force = force_wielded
|
||||
digspeed = digspeed_wielded
|
||||
if(src.wield_sound)
|
||||
playsound(src.loc, wield_sound, 25, 1)
|
||||
update_icon()
|
||||
|
||||
/obj/item/pickaxe/update_icon()
|
||||
@@ -191,8 +197,10 @@
|
||||
item_state = null
|
||||
name = "offhand"
|
||||
simulated = FALSE
|
||||
|
||||
action_button_name = null
|
||||
drop_sound = null
|
||||
pickup_sound = null
|
||||
equip_sound = null
|
||||
|
||||
/obj/item/pickaxe/proc/copy_stats(obj/item/pickaxe/parent)
|
||||
digspeed_wielded = parent.digspeed_wielded
|
||||
@@ -218,7 +226,6 @@
|
||||
desc = "A mining hammer made of reinforced metal. You feel like smashing your boss in the face with this."
|
||||
icon_state = "sledgehammer"
|
||||
icon = 'icons/obj/weapons.dmi'
|
||||
hitsound = "swing_hit"
|
||||
|
||||
/obj/item/pickaxe/silver
|
||||
name = "silver pickaxe"
|
||||
@@ -1170,7 +1177,7 @@ var/list/total_extraction_beacons = list()
|
||||
SPAN_NOTICE("You continue sculpting."))
|
||||
|
||||
if(prob(25))
|
||||
playsound(user, 'sound/items/Screwdriver.ogg', 20, TRUE)
|
||||
playsound(user, 'sound/items/screwdriver.ogg', 20, TRUE)
|
||||
else
|
||||
playsound(user, "sound/weapons/chisel[rand(1,2)].ogg", 20, TRUE)
|
||||
spawn(3)
|
||||
@@ -1224,8 +1231,7 @@ var/list/total_extraction_beacons = list()
|
||||
icon_state = "punchingbag"
|
||||
anchored = TRUE
|
||||
layer = 5.1
|
||||
var/list/hit_sounds = list('sound/weapons/genhit1.ogg', 'sound/weapons/genhit2.ogg', 'sound/weapons/genhit3.ogg',\
|
||||
'sound/weapons/punch1.ogg', 'sound/weapons/punch2.ogg', 'sound/weapons/punch3.ogg', 'sound/weapons/punch4.ogg')
|
||||
var/list/hit_sounds = list("swing_hit", "punch")
|
||||
|
||||
/obj/structure/punching_bag/attack_hand(mob/user as mob)
|
||||
user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
|
||||
|
||||
@@ -632,7 +632,7 @@ var/list/asteroid_floor_smooth = list(
|
||||
var/obj/item/stack/rods/R = W
|
||||
if(R.use(1))
|
||||
to_chat(user, SPAN_NOTICE("Constructing support lattice..."))
|
||||
playsound(src, 'sound/weapons/Genhit.ogg', 50, 1)
|
||||
playsound(src, 'sound/weapons/genhit.ogg', 50, 1)
|
||||
ReplaceWithLattice()
|
||||
return
|
||||
|
||||
@@ -643,7 +643,7 @@ var/list/asteroid_floor_smooth = list(
|
||||
if(S.get_amount() < 1)
|
||||
return
|
||||
qdel(L)
|
||||
playsound(src, 'sound/weapons/Genhit.ogg', 50, TRUE)
|
||||
playsound(src, 'sound/weapons/genhit.ogg', 50, TRUE)
|
||||
S.use(1)
|
||||
ChangeTurf(/turf/simulated/floor/airless)
|
||||
return
|
||||
|
||||
Reference in New Issue
Block a user