cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-27 06:54:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

sadf (#18782)

Browse Source
This commit is contained in:
Fluffy
2024-03-27 09:02:06 +00:00
committed by GitHub
parent a6bf5798e4
commit 995dbaf430
27 changed files with 80 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/overmap/overmap_object.dm
+3 -3
View File
@@ -192,20 +192,20 @@
O.maptext_x = -10
O.maptext_width = 72
O.maptext_height = 32
playsound(C, 'sound/items/goggles_charge.ogg')
playsound(C, 'sound/items/goggles_charge.ogg', 70)
C.visible_message(SPAN_DANGER("[usr] engages the targeting systems, acquiring a lock on the target!"))
if(istype(O, /obj/effect/overmap/visitable/ship))
var/obj/effect/overmap/visitable/ship/S = O
for(var/obj/machinery/computer/ship/SH in S.consoles)
if(istype(SH, /obj/machinery/computer/ship/sensors))
playsound(SH, 'sound/effects/ship_weapons/locked_on.ogg')
playsound(SH, 'sound/effects/ship_weapons/locked_on.ogg', 70)
SH.visible_message(SPAN_DANGER("<font size=4>\The [SH] beeps alarmingly, signaling an enemy lock-on!</font>"))
else
C.targeting = FALSE
/obj/effect/overmap/visitable/proc/detarget(var/obj/effect/overmap/O, var/obj/machinery/computer/C)
if(C)
playsound(C, 'sound/items/rfd_interrupt.ogg')
playsound(C, 'sound/items/rfd_interrupt.ogg', 70)
if(O)
O.cut_overlay(O.targeted_overlay)
O.maptext = null
code/modules/overmap/ship_weaponry/_ship_ammo_loader.dm
+1 -1
View File
@@ -79,7 +79,7 @@
if(do_after(H, weapon.load_time, src, DO_UNIQUE))
if(weapon.load_ammunition(SA, H))
visible_message(SPAN_NOTICE("[H] loads \the [SA] into \the [src]!"))
playsound(src, 'sound/weapons/ammo_load.ogg')
playsound(src, 'sound/weapons/ammo_load.ogg', 70)
return TRUE
else
to_chat(H, SPAN_WARNING("The loader is full!"))
code/modules/overmap/ship_weaponry/_targeting_console.dm
+1 -1
View File
@@ -112,7 +112,7 @@
var/result = cannon.firing_command(linked.targeting, LM, platform_direction ? text2dir(platform_direction) : 0)
if(isliving(usr) && !isAI(usr) && usr.Adjacent(src))
visible_message(SPAN_WARNING("[usr] presses the fire button!"))
playsound(src, 'sound/machines/compbeep1.ogg')
playsound(src, 'sound/machines/compbeep1.ogg', 60)
switch(result)
if(SHIP_GUN_ERROR_NO_AMMO)
to_chat(usr, SPAN_WARNING("The console shows an error screen: the weapon isn't loaded!"))
code/modules/overmap/ship_weaponry/projectiles/_overmap_projectiles.dm
+1 -1
View File
@@ -88,7 +88,7 @@
qdel(ammunition.original_projectile) //No longer needed.
var/turf/laze = get_turf(entry_target)
ammunition.original_projectile = widowmaker
playsound(laze, 'sound/weapons/gunshot/ship_weapons/orbital_travel.ogg')
playsound(laze, 'sound/weapons/gunshot/ship_weapons/orbital_travel.ogg', 60)
laze.visible_message(SPAN_DANGER("<font size=6>A bright star is getting closer from the sky...!</font>"))
sleep(11 SECONDS) //Let the sound play!
widowmaker.primed = TRUE
code/modules/overmap/ship_weaponry/weaponry/leviathan.dm
+3 -3
View File
@@ -334,7 +334,7 @@
key = LK
user.drop_from_inventory(attacking_item, src)
icon_state = "safeguard_open"
playsound(src, 'sound/effects/ship_weapons/levi_key_insert.ogg')
playsound(src, 'sound/effects/ship_weapons/levi_key_insert.ogg', 50)
/obj/machinery/leviathan_safeguard/attack_hand(mob/user)
if(key && !stat && opened && !locked)
@@ -345,7 +345,7 @@
flick("safeguard_locking", src)
icon_state = "safeguard_locked"
locked = TRUE
playsound(src, 'sound/effects/ship_weapons/levi_key_twist.ogg')
playsound(src, 'sound/effects/ship_weapons/levi_key_twist.ogg', 50)
button.open()
/obj/machinery/leviathan_button
@@ -401,7 +401,7 @@
if(length(possible_entry_points) && !(targeted_landmark == SHIP_HAZARD_TARGET))
landmark = possible_entry_points[targeted_landmark]
if(do_after(user, 1 SECOND) && !use_check_and_message(user))
playsound(src, 'sound/effects/ship_weapons/levi_button_press.ogg')
playsound(src, 'sound/effects/ship_weapons/levi_button_press.ogg', 50)
visible_message(SPAN_DANGER("[user] presses \the [src]!"))
for(var/obj/machinery/ship_weapon/leviathan/LT in linked.ship_weapons)
if(istype(LT))
code/modules/overmap/ship_weaponry/weaponry/longbow_ammo.dm
+2 -2
View File
@@ -19,7 +19,7 @@
visible_message(SPAN_NOTICE("You connect \the [P] to the casing!"), SPAN_NOTICE("[H] connects \the [P] to the casing!"))
H.drop_from_inventory(P)
add_primer(P)
playsound(src, 'sound/machines/rig/rig_deploy.ogg')
playsound(src, 'sound/machines/rig/rig_deploy.ogg', 40)
if(istype(attacking_item, /obj/item/warhead) && !warhead)
var/obj/item/warhead/W = attacking_item
user.visible_message( SPAN_NOTICE("[H] starts connecting \the [W] to the casing..."), SPAN_NOTICE("You start connecting \the [W] to the casing..."))
@@ -27,7 +27,7 @@
visible_message(SPAN_NOTICE("You connect \the [W] to the casing!"), SPAN_NOTICE("[H] connects \the [W] to the casing!"))
H.drop_from_inventory(W)
add_warhead(W)
playsound(src, 'sound/machines/rig/rig_deploy.ogg')
playsound(src, 'sound/machines/rig/rig_deploy.ogg', 40)
update_status()
/obj/item/ship_ammunition/longbow/can_be_loaded()
code/modules/overmap/ships/computers/sensors.dm
+1 -1
View File
@@ -370,7 +370,7 @@
var/user_name = beacon.user_name
var/accent_icon = sender.get_accent_icon()
visible_message(SPAN_NOTICE("\The [src] beeps a few times as it replays the distress message."))
playsound(src, 'sound/machines/compbeep5.ogg')
playsound(src, 'sound/machines/compbeep5.ogg', 50)
visible_message(SPAN_ITALIC("[accent_icon] <b>[user_name]</b> explains, \"[beacon.distress_message]\""))
return TRUE