From 416f4580f03f9a2e792f21422a78a9182d4f36d7 Mon Sep 17 00:00:00 2001 From: 1080pCat <96908085+1080pCat@users.noreply.github.com> Date: Fri, 29 Sep 2023 09:31:09 +1000 Subject: [PATCH] Moves charcoal out from under the contraband wire in nanomeds(the wall ones) (#22329) * charcoal? contraband?? * guh * fixes gatto ass sorting * i conflicted myself! * gawd damn it --- code/game/machinery/vendors/contraband_vendors.dm | 6 +++--- code/game/machinery/vendors/generic_vendors.dm | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/code/game/machinery/vendors/contraband_vendors.dm b/code/game/machinery/vendors/contraband_vendors.dm index 1bd195f7c9e..63afb2d852c 100644 --- a/code/game/machinery/vendors/contraband_vendors.dm +++ b/code/game/machinery/vendors/contraband_vendors.dm @@ -16,12 +16,12 @@ req_access_txt = "150" products = list(/obj/item/stack/medical/bruise_pack = 2, /obj/item/stack/medical/ointment = 2, + /obj/item/reagent_containers/syringe/charcoal = 4, /obj/item/reagent_containers/hypospray/autoinjector/epinephrine = 4, /obj/item/healthanalyzer = 1) - contraband = list(/obj/item/reagent_containers/syringe/charcoal = 4, - /obj/item/reagent_containers/syringe/antiviral = 4, - /obj/item/reagent_containers/food/pill/tox = 1) + contraband = list(/obj/item/reagent_containers/syringe/antiviral = 4, + /obj/item/reagent_containers/food/pill/tox = 1) /obj/machinery/economy/vending/syndicigs name = "\improper Suspicious Cigarette Machine" diff --git a/code/game/machinery/vendors/generic_vendors.dm b/code/game/machinery/vendors/generic_vendors.dm index ca90440d9cf..89e09dca0ba 100644 --- a/code/game/machinery/vendors/generic_vendors.dm +++ b/code/game/machinery/vendors/generic_vendors.dm @@ -1250,11 +1250,11 @@ tiltable = FALSE products = list(/obj/item/stack/medical/bruise_pack = 2, /obj/item/stack/medical/ointment = 2, + /obj/item/reagent_containers/syringe/charcoal = 4, /obj/item/reagent_containers/hypospray/autoinjector/epinephrine = 4, /obj/item/healthanalyzer = 1) - contraband = list(/obj/item/reagent_containers/syringe/charcoal = 4, - /obj/item/reagent_containers/syringe/antiviral = 4, + contraband = list(/obj/item/reagent_containers/syringe/antiviral = 4, /obj/item/reagent_containers/food/pill/tox = 1) armor = list(MELEE = 50, BULLET = 20, LASER = 20, ENERGY = 20, BOMB = 0, RAD = 0, FIRE = 100, ACID = 70)