From 31d459f2306d261c819ad87723ef8f718ece5b23 Mon Sep 17 00:00:00 2001 From: Heroman Date: Sat, 14 Sep 2019 15:01:58 +1000 Subject: [PATCH] Fixes Blood-Onator --- code/game/machinery/vending_vr.dm | 6 +-- .../reagent_containers/blood_pack_vr.dm | 37 +++++++++++++++++++ 2 files changed, 40 insertions(+), 3 deletions(-) diff --git a/code/game/machinery/vending_vr.dm b/code/game/machinery/vending_vr.dm index 5c77230b3f..0bf7b94714 100644 --- a/code/game/machinery/vending_vr.dm +++ b/code/game/machinery/vending_vr.dm @@ -139,9 +139,9 @@ icon_state = "blood" idle_power_usage = 211 req_access = list(access_medical) - products = list(/obj/item/weapon/reagent_containers/blood/APlus = 3,/obj/item/weapon/reagent_containers/blood/AMinus = 3, - /obj/item/weapon/reagent_containers/blood/BPlus = 3,/obj/item/weapon/reagent_containers/blood/BMinus = 3, - /obj/item/weapon/reagent_containers/blood/OPlus = 2,/obj/item/weapon/reagent_containers/blood/OMinus = 5, + products = list(/obj/item/weapon/reagent_containers/blood/prelabeled/APlus = 3,/obj/item/weapon/reagent_containers/blood/prelabeled/AMinus = 3, + /obj/item/weapon/reagent_containers/blood/prelabeled/BPlus = 3,/obj/item/weapon/reagent_containers/blood/prelabeled/BMinus = 3, + /obj/item/weapon/reagent_containers/blood/prelabeled/OPlus = 2,/obj/item/weapon/reagent_containers/blood/prelabeled/OMinus = 5, /obj/item/weapon/reagent_containers/blood/empty = 5) contraband = list(/obj/item/weapon/reagent_containers/glass/bottle/stoxin = 2) req_log_access = access_cmo diff --git a/code/modules/reagents/reagent_containers/blood_pack_vr.dm b/code/modules/reagents/reagent_containers/blood_pack_vr.dm index e1d616aeca..b4e27fb95a 100644 --- a/code/modules/reagents/reagent_containers/blood_pack_vr.dm +++ b/code/modules/reagents/reagent_containers/blood_pack_vr.dm @@ -19,3 +19,40 @@ return else return + +/obj/item/weapon/reagent_containers/blood/prelabeled + name = "IV Pack" + desc = "Holds liquids used for transfusion. This one's label seems to be hardprinted." + +/obj/item/weapon/reagent_containers/blood/prelabeled/update_iv_label() + return + +/obj/item/weapon/reagent_containers/blood/prelabeled/APlus + name = "IV Pack (A+)" + desc = "Holds liquids used for transfusion. This one's label seems to be hardprinted. This one is labeled A+" + blood_type = "A+" + +/obj/item/weapon/reagent_containers/blood/prelabeled/AMinus + name = "IV Pack (A-)" + desc = "Holds liquids used for transfusion. This one's label seems to be hardprinted. This one is labeled A_" + blood_type = "A-" + +/obj/item/weapon/reagent_containers/blood/prelabeled/BPlus + name = "IV Pack (B+)" + desc = "Holds liquids used for transfusion. This one's label seems to be hardprinted. This one is labeled B+" + blood_type = "B+" + +/obj/item/weapon/reagent_containers/blood/prelabeled/BMinus + name = "IV Pack (B-)" + desc = "Holds liquids used for transfusion. This one's label seems to be hardprinted. This one is labeled B-" + blood_type = "B-" + +/obj/item/weapon/reagent_containers/blood/prelabeled/OPlus + name = "IV Pack (O+)" + desc = "Holds liquids used for transfusion. This one's label seems to be hardprinted. This one is labeled O+" + blood_type = "O+" + +/obj/item/weapon/reagent_containers/blood/prelabeled/OMinus + name = "IV Pack (O-)" + desc = "Holds liquids used for transfusion. This one's label seems to be hardprinted. This one is labeled O-" + blood_type = "O-" \ No newline at end of file