From 9c62fa0d42119a37f73ecebd297121c38be34867 Mon Sep 17 00:00:00 2001 From: "L.E.D" Date: Thu, 29 Dec 2016 07:51:43 -0500 Subject: [PATCH] fuck yeah (#93) --- code/modules/power/supermatter/supermatter.dm | 26 ++++++++++++++++++ sound/ambience/supermatterglow.ogg | Bin 0 -> 6588 bytes 2 files changed, 26 insertions(+) create mode 100644 sound/ambience/supermatterglow.ogg diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm index 0d7d551921..1286775efa 100644 --- a/code/modules/power/supermatter/supermatter.dm +++ b/code/modules/power/supermatter/supermatter.dm @@ -48,6 +48,8 @@ var/oxygen = 0 // Moving this up here for easier debugging. + var/playingglowsound //for sound loop + //Temporary values so that we can optimize this //How much the bullets damage should be multiplied by when it is added to the internal variables var/config_bullet_energy = 2 @@ -164,11 +166,17 @@ if(oxygen > 0.8) // with a perfect gas mix, make the power less based on heat icon_state = "[base_icon_state]_glow" + if(!playingglowsound) + start_glow_sound() + else // in normal mode, base the produced energy around the heat temp_factor = 30 icon_state = base_icon_state + if(playingglowsound) + playingglowsound = FALSE + power = max( (removed.temperature * temp_factor / T0C) * oxygen + power, 0) //Total laser power plus an overload //We've generated power, now let's transfer it to the collectors for storing/usage @@ -209,6 +217,24 @@ return 1 +/obj/machinery/power/supermatter_shard/proc/start_glow_sound() //starts the loop + if(!playingglowsound) + playingglowsound = TRUE + playsound(src, 'sound/ambience/supermatterglow.ogg', 50, 0) + addtimer(src, "play_glow_sound", 1.2, FALSE) + return TRUE + else + return FALSE + +/obj/machinery/power/supermatter_shard/proc/play_glow_sound() // loop + if(playingglowsound) + playsound(src, 'sound/ambience/supermatterglow.ogg', 50, 0) + addtimer(src, "play_glow_sound", 1.2, FALSE) + return TRUE + else + playingglowsound = FALSE + return FALSE + /obj/machinery/power/supermatter_shard /obj/machinery/power/supermatter_shard/bullet_act(obj/item/projectile/Proj) diff --git a/sound/ambience/supermatterglow.ogg b/sound/ambience/supermatterglow.ogg new file mode 100644 index 0000000000000000000000000000000000000000..7d0632be22e29087220613631b96b9c689532b67 GIT binary patch literal 6588 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 literal 0 HcmV?d00001