From e36d922f1607af4d3a1892224cd17e144b6b3513 Mon Sep 17 00:00:00 2001 From: Dip Date: Sat, 24 Oct 2020 04:14:10 -0300 Subject: [PATCH 1/2] fixes --- yogstation/code/modules/power/energyharvester.dm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/yogstation/code/modules/power/energyharvester.dm b/yogstation/code/modules/power/energyharvester.dm index cffffa9b..bebeadba 100644 --- a/yogstation/code/modules/power/energyharvester.dm +++ b/yogstation/code/modules/power/energyharvester.dm @@ -42,6 +42,9 @@ else I.play_tool_sound(src) STOP_PROCESSING(SSobj, src) + soundloop.stop() + active = 0 + set_light(0) anchored = 0 density = 0 user.visible_message( \ @@ -52,15 +55,15 @@ /obj/item/energy_harvester/process() if(!attached || !anchored) return PROCESS_KILL - var/datum/powernet/PN = attached.powernet if(PN) - set_light(1,1,LIGHT_COLOR_ORANGE) var/power_avaliable = PN.netexcess if(power_avaliable <= 0) + set_light(1,1,LIGHT_COLOR_ORANGE) soundloop.stop() active = 0 return + set_light(1,1,LIGHT_COLOR_GREEN) soundloop.start() active = 1 power_avaliable = min(power_avaliable, drain_rate) @@ -74,7 +77,10 @@ soundloop = new(list(src), FALSE) /obj/item/energy_harvester/Destroy() + soundloop.stop() QDEL_NULL(soundloop) + active = 0 + set_light(0) return ..() /obj/item/energy_harvester/examine(mob/user) From 6abb884fa45b22d47932e42272e99cf7bd9c5a29 Mon Sep 17 00:00:00 2001 From: Dip Date: Mon, 26 Oct 2020 18:11:06 -0300 Subject: [PATCH 2/2] fixes the sleepy pen and an invalid reagent --- code/modules/paperwork/pen.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm index acb30365..1d733354 100644 --- a/code/modules/paperwork/pen.dm +++ b/code/modules/paperwork/pen.dm @@ -159,12 +159,13 @@ if(reagents.total_volume) if(M.reagents) reagents.reaction(M, INJECT) + reagents.trans_to(M, reagents.total_volume) /obj/item/pen/sleepy/Initialize() . = ..() create_reagents(45, OPENCONTAINER) - reagents.add_reagent("chloralhydratedelayed", 20) + reagents.add_reagent("chloralhydrate", 20) reagents.add_reagent("mutetoxin", 15) reagents.add_reagent("tirizene", 10)