From 6e17e81dbad838b14b494a04f1687acc56946b13 Mon Sep 17 00:00:00 2001 From: shellspeed1 <46614774+shellspeed1@users.noreply.github.com> Date: Wed, 25 Sep 2019 20:57:28 -0700 Subject: [PATCH 1/5] Update iv_drip.dm --- code/game/machinery/iv_drip.dm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/code/game/machinery/iv_drip.dm b/code/game/machinery/iv_drip.dm index b217c14e..edc7685b 100644 --- a/code/game/machinery/iv_drip.dm +++ b/code/game/machinery/iv_drip.dm @@ -13,8 +13,8 @@ var/obj/item/reagent_containers/beaker = null var/static/list/drip_containers = typecacheof(list(/obj/item/reagent_containers/blood, /obj/item/reagent_containers/food, - /obj/item/reagent_containers/glass)) - + /obj/item/reagent_containers/glass, + /obj/item/reagent_containers/chem_pack)) /obj/machinery/iv_drip/Initialize() . = ..() update_icon() @@ -129,9 +129,7 @@ if(istype(beaker, /obj/item/reagent_containers/blood)) // speed up transfer on blood packs transfer_amount = 10 - var/fraction = min(transfer_amount/beaker.reagents.total_volume, 1) //the fraction that is transfered of the total volume - beaker.reagents.reaction(attached, INJECT, fraction, FALSE) //make reagents reacts, but don't spam messages - beaker.reagents.trans_to(attached, transfer_amount) + beaker.reagents.trans_to(attached, transfer_amount, method = INJECT, show_message = FALSE) update_icon() // Take blood From ff749a14aac62bac60824b02f8d270e72861d052 Mon Sep 17 00:00:00 2001 From: shellspeed1 <46614774+shellspeed1@users.noreply.github.com> Date: Wed, 25 Sep 2019 21:04:37 -0700 Subject: [PATCH 2/5] adds iv bags to chem bag allowed --- code/game/objects/items/storage/bags.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/storage/bags.dm b/code/game/objects/items/storage/bags.dm index 4e719625..7ab85084 100644 --- a/code/game/objects/items/storage/bags.dm +++ b/code/game/objects/items/storage/bags.dm @@ -364,7 +364,7 @@ STR.max_combined_w_class = 200 STR.max_items = 50 STR.insert_preposition = "in" - STR.can_hold = typecacheof(list(/obj/item/reagent_containers/pill, /obj/item/reagent_containers/glass/beaker, /obj/item/reagent_containers/glass/bottle)) + STR.can_hold = typecacheof(list(/obj/item/reagent_containers/pill, /obj/item/reagent_containers/glass/beaker, /obj/item/reagent_containers/glass/bottle,/obj/item/reagent_containers/chem_pack)) /* * Biowaste bag (mostly for xenobiologists) From bdda040ede4e2eec6c91d3868fb4d4def039a4b8 Mon Sep 17 00:00:00 2001 From: shellspeed1 <46614774+shellspeed1@users.noreply.github.com> Date: Wed, 25 Sep 2019 21:50:54 -0700 Subject: [PATCH 3/5] Makes sprite work again for filling it by adding missing sprites. --- icons/obj/reagentfillings.dmi | Bin 3885 -> 4337 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/icons/obj/reagentfillings.dmi b/icons/obj/reagentfillings.dmi index 1b8dacf36daaffb08e40ef7351b9d349384bf59c..fa74d50e5198ca768d92575ed0847362ff366824 100644 GIT binary patch literal 4337 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 O18{V3wy(7HO!^<7M%st~ literal 3885 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 Date: Wed, 25 Sep 2019 21:51:07 -0700 Subject: [PATCH 4/5] Lets you put them in chem fridges --- code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm b/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm index 483055cb..18c5075b 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm @@ -399,7 +399,7 @@ return TRUE if(!O.reagents || !O.reagents.reagent_list.len) // other empty containers not accepted return FALSE - if(istype(O, /obj/item/reagent_containers/syringe) || istype(O, /obj/item/reagent_containers/glass/bottle) || istype(O, /obj/item/reagent_containers/glass/beaker) || istype(O, /obj/item/reagent_containers/spray) || istype(O, /obj/item/reagent_containers/medspray)) + if(istype(O, /obj/item/reagent_containers/syringe) || istype(O, /obj/item/reagent_containers/glass/bottle) || istype(O, /obj/item/reagent_containers/glass/beaker) || istype(O, /obj/item/reagent_containers/spray) || istype(O, /obj/item/reagent_containers/medspray)|| istype(O, /obj/item/reagent_containers/chem_pack)) return TRUE return FALSE From 6d860b6bc1ec37ee846c76782d1c377fd6129011 Mon Sep 17 00:00:00 2001 From: shellspeed1 <46614774+shellspeed1@users.noreply.github.com> Date: Thu, 26 Sep 2019 08:57:25 -0700 Subject: [PATCH 5/5] quote, you were right, breaks iv drips. --- code/game/machinery/iv_drip.dm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/game/machinery/iv_drip.dm b/code/game/machinery/iv_drip.dm index edc7685b..54b42a14 100644 --- a/code/game/machinery/iv_drip.dm +++ b/code/game/machinery/iv_drip.dm @@ -129,7 +129,9 @@ if(istype(beaker, /obj/item/reagent_containers/blood)) // speed up transfer on blood packs transfer_amount = 10 - beaker.reagents.trans_to(attached, transfer_amount, method = INJECT, show_message = FALSE) + var/fraction = min(transfer_amount/beaker.reagents.total_volume, 1) //the fraction that is transfered of the total volume + beaker.reagents.reaction(attached, INJECT, fraction, FALSE) //make reagents reacts, but don't spam messages + beaker.reagents.trans_to(attached, transfer_amount) update_icon() // Take blood