From 3c38ff32be64824edd284f91d76c47b12c7a61d1 Mon Sep 17 00:00:00 2001 From: Katskan Date: Sat, 23 Sep 2023 08:48:23 -0400 Subject: [PATCH 1/3] Medkit Bloodbag --- .../game/machinery/vending/vendor_types/crew/synthetic.dm | 1 + code/game/objects/items/storage/pouch.dm | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/code/game/machinery/vending/vendor_types/crew/synthetic.dm b/code/game/machinery/vending/vendor_types/crew/synthetic.dm index 819040e5821d..c3f44dcb7959 100644 --- a/code/game/machinery/vending/vendor_types/crew/synthetic.dm +++ b/code/game/machinery/vending/vendor_types/crew/synthetic.dm @@ -37,6 +37,7 @@ list("Roller Bed", 4, /obj/item/roller, null, VENDOR_ITEM_REGULAR), list("Stasis Bag", 6, /obj/item/bodybag/cryobag, null, VENDOR_ITEM_REGULAR), list("MS-11 Smart Refill Tank", 6, /obj/item/reagent_container/glass/minitank, null, VENDOR_ITEM_REGULAR), + list("Blood Bag (O-)", 4, /obj/item/reagent_container/blood/OMinus, null, VENDOR_ITEM_REGULAR), list("Pillbottle (Bicaridine)", 5, /obj/item/storage/pill_bottle/bicaridine, null, VENDOR_ITEM_RECOMMENDED), list("Pillbottle (Dexalin)", 5, /obj/item/storage/pill_bottle/dexalin, null, VENDOR_ITEM_REGULAR), diff --git a/code/game/objects/items/storage/pouch.dm b/code/game/objects/items/storage/pouch.dm index 01b9506f073b..2fb4fccb31a7 100644 --- a/code/game/objects/items/storage/pouch.dm +++ b/code/game/objects/items/storage/pouch.dm @@ -812,6 +812,14 @@ /obj/item/roller = list(SKILL_MEDICAL, SKILL_MEDICAL_MEDIC), /obj/item/bodybag = list(SKILL_MEDICAL, SKILL_MEDICAL_MEDIC), /obj/item/reagent_container/blood = list(SKILL_MEDICAL, SKILL_MEDICAL_MEDIC), + /obj/item/reagent_container/blood/OMinus = list(SKILL_MEDICAL, SKILL_MEDICAL_MEDIC), + /obj/item/reagent_container/blood/OPlus = list(SKILL_MEDICAL, SKILL_MEDICAL_MEDIC), + /obj/item/reagent_container/blood/AMinus = list(SKILL_MEDICAL, SKILL_MEDICAL_MEDIC), + /obj/item/reagent_container/blood/APlus = list(SKILL_MEDICAL, SKILL_MEDICAL_MEDIC), + /obj/item/reagent_container/blood/BMinus = list(SKILL_MEDICAL, SKILL_MEDICAL_MEDIC), + /obj/item/reagent_container/blood/BPlus = list(SKILL_MEDICAL, SKILL_MEDICAL_MEDIC), + /obj/item/reagent_container/blood/ABMinus = list(SKILL_MEDICAL, SKILL_MEDICAL_MEDIC), + /obj/item/reagent_container/blood/ABPlus = list(SKILL_MEDICAL, SKILL_MEDICAL_MEDIC), ) can_hold_skill_only = TRUE From 04aa360300c4a8d7a1357675840d711090c8db6a Mon Sep 17 00:00:00 2001 From: Katskan Date: Sat, 23 Sep 2023 09:07:33 -0400 Subject: [PATCH 2/3] Uhh CM doesn't actually have AB blood bags --- code/game/objects/items/storage/pouch.dm | 2 -- 1 file changed, 2 deletions(-) diff --git a/code/game/objects/items/storage/pouch.dm b/code/game/objects/items/storage/pouch.dm index 2fb4fccb31a7..72981da2e45f 100644 --- a/code/game/objects/items/storage/pouch.dm +++ b/code/game/objects/items/storage/pouch.dm @@ -818,8 +818,6 @@ /obj/item/reagent_container/blood/APlus = list(SKILL_MEDICAL, SKILL_MEDICAL_MEDIC), /obj/item/reagent_container/blood/BMinus = list(SKILL_MEDICAL, SKILL_MEDICAL_MEDIC), /obj/item/reagent_container/blood/BPlus = list(SKILL_MEDICAL, SKILL_MEDICAL_MEDIC), - /obj/item/reagent_container/blood/ABMinus = list(SKILL_MEDICAL, SKILL_MEDICAL_MEDIC), - /obj/item/reagent_container/blood/ABPlus = list(SKILL_MEDICAL, SKILL_MEDICAL_MEDIC), ) can_hold_skill_only = TRUE From 0b845e716f078a2347553dfa070d85e84e1cb406 Mon Sep 17 00:00:00 2001 From: Katskan Date: Sat, 23 Sep 2023 10:42:52 -0400 Subject: [PATCH 3/3] Cuts the medkit part --- code/game/objects/items/storage/pouch.dm | 6 ------ 1 file changed, 6 deletions(-) diff --git a/code/game/objects/items/storage/pouch.dm b/code/game/objects/items/storage/pouch.dm index 72981da2e45f..01b9506f073b 100644 --- a/code/game/objects/items/storage/pouch.dm +++ b/code/game/objects/items/storage/pouch.dm @@ -812,12 +812,6 @@ /obj/item/roller = list(SKILL_MEDICAL, SKILL_MEDICAL_MEDIC), /obj/item/bodybag = list(SKILL_MEDICAL, SKILL_MEDICAL_MEDIC), /obj/item/reagent_container/blood = list(SKILL_MEDICAL, SKILL_MEDICAL_MEDIC), - /obj/item/reagent_container/blood/OMinus = list(SKILL_MEDICAL, SKILL_MEDICAL_MEDIC), - /obj/item/reagent_container/blood/OPlus = list(SKILL_MEDICAL, SKILL_MEDICAL_MEDIC), - /obj/item/reagent_container/blood/AMinus = list(SKILL_MEDICAL, SKILL_MEDICAL_MEDIC), - /obj/item/reagent_container/blood/APlus = list(SKILL_MEDICAL, SKILL_MEDICAL_MEDIC), - /obj/item/reagent_container/blood/BMinus = list(SKILL_MEDICAL, SKILL_MEDICAL_MEDIC), - /obj/item/reagent_container/blood/BPlus = list(SKILL_MEDICAL, SKILL_MEDICAL_MEDIC), ) can_hold_skill_only = TRUE