mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 18:22:39 +00:00
Merge pull request #6368 from Rykka-Stormheart/shep-dev-more-sounds
Sound Additions + Tweaks
This commit is contained in:
@@ -25,6 +25,7 @@
|
||||
use_power = USE_POWER_OFF //doesn't use APC power
|
||||
interact_offline = TRUE // don't check stat & NOPOWER|BROKEN for our UI. We check BROKEN ourselves.
|
||||
var/id //for button usage
|
||||
var/datum/looping_sound/shield_generator/shield_hum
|
||||
|
||||
/obj/machinery/shield_gen/advanced
|
||||
name = "advanced bubble shield generator"
|
||||
@@ -41,10 +42,12 @@
|
||||
if(get_dir(cap, src) == cap.dir)
|
||||
capacitors |= cap
|
||||
cap.owned_gen = src
|
||||
shield_hum = new(list(src), FALSE)
|
||||
return ..()
|
||||
|
||||
/obj/machinery/shield_gen/Destroy()
|
||||
QDEL_LIST_NULL(field)
|
||||
QDEL_NULL(shield_hum)
|
||||
return ..()
|
||||
|
||||
/obj/machinery/shield_gen/emag_act(var/remaining_charges, var/mob/user)
|
||||
@@ -245,6 +248,7 @@
|
||||
to_chat(M, "\icon[src][bicon(src)] You hear heavy droning start up.")
|
||||
for(var/obj/effect/energy_field/E in field) // Update the icons here to ensure all the shields have been made already.
|
||||
E.update_icon()
|
||||
shield_hum.start()
|
||||
else
|
||||
for(var/obj/effect/energy_field/D in field)
|
||||
field.Remove(D)
|
||||
@@ -253,11 +257,13 @@
|
||||
|
||||
for(var/mob/M in view(5,src))
|
||||
to_chat(M, "\icon[src][bicon(src)] You hear heavy droning fade out.")
|
||||
shield_hum.stop()
|
||||
|
||||
/obj/machinery/shield_gen/update_icon()
|
||||
if(stat & BROKEN)
|
||||
icon_state = "broke"
|
||||
set_light(0)
|
||||
shield_hum.stop()
|
||||
else
|
||||
if (src.active)
|
||||
icon_state = "generator1"
|
||||
|
||||
Reference in New Issue
Block a user