diff --git a/code/game/machinery/iv_drip.dm b/code/game/machinery/iv_drip.dm index 65c62f2eb07..77f4f9f052b 100644 --- a/code/game/machinery/iv_drip.dm +++ b/code/game/machinery/iv_drip.dm @@ -200,13 +200,13 @@ if(istype(reagent_container, /obj/item/reagent_containers/blood)) // speed up transfer on blood packs real_transfer_amount *= 2 - target_reagents.trans_to_mob(attached_victim, real_transfer_amount * delta_time * 0.5, type = CHEM_INJECT) + target_reagents.trans_to_mob(attached_victim, real_transfer_amount, type = CHEM_INJECT) update_appearance() // Take blood else //? injection_mode == IV_TAKING var/amount = target_reagents.maximum_volume - target_reagents.total_volume - amount = min(amount, 4) * delta_time * 0.5 + amount = clamp(amount, 0, transfer_rate) // If the beaker is full, ping if(!amount) if(prob(5)) @@ -218,7 +218,7 @@ visible_message(SPAN_HEAR("[src] beeps loudly.")) playsound(loc, 'sound/machines/twobeep_high.ogg', 50, TRUE) var/atom/movable/target = reagent_container - attached_victim.inject_blood(target, amount) + attached_victim.take_blood(target, amount) update_appearance() /// Called when an IV is attached. diff --git a/code/modules/asset_cache/asset_pack.dm b/code/modules/asset_cache/asset_pack.dm index daf9a942686..0076c8558d8 100644 --- a/code/modules/asset_cache/asset_pack.dm +++ b/code/modules/asset_cache/asset_pack.dm @@ -138,7 +138,7 @@ . = list() for(var/filename in files) var/file = files[filename] - var/datum/asset_item/item = new(filename, file, do_not_mangle, absolute, FALSE) + var/datum/asset_item/item = new(filename, file, do_not_mangle || absolute, absolute, FALSE) .[filename] = item if(do_not_separate && !absolute) // if absolute, it's pointless to generate namespace as we'll be in the same folder anyways. // generate their namespace and assign diff --git a/code/modules/mob/living/carbon/human/blood.dm b/code/modules/mob/living/carbon/human/blood.dm index 1e02d8efeaf..cd005fd3b24 100644 --- a/code/modules/mob/living/carbon/human/blood.dm +++ b/code/modules/mob/living/carbon/human/blood.dm @@ -235,8 +235,12 @@ var/const/CE_STABLE_THRESHOLD = 0.5 var/datum/reagent/B = get_blood(container.reagents) if(!B) B = new /datum/reagent/blood - B.holder = container + B.holder = container.reagents B.volume += amount + B.initialize_data() + // todo: burn this file with fire + container.reagents.reagent_list |= B + container.reagents.update_total() //set reagent data B.data["donor"] = src @@ -298,7 +302,7 @@ var/const/CE_STABLE_THRESHOLD = 0.5 reagents.add_reagent("blood", amount, injected.data) reagents.update_total() return - + fixblood_if_broken() var/datum/reagent/blood/our = get_blood(vessel) diff --git a/code/modules/tooltip/tooltip.dm b/code/modules/tooltip/tooltip.dm index 17d69a95664..9803d4fb96a 100644 --- a/code/modules/tooltip/tooltip.dm +++ b/code/modules/tooltip/tooltip.dm @@ -46,8 +46,7 @@ Notes: addtimer(CALLBACK(src, PROC_REF(init)), 0) /datum/tooltip/proc/init() - var/datum/asset_pack/stuff = SSassets.ready_asset_pack(/datum/asset_pack/simple/jquery) - SSassets.send_asset_pack(owner, stuff) + SSassets.send_asset_pack(owner, /datum/asset_pack/simple/jquery) owner << browse(file2text('code/modules/tooltip/tooltip.html'), "window=[control]") /datum/tooltip/proc/show(atom/movable/thing, params = null, title = null, content = null, theme = "default", special = "none")