A few more runtime fixes.

This commit is contained in:
Ghommie
2020-01-24 03:30:34 +01:00
parent 14a33ee7dc
commit 67f58b8a59
6 changed files with 14 additions and 16 deletions
+4 -5
View File
@@ -406,12 +406,11 @@
lying_prev = 0 lying_prev = 0
/obj/machinery/jukebox/proc/dance_over() /obj/machinery/jukebox/proc/dance_over()
SSjukeboxes.removejukebox(SSjukeboxes.findjukeboxindex(src)) var/position = SSjukeboxes.findjukeboxindex(src)
if(!position)
return
SSjukeboxes.removejukebox(position)
STOP_PROCESSING(SSobj, src) STOP_PROCESSING(SSobj, src)
for(var/mob/living/L in rangers)
if(!L || !L.client)
continue
L.stop_sound_channel(CHANNEL_JUKEBOX)
rangers = list() rangers = list()
/obj/machinery/jukebox/disco/dance_over() /obj/machinery/jukebox/disco/dance_over()
@@ -54,7 +54,7 @@
..() ..()
/datum/species/plasmaman/before_equip_job(datum/job/J, mob/living/carbon/human/H, visualsOnly = FALSE) /datum/species/plasmaman/before_equip_job(datum/job/J, mob/living/carbon/human/H, visualsOnly = FALSE)
var/current_job = J.title var/current_job = J?.title
var/datum/outfit/plasmaman/O = new /datum/outfit/plasmaman var/datum/outfit/plasmaman/O = new /datum/outfit/plasmaman
switch(current_job) switch(current_job)
if("Chaplain") if("Chaplain")
@@ -148,8 +148,8 @@
/obj/machinery/chem_master/on_deconstruction() /obj/machinery/chem_master/on_deconstruction()
var/atom/A = drop_location() var/atom/A = drop_location()
beaker.forceMove(A) beaker?.forceMove(A)
bottle.forceMove(A) bottle?.forceMove(A)
return ..() return ..()
/obj/machinery/chem_master/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \ /obj/machinery/chem_master/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \
@@ -22,13 +22,9 @@
if(istype(M)) if(istype(M))
if(user.a_intent == INTENT_HARM) if(user.a_intent == INTENT_HARM)
var/R
M.visible_message("<span class='danger'>[user] splashes the contents of [src] onto [M]!</span>", \ M.visible_message("<span class='danger'>[user] splashes the contents of [src] onto [M]!</span>", \
"<span class='userdanger'>[user] splashes the contents of [src] onto [M]!</span>") "<span class='userdanger'>[user] splashes the contents of [src] onto [M]!</span>")
if(reagents) var/R = reagents?.log_list()
for(var/datum/reagent/A in reagents.reagent_list)
R += A.type + " ("
R += num2text(A.volume) + "),"
if(isturf(target) && reagents.reagent_list.len && thrownby) if(isturf(target) && reagents.reagent_list.len && thrownby)
log_combat(thrownby, target, "splashed (thrown) [english_list(reagents.reagent_list)]") log_combat(thrownby, target, "splashed (thrown) [english_list(reagents.reagent_list)]")
message_admins("[ADMIN_LOOKUPFLW(thrownby)] splashed (thrown) [english_list(reagents.reagent_list)] on [target] at [ADMIN_VERBOSEJMP(target)].") message_admins("[ADMIN_LOOKUPFLW(thrownby)] splashed (thrown) [english_list(reagents.reagent_list)] on [target] at [ADMIN_VERBOSEJMP(target)].")
@@ -84,6 +84,8 @@
to_chat(owner, "<span class='notice'>You feel a faint buzzing as your reviver implant starts patching your wounds...</span>") to_chat(owner, "<span class='notice'>You feel a faint buzzing as your reviver implant starts patching your wounds...</span>")
/obj/item/organ/cyberimp/chest/reviver/proc/heal() /obj/item/organ/cyberimp/chest/reviver/proc/heal()
if(!owner)
return
if(owner.getOxyLoss()) if(owner.getOxyLoss())
owner.adjustOxyLoss(-5) owner.adjustOxyLoss(-5)
revive_cost += 0.5 SECONDS revive_cost += 0.5 SECONDS
+4 -3
View File
@@ -60,9 +60,10 @@
//Just in case //Just in case
/obj/item/organ/liver/Remove(mob/living/carbon/M, special = 0) /obj/item/organ/liver/Remove(mob/living/carbon/M, special = 0)
..() ..()
M.remove_movespeed_modifier(LIVER_SWELLING_MOVE_MODIFY) if(!QDELETED(M))
M.ResetBloodVol() //At the moment, this shouldn't allow application twice. You either have this OR a thirsty ferret. M.remove_movespeed_modifier(LIVER_SWELLING_MOVE_MODIFY)
sizeMoveMod(1, M) M.ResetBloodVol() //At the moment, this shouldn't allow application twice. You either have this OR a thirsty ferret.
sizeMoveMod(1, M)
//Applies some of the effects to the patient. //Applies some of the effects to the patient.
/obj/item/organ/liver/proc/pharmacokinesis() /obj/item/organ/liver/proc/pharmacokinesis()