cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-23 04:51:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

sfad (#18021)

Browse Source
This commit is contained in:
Fluffy
2023-12-24 11:18:41 +00:00
committed by GitHub
parent 5f9e01fd27
commit 51a96cb43e
19 changed files with 88 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/airbubble.dm
+6 -4
View File
@@ -246,7 +246,8 @@
return FALSE
if ((world.time - last_shake) > 5 SECONDS)
playsound(loc, "sound/items/[pick("rip1","rip2")].ogg", 100, 1)
var/sound_to_play = pick(list('sound/items/rip1.ogg', 'sound/items/rip2.ogg'))
playsound(loc, sound_to_play, 100, 1)
shake_animation()
last_shake = world.time
@@ -275,7 +276,8 @@
breakout = FALSE
to_chat(escapee, "<span class='warning'>You successfully break out! Tearing the bubble's walls!</span>") // holy shit this is hilarious
visible_message("<span class='danger'>\the [escapee] successfully broke out of \the [src]! Tearing the bubble's walls!</span>")
playsound(loc, "sound/items/[pick("rip1","rip2")].ogg", 100, 1)
var/sound_to_play = pick(list('sound/items/rip1.ogg', 'sound/items/rip2.ogg'))
playsound(loc, sound_to_play, 100, 1)
break_open()
shake_animation()
desc += " <span class='danger'>It has hole in it! Maybe you shouldn't use it!</span>"
@@ -513,11 +515,11 @@
STOP_PROCESSING(SSfast_process, src)
use_internal_tank = !use_internal_tank
visible_message("<span class='warning'>You hear last bits of air coming out from [src]'s hole.Maybe the tank run out of air?</span>")
playsound(loc, "sound/effects/wind/wind_2_1.ogg", 100, 1)
playsound(loc, 'sound/effects/wind/wind_2_1.ogg', 100, 1)
return
inside_air = get_turf_air()
visible_message("<span class='warning'>You hear air howling from [src]'s hole. Maybe it is good to shut off valve on the internals tank?</span>")
playsound(loc, "sound/effects/wind/wind_2_2.ogg", 100, 1)
playsound(loc, 'sound/effects/wind/wind_2_2.ogg', 100, 1)
var/transfer_moles = inside_air.volume/(inside_air.temperature * R_IDEAL_GAS_EQUATION)
var/datum/gas_mixture/removed = tank_air.remove(transfer_moles)
code/game/objects/items/devices/geiger.dm
+1 -1
View File
@@ -18,7 +18,7 @@
/obj/item/device/geiger/proc/update_sound(playing)
if(playing && !sound_token)
sound_token = sound_player.PlayLoopingSound(src, sound_id, "sound/items/geiger.ogg", volume = geiger_volume, range = 4, falloff = 3, prefer_mute = TRUE)
sound_token = sound_player.PlayLoopingSound(src, sound_id, 'sound/items/geiger.ogg', volume = geiger_volume, range = 4, falloff = 3, prefer_mute = TRUE)
else if(!playing && sound_token)
QDEL_NULL(sound_token)
code/game/objects/items/devices/magnetic_lock.dm
+5 -3
View File
@@ -138,11 +138,13 @@
if (I.force >= 18)
user.visible_message("<span class='danger'>[user] bashes [src] with [I]!</span>", "<span class='danger'>You strike [src] with [I], damaging it!</span>")
takedamage(I.force)
playsound(loc, "sound/weapons/genhit[rand(1,3)].ogg", I.force*3, 1)
addtimer(CALLBACK(GLOBAL_PROC, /proc/playsound, loc, "sound/effects/sparks[rand(1,4)].ogg", 30, 1), 3, TIMER_CLIENT_TIME)
var/sound_to_play = pick(list('sound/weapons/genhit1.ogg', 'sound/weapons/genhit2.ogg', 'sound/weapons/genhit3.ogg'))
playsound(loc, sound_to_play, I.force*3, 1)
sound_to_play = pick(list('sound/effects/sparks1.ogg', 'sound/effects/sparks2.ogg', 'sound/effects/sparks3.ogg', 'sound/effects/sparks4.ogg'))
addtimer(CALLBACK(GLOBAL_PROC, /proc/playsound, loc, sound_to_play, 30, 1), 3, TIMER_CLIENT_TIME)
else
user.visible_message("<span class='danger'>[user] hits [src] with [I] but fails to damage it.</span>", "<span class='warning'>You hit [src] with [I], [I.force >= 10 ? "and it almost makes a dent!" : "but it appears to have no visible effect."]</span>")
playsound(loc, "sound/weapons/Genhit.ogg", I.force*2.5, 1)
playsound(loc, 'sound/weapons/Genhit.ogg', I.force*2.5, 1)
return TRUE
if(invincible)
code/game/objects/items/weapons/autopsy.dm
+1 -1
View File
@@ -140,7 +140,7 @@
for(var/mob/O in viewers(usr))
O.show_message(SPAN_NOTICE("\The [src] rattles and prints out a sheet of paper."), 1)
playsound(loc, "sound/bureaucracy/print_short.ogg", 50, 1)
playsound(loc, 'sound/bureaucracy/print_short.ogg', 50, 1)
sleep(10)
code/game/objects/items/weapons/material/twohanded.dm
+3 -3
View File
@@ -405,7 +405,7 @@
/obj/item/material/twohanded/chainsaw/proc/PowerUp()
var/turf/T = get_turf(src)
T.audible_message(SPAN_NOTICE("\The [src] rumbles to life."))
playsound(src, "sound/weapons/chainsawstart.ogg", 25, 0, 30)
playsound(src, 'sound/weapons/saw/chainsawstart.ogg', 25, 0, 30)
force_unwielded = 30
force = force_unwielded
force_wielded = 60
@@ -482,7 +482,7 @@
/obj/item/material/twohanded/chainsaw/attack(mob/M as mob, mob/living/user as mob)
. = ..()
if(powered)
playsound(loc, "sound/weapons/saw/chainsword.ogg", 25, 0, 30)
playsound(loc, 'sound/weapons/saw/chainsword.ogg', 25, 0, 30)
RemoveFuel(3)
/obj/item/material/twohanded/chainsaw/afterattack(obj/O as obj, mob/user as mob, proximity)
@@ -496,7 +496,7 @@
if(!istype(O))
user.visible_message(SPAN_DANGER("[user] revs the chainsaw!"), SPAN_WARNING("You rev the chainsaw!"), SPAN_WARNING("You hear a chainsaw rev!"))
user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
playsound(loc, "sound/weapons/saw/chainsword.ogg", 25, 0, 30)
playsound(loc, 'sound/weapons/saw/chainsword.ogg', 25, 0, 30)
RemoveFuel(3)
. = ..()
code/game/objects/items/weapons/traps.dm
+4 -3
View File
@@ -247,7 +247,7 @@
return FALSE
if ((world.time - last_shake) > 5 SECONDS)
playsound(loc, "sound/effects/grillehit.ogg", 100, 1)
playsound(loc, 'sound/effects/grillehit.ogg', 100, 1)
shake_animation()
last_shake = world.time
@@ -273,7 +273,7 @@
breakout = FALSE
to_chat(escapee, "<span class='warning'>You successfully break out!</span>")
visible_message("<span class='danger'>\The [escapee] successfully breaks out of \the [src]!</span>")
playsound(loc, "sound/effects/grillehit.ogg", 100, 1)
playsound(loc, 'sound/effects/grillehit.ogg', 100, 1)
release()
@@ -419,7 +419,8 @@
user.visible_message("<span class='notice'>[user] is trying to [anchored ? "un" : "" ]secure \the [src]!</span>",
"<span class='notice'>You are trying to [anchored ? "un" : "" ]secure \the [src]!</span>")
playsound(src.loc, "sound/items/[pick("Screwdriver", "Screwdriver2")].ogg", 50, 1)
var/sound_to_play = pick(list('sound/items/Screwdriver.ogg', 'sound/items/Screwdriver2.ogg'))
playsound(src.loc, sound_to_play, 50, 1)
if(W.use_tool(src, user, 30, volume = 50))
density = !density