Finish porting bay's timer SS (#12978)

This commit is contained in:
Matt Atlas
2022-01-29 13:07:51 -03:00
committed by GitHub
parent edb1c08178
commit 2842f4e39f
18 changed files with 381 additions and 303 deletions
+1 -1
View File
@@ -161,7 +161,7 @@
src.custom_emote(VISIBLE_MESSAGE,"presses a button on their suit, followed by a polite bow.")
spark(src, 5, alldirs)
addtimer(CALLBACK(GLOBAL_PROC, .proc/qdel, src), 10, TIMER_CLIENT_TIME)
QDEL_IN(src, 10)
animate(src, alpha = 0, time = 9, easing = QUAD_EASING)
if(key)
if(client.holder && client.holder.original_mob)
@@ -24,7 +24,6 @@
var/datum/reagents/oil
var/optimal_oil = 9000//90 litres of cooking oil
var/datum/looping_sound/deep_fryer/fry_loop
/obj/machinery/appliance/cooker/fryer/examine(var/mob/user)
. = ..()
@@ -41,7 +40,6 @@
//Sometimes the fryer will start with much less than full oil, significantly impacting efficiency until filled
variance = rand()*0.5
oil.add_reagent(/decl/reagent/nutriment/triglyceride/oil/corn, optimal_oil*(1 - variance))
fry_loop = new(list(src), FALSE)
/obj/machinery/appliance/cooker/fryer/heat_up()
if (..())
@@ -74,10 +72,8 @@
/obj/machinery/appliance/cooker/fryer/update_icon()
if (cooking)
icon_state = on_icon
fry_loop.start()
else
icon_state = off_icon
fry_loop.stop(src)
..()
//Fryer gradually infuses any cooked food with oil. Moar calories
@@ -19,6 +19,7 @@
using = new /obj/screen/new_player/selection/join_game(src)
using.name = "Join Game"
using.hud = src
adding += using
using = new /obj/screen/new_player/selection/settings(src)
@@ -62,7 +62,7 @@
src.custom_emote(VISIBLE_MESSAGE, "politely beeps as its lights start to flash.")
spark(src, 5, alldirs)
addtimer(CALLBACK(GLOBAL_PROC, .proc/qdel, src), 10, TIMER_CLIENT_TIME)
QDEL_IN(src, 10)
animate(src, alpha = 0, time = 9, easing = QUAD_EASING)
if(key)
-4
View File
@@ -13,11 +13,9 @@
var/open = FALSE
var/power_output = 1
has_special_power_checks = TRUE
var/datum/looping_sound/generator/soundloop
/obj/machinery/power/port_gen/Initialize()
. = ..()
soundloop = new(list(src), active)
/obj/machinery/power/port_gen/proc/IsBroken()
return (stat & (BROKEN|EMPED))
@@ -51,11 +49,9 @@
/obj/machinery/power/port_gen/attack_hand(mob/user)
if(..())
update_icon()
soundloop.stop()
return
if(!anchored)
update_icon()
soundloop.start()
return
/obj/machinery/power/port_gen/update_icon()
-9
View File
@@ -108,16 +108,12 @@
var/debug = 0
var/last_message_time = -100 //for message
var/datum/looping_sound/supermatter/soundloop
/obj/machinery/power/supermatter/Initialize()
. = ..()
radio = new /obj/item/device/radio{channels=list("Engineering")}(src)
soundloop = new(list(src), TRUE)
/obj/machinery/power/supermatter/Destroy()
QDEL_NULL(radio)
QDEL_NULL(soundloop)
. = ..()
/obj/machinery/power/supermatter/proc/explode()
@@ -209,11 +205,6 @@
if(!istype(L)) //We are in a crate or somewhere that isn't turf, if we return to turf resume processing but for now.
return //Yeah just stop.
if(power)
soundloop.volume = min(100, (round(power/7)+1))
else
soundloop.volume = 0
if(damage > explosion_point)
if(!exploded)
if(!istype(L, /turf/space))