mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-24 21:40:55 +01:00
More new sounds and fixes equip sounds (#9464)
This commit is contained in:
Wowzewow (Wezzy)
@@ -91,7 +91,7 @@
|
||||
|
||||
if(WT.remove_fuel(0, user))
|
||||
damage = 15
|
||||
playsound(loc, 'sound/items/Welder.ogg', 100, 1)
|
||||
playsound(loc, 'sound/items/welder.ogg', 100, 1)
|
||||
|
||||
health -= damage
|
||||
healthcheck()
|
||||
@@ -102,4 +102,4 @@
|
||||
health -= 5
|
||||
healthcheck()
|
||||
|
||||
#undef NODERANGE
|
||||
#undef NODERANGE
|
||||
|
||||
@@ -270,7 +270,7 @@
|
||||
"<span class='notice'>You begin cutting [src] apart.</span>",
|
||||
"You hear a welding torch on metal."
|
||||
)
|
||||
playsound(loc, 'sound/items/Welder2.ogg', 50, 1)
|
||||
playsound(loc, 'sound/items/welder_pry.ogg', 50, 1)
|
||||
if (!do_after(user, 2 SECONDS, act_target = src, extra_checks = CALLBACK(src, .proc/is_open)))
|
||||
return
|
||||
if(!WT.remove_fuel(0,user))
|
||||
@@ -314,7 +314,7 @@
|
||||
"<span class='notice'>You begin welding [src] [welded ? "open" : "shut"].</span>",
|
||||
"You hear a welding torch on metal."
|
||||
)
|
||||
playsound(loc, 'sound/items/Welder2.ogg', 50, 1)
|
||||
playsound(loc, 'sound/items/welder_pry.ogg', 50, 1)
|
||||
if (!do_after(user, 2/W.toolspeed SECONDS, act_target = src, extra_checks = CALLBACK(src, .proc/is_closed)))
|
||||
return
|
||||
if(!WT.remove_fuel(0,user))
|
||||
@@ -509,4 +509,4 @@
|
||||
/obj/structure/closet/Destroy()
|
||||
if(linked_teleporter)
|
||||
QDEL_NULL(linked_teleporter)
|
||||
return ..()
|
||||
return ..()
|
||||
|
||||
@@ -94,7 +94,7 @@
|
||||
"<span class='notice'>You begin cutting [src] apart.</span>",
|
||||
"You hear a welding torch on metal."
|
||||
)
|
||||
playsound(loc, 'sound/items/Welder2.ogg', 50, 1)
|
||||
playsound(loc, 'sound/items/welder_pry.ogg', 50, 1)
|
||||
if (!do_after(user, 2/W.toolspeed SECONDS, act_target = src, extra_checks = CALLBACK(src, .proc/is_open)))
|
||||
return
|
||||
if(!WT.remove_fuel(0,user))
|
||||
@@ -126,7 +126,7 @@
|
||||
screwed = 0
|
||||
else if(!screwed && wrenched)
|
||||
to_chat(user, "<span class='notice'>You start to screw the locker to the floor...</span>")
|
||||
playsound(src, 'sound/items/Welder.ogg', 80, 1)
|
||||
playsound(src, 'sound/items/welder.ogg', 80, 1)
|
||||
if (do_after(user, 15/W.toolspeed SECONDS, act_target = src))
|
||||
to_chat(user, "<span class='notice'>You screw the locker!</span>")
|
||||
playsound(loc, W.usesound, 50, 1)
|
||||
@@ -179,7 +179,7 @@
|
||||
"<span class='notice'>You begin welding [src] [welded ? "open" : "shut"].</span>",
|
||||
"You hear a welding torch on metal."
|
||||
)
|
||||
playsound(loc, 'sound/items/Welder2.ogg', 50, 1)
|
||||
playsound(loc, 'sound/items/welder_pry.ogg', 50, 1)
|
||||
if (!do_after(user, 2 SECONDS, act_target = src, extra_checks = CALLBACK(src, .proc/is_closed)))
|
||||
return
|
||||
if(!WT.remove_fuel(0,user))
|
||||
|
||||
@@ -110,7 +110,7 @@
|
||||
else if(W.iswirecutter())
|
||||
if(rigged)
|
||||
to_chat(user, "<span class='notice'>You cut away the wiring.</span>")
|
||||
playsound(loc, 'sound/items/Wirecutter.ogg', 100, 1)
|
||||
playsound(loc, 'sound/items/wirecutter.ogg', 100, 1)
|
||||
rigged = 0
|
||||
return
|
||||
else return attack_hand(user)
|
||||
|
||||
@@ -42,7 +42,7 @@
|
||||
if(!do_after(user, 30/W.toolspeed))
|
||||
manipulating = FALSE
|
||||
return
|
||||
playsound(src.loc, 'sound/items/Wirecutter.ogg', 50, 1)
|
||||
playsound(src.loc, 'sound/items/wirecutter.ogg', 50, 1)
|
||||
visible_message(SPAN_NOTICE("[user] cuts down \the [src]."),
|
||||
SPAN_NOTICE("You cut down \the [src]."))
|
||||
if(istype(src, /obj/structure/curtain/open/medical))
|
||||
|
||||
@@ -40,7 +40,7 @@
|
||||
src.density = 0
|
||||
src.destroyed = 1
|
||||
new /obj/item/material/shard( src.loc )
|
||||
playsound(src, "shatter", 70, 1)
|
||||
playsound(src, "glass_break", 70, 1)
|
||||
update_icon()
|
||||
else
|
||||
playsound(src.loc, 'sound/effects/glass_hit.ogg', 75, 1)
|
||||
|
||||
@@ -175,7 +175,7 @@
|
||||
if(W.iswelder() && ( (istext(glass)) || (glass == 1) || (!anchored) ))
|
||||
var/obj/item/weldingtool/WT = W
|
||||
if (WT.remove_fuel(0, user))
|
||||
playsound(src.loc, 'sound/items/Welder2.ogg', 50, 1)
|
||||
playsound(src.loc, 'sound/items/welder_pry.ogg', 50, 1)
|
||||
if(istext(glass))
|
||||
user.visible_message("[user] welds the [glass] plating off the airlock assembly.", "You start to weld the [glass] plating off the airlock assembly.")
|
||||
if(do_after(user, 40/W.toolspeed))
|
||||
@@ -228,7 +228,7 @@
|
||||
to_chat(user, "<span class='notice'>You wire the airlock.</span>")
|
||||
|
||||
else if(W.iswirecutter() && state == 1 )
|
||||
playsound(src.loc, 'sound/items/Wirecutter.ogg', 100, 1)
|
||||
playsound(src.loc, 'sound/items/wirecutter.ogg', 100, 1)
|
||||
user.visible_message("[user] cuts the wires from the airlock assembly.", "You start to cut the wires from airlock assembly.")
|
||||
|
||||
if(do_after(user, 40/W.toolspeed))
|
||||
@@ -240,7 +240,7 @@
|
||||
else if(istype(W, /obj/item/airlock_electronics) && state == 1)
|
||||
var/obj/item/airlock_electronics/EL = W
|
||||
if(!EL.is_installed)
|
||||
playsound(src.loc, 'sound/items/Screwdriver.ogg', 100, 1)
|
||||
playsound(src.loc, 'sound/items/screwdriver.ogg', 100, 1)
|
||||
user.visible_message("[user] installs the electronics into the airlock assembly.", "You start to install electronics into the airlock assembly.")
|
||||
EL.is_installed = 1
|
||||
if(do_after(user, 40/W.toolspeed))
|
||||
@@ -261,7 +261,7 @@
|
||||
src.state = 1
|
||||
return
|
||||
|
||||
playsound(src.loc, 'sound/items/Crowbar.ogg', 100, 1)
|
||||
playsound(src.loc, W.usesound, 100, 1)
|
||||
user.visible_message("\The [user] starts removing the electronics from the airlock assembly.", "You start removing the electronics from the airlock assembly.")
|
||||
|
||||
if(do_after(user, 40/W.toolspeed))
|
||||
@@ -278,7 +278,7 @@
|
||||
if (S)
|
||||
if (S.get_amount() >= 1)
|
||||
if(material_name == "rglass")
|
||||
playsound(src.loc, 'sound/items/Crowbar.ogg', 100, 1)
|
||||
playsound(src.loc, "crowbar", 100, 1)
|
||||
user.visible_message("[user] adds [S.name] to the airlock assembly.", "You start to install [S.name] into the airlock assembly.")
|
||||
if(do_after(user, 40) && !glass)
|
||||
if (S.use(1))
|
||||
@@ -290,7 +290,7 @@
|
||||
to_chat(user, "You cannot make an airlock out of that material.")
|
||||
return
|
||||
if(S.get_amount() >= 2)
|
||||
playsound(src.loc, 'sound/items/Crowbar.ogg', 100, 1)
|
||||
playsound(src.loc, "crowbar", 100, 1)
|
||||
user.visible_message("[user] adds [S.name] to the airlock assembly.", "You start to install [S.name] into the airlock assembly.")
|
||||
if(do_after(user, 40) && !glass)
|
||||
if (S.use(2))
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
shattered = 1
|
||||
unlocked = 1
|
||||
open = 1
|
||||
playsound(user, "shatter", 100, 1)
|
||||
playsound(user, "glass_break", 100, 1)
|
||||
update_icon()
|
||||
|
||||
/obj/structure/fireaxecabinet/update_icon()
|
||||
|
||||
@@ -150,7 +150,7 @@
|
||||
return
|
||||
|
||||
else if(W.iswirecutter() && state == 1)
|
||||
playsound(src.loc, 'sound/items/Wirecutter.ogg', 100, 1)
|
||||
playsound(src.loc, 'sound/items/wirecutter.ogg', 100, 1)
|
||||
to_chat(user, "<span class='notice'>Now removing support struts...</span>")
|
||||
if(do_after(user,40/W.toolspeed))
|
||||
if(!src) return
|
||||
@@ -159,7 +159,7 @@
|
||||
reset_girder()
|
||||
|
||||
else if(W.iscrowbar() && state == 0 && anchored)
|
||||
playsound(src.loc, 'sound/items/Crowbar.ogg', 100, 1)
|
||||
playsound(src.loc, W.usesound, 100, 1)
|
||||
to_chat(user, "<span class='notice'>Now dislodging the girder...</span>")
|
||||
if(do_after(user, 40/W.toolspeed))
|
||||
if(!src) return
|
||||
|
||||
@@ -97,7 +97,7 @@
|
||||
/obj/structure/grille/attackby(obj/item/W, mob/user)
|
||||
if(W.iswirecutter())
|
||||
if(!shock(user, 100))
|
||||
playsound(loc, 'sound/items/Wirecutter.ogg', 100, 1)
|
||||
playsound(loc, 'sound/items/wirecutter.ogg', 100, 1)
|
||||
new /obj/item/stack/rods(get_turf(src), destroyed ? 1 : 2)
|
||||
qdel(src)
|
||||
else if(istype(W, /obj/item/gun/energy/plasmacutter))
|
||||
@@ -110,7 +110,7 @@
|
||||
qdel(src)
|
||||
else if((W.isscrewdriver()) && (istype(loc, /turf/simulated) || anchored))
|
||||
if(!shock(user, 90))
|
||||
playsound(loc, 'sound/items/Screwdriver.ogg', 100, 1)
|
||||
playsound(loc, 'sound/items/screwdriver.ogg', 100, 1)
|
||||
anchored = !anchored
|
||||
user.visible_message("<span class='notice'>[user] [anchored ? "fastens" : "unfastens"] the grille.</span>", \
|
||||
"<span class='notice'>You have [anchored ? "fastened the grille to" : "unfastened the grill from"] the floor.</span>")
|
||||
|
||||
@@ -144,23 +144,23 @@
|
||||
//This prevents dumb stuff like splashing the cart with the contents of a container, after putting said container into trash
|
||||
|
||||
else if (!has_items && (I.iswrench() || I.iswelder() || istype(I, /obj/item/gun/energy/plasmacutter)))
|
||||
dismantle(user)
|
||||
dismantle(user, I)
|
||||
return
|
||||
..()
|
||||
|
||||
/obj/structure/janitorialcart/proc/dismantle(var/mob/user = null)
|
||||
if (!dismantled)
|
||||
if (has_items)
|
||||
/obj/structure/janitorialcart/proc/dismantle(var/mob/user = null, var/obj/item/I)
|
||||
if(!dismantled)
|
||||
if(has_items)
|
||||
spill()
|
||||
|
||||
if (user)
|
||||
playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
|
||||
if(user)
|
||||
playsound(src.loc, I.usesound, 50, 1)
|
||||
user.visible_message("[user] starts taking apart the [src]", "You start disasembling the [src]")
|
||||
if (!do_after(user, 30, needhand = 0))
|
||||
return
|
||||
|
||||
new /obj/item/stack/material/steel(src.loc, 15)
|
||||
dismantled = 1
|
||||
dismantled = TRUE
|
||||
qdel(src)
|
||||
|
||||
/obj/structure/janitorialcart/ex_act(severity)
|
||||
|
||||
@@ -55,7 +55,7 @@
|
||||
var/obj/item/stack/rods/R = C
|
||||
if (R.use(2))
|
||||
to_chat(user, "<span class='notice'>Constructing catwalk ...</span>")
|
||||
playsound(src, 'sound/weapons/Genhit.ogg', 50, 1)
|
||||
playsound(src, 'sound/weapons/genhit.ogg', 50, 1)
|
||||
new /obj/structure/lattice/catwalk(src.loc)
|
||||
qdel(src)
|
||||
return
|
||||
@@ -81,7 +81,7 @@
|
||||
var/obj/item/weldingtool/WT = C
|
||||
if (do_after(user, 5/C.toolspeed, act_target = src) && WT.remove_fuel(1, user))
|
||||
to_chat(user, "<span class='notice'>You slice apart [src].</span>")
|
||||
playsound(src, 'sound/items/Welder.ogg', 50, 1)
|
||||
playsound(src, 'sound/items/welder.ogg', 50, 1)
|
||||
var/obj/item/stack/rods/R = new /obj/item/stack/rods(get_turf(src))
|
||||
R.amount = return_amount
|
||||
R.update_icon()
|
||||
@@ -145,7 +145,7 @@
|
||||
var/obj/item/weldingtool/WT = C
|
||||
if(do_after(user, 5/C.toolspeed, act_target = src) && WT.remove_fuel(1, user))
|
||||
to_chat(user, SPAN_NOTICE("You slice apart the [src] leaving nothing useful behind."))
|
||||
playsound(src, 'sound/items/Welder.ogg', 50, 1)
|
||||
playsound(src, 'sound/items/welder.ogg', 50, 1)
|
||||
qdel(src)
|
||||
else
|
||||
..()
|
||||
@@ -160,4 +160,4 @@
|
||||
damaged = TRUE
|
||||
else
|
||||
qdel(src)
|
||||
return
|
||||
return
|
||||
|
||||
@@ -28,7 +28,7 @@
|
||||
if(shattered) return
|
||||
shattered = 1
|
||||
icon_state = "mirror_broke"
|
||||
playsound(src, "shatter", 70, 1)
|
||||
playsound(src, "glass_break", 70, 1)
|
||||
desc = "Oh no, seven years of bad luck!"
|
||||
|
||||
|
||||
@@ -150,4 +150,4 @@
|
||||
if(!newname || newname == "")
|
||||
newname = user.species.get_random_name()
|
||||
user.fully_replace_character_name(user.real_name,newname)
|
||||
..()
|
||||
..()
|
||||
|
||||
@@ -56,7 +56,7 @@
|
||||
if(!do_after(user, 30/W.toolspeed))
|
||||
manipulating = FALSE
|
||||
return
|
||||
playsound(src.loc, 'sound/items/Wirecutter.ogg', 50, 1)
|
||||
playsound(src.loc, 'sound/items/wirecutter.ogg', 50, 1)
|
||||
visible_message(SPAN_NOTICE("[user] cuts down \the [src]."),
|
||||
SPAN_NOTICE("You cut down \the [src]."))
|
||||
qdel(src)
|
||||
|
||||
@@ -135,7 +135,7 @@
|
||||
to_chat(user, "\The [src] has no padding to remove.")
|
||||
return
|
||||
to_chat(user, "You remove the padding from \the [src].")
|
||||
playsound(src, 'sound/items/Wirecutter.ogg', 100, 1)
|
||||
playsound(src, 'sound/items/wirecutter.ogg', 100, 1)
|
||||
remove_padding()
|
||||
|
||||
else if(istype(W, /obj/item/grab))
|
||||
|
||||
@@ -178,7 +178,7 @@
|
||||
to_chat(user, "\The [src] has no padding to remove.")
|
||||
return
|
||||
to_chat(user, "You remove the padding from \the [src].")
|
||||
playsound(src, 'sound/items/Wirecutter.ogg', 100, 1)
|
||||
playsound(src, 'sound/items/wirecutter.ogg', 100, 1)
|
||||
remove_padding()
|
||||
else
|
||||
..()
|
||||
|
||||
@@ -74,7 +74,7 @@ obj/structure/windoor_assembly/Destroy()
|
||||
var/obj/item/weldingtool/WT = W
|
||||
if (WT.remove_fuel(0,user))
|
||||
user.visible_message("[user] dissassembles the windoor assembly.", "You start to dissassemble the windoor assembly.")
|
||||
playsound(src.loc, 'sound/items/Welder2.ogg', 50, 1)
|
||||
playsound(src.loc, 'sound/items/welder_pry.ogg', 50, 1)
|
||||
|
||||
if(do_after(user, 40/W.toolspeed))
|
||||
if(!src || !WT.isOn()) return
|
||||
@@ -152,7 +152,7 @@ obj/structure/windoor_assembly/Destroy()
|
||||
|
||||
//Removing wire from the assembly. Step 5 undone.
|
||||
if(W.iswirecutter() && !src.electronics)
|
||||
playsound(src.loc, 'sound/items/Wirecutter.ogg', 100, 1)
|
||||
playsound(src.loc, 'sound/items/wirecutter.ogg', 100, 1)
|
||||
user.visible_message("[user] cuts the wires from the airlock assembly.", "You start to cut the wires from airlock assembly.")
|
||||
|
||||
if(do_after(user, 40/W.toolspeed))
|
||||
@@ -170,7 +170,7 @@ obj/structure/windoor_assembly/Destroy()
|
||||
else if(istype(W, /obj/item/airlock_electronics) && W:icon_state != "door_electronics_smoked")
|
||||
var/obj/item/airlock_electronics/EL = W
|
||||
if(!EL.is_installed)
|
||||
playsound(src.loc, 'sound/items/Screwdriver.ogg', 100, 1)
|
||||
playsound(src.loc, 'sound/items/screwdriver.ogg', 100, 1)
|
||||
user.visible_message("[user] installs the electronics into the airlock assembly.", "You start to install electronics into the airlock assembly.")
|
||||
EL.is_installed = 1
|
||||
if(do_after(user, 40))
|
||||
@@ -205,7 +205,7 @@ obj/structure/windoor_assembly/Destroy()
|
||||
to_chat(usr, "<span class='warning'>The assembly is missing electronics.</span>")
|
||||
return
|
||||
usr << browse(null, "window=windoor_access")
|
||||
playsound(src.loc, 'sound/items/Crowbar.ogg', 100, 1)
|
||||
playsound(src.loc, W.usesound, 100, 1)
|
||||
user.visible_message("[user] pries the windoor into the frame.", "You start prying the windoor into the frame.")
|
||||
|
||||
if(do_after(user, 40/W.toolspeed))
|
||||
|
||||
@@ -87,7 +87,7 @@
|
||||
add_overlay(img)
|
||||
|
||||
/obj/structure/window/proc/shatter(var/display_message = 1)
|
||||
playsound(src, "shatter", 70, 1)
|
||||
playsound(src, "glass_break", 70, 1)
|
||||
if(display_message)
|
||||
visible_message(SPAN_WARNING("\The [src] shatters!"))
|
||||
if(dir == SOUTHWEST)
|
||||
|
||||
Reference in New Issue
Block a user