From 9c1618139b0dc38868156850de8dd965789fec0a Mon Sep 17 00:00:00 2001 From: Adri Date: Mon, 29 Aug 2022 12:10:16 +0200 Subject: [PATCH] Tweaks some NanoMed Plus products, tweaks mannitol and mutadone pills, renames healing patch (#18904) * Changes mannitol and mutadone pills * Renames healing patch to brute patch * Removes some NanoMed Plus products * Moves insulin to contraband * Removes unnecessary capitalization when it comes to reagent bottles * Reverts mannitol sprite change * Moves health analyzer upgrades from Nanomed plus to wall nanomed premium category * Makes syringes lowercase * Revert "Moves health analyzer upgrades from Nanomed plus to wall nanomed premium category" This reverts commit 3d586665fefd8fd1f14311b365145a0af8d259e6. * Renames prespawned advanced analyzers --- code/game/machinery/vending.dm | 43 ++++++++++++---- code/game/objects/items/devices/scanners.dm | 1 + .../reagents/reagent_containers/bottle.dm | 50 +++++++++---------- .../reagents/reagent_containers/patch.dm | 4 +- .../reagents/reagent_containers/pill.dm | 6 +-- .../reagents/reagent_containers/syringes.dm | 12 ++--- 6 files changed, 70 insertions(+), 46 deletions(-) diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index 943f241c892..09e8bb8122a 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -1218,16 +1218,39 @@ icon_panel = "wide_vendor" ads_list = list("Go save some lives!","The best stuff for your medbay.","Only the finest tools.","Natural chemicals!","This stuff saves lives.","Don't you want some?","Ping!") req_access_txt = "5" - products = list(/obj/item/reagent_containers/syringe = 12, /obj/item/reagent_containers/food/pill/patch/styptic = 4, /obj/item/reagent_containers/food/pill/patch/silver_sulf = 4, /obj/item/reagent_containers/applicator/brute = 3, /obj/item/reagent_containers/applicator/burn = 3, - /obj/item/reagent_containers/glass/bottle/charcoal = 4, /obj/item/reagent_containers/glass/bottle/epinephrine = 4, /obj/item/reagent_containers/glass/bottle/diphenhydramine = 4, - /obj/item/reagent_containers/glass/bottle/salicylic = 4, /obj/item/reagent_containers/glass/bottle/potassium_iodide =3, /obj/item/reagent_containers/glass/bottle/saline = 5, - /obj/item/reagent_containers/glass/bottle/morphine = 4, /obj/item/reagent_containers/glass/bottle/ether = 4, /obj/item/reagent_containers/glass/bottle/atropine = 3, - /obj/item/reagent_containers/glass/bottle/oculine = 2, /obj/item/reagent_containers/syringe/antiviral = 6, - /obj/item/reagent_containers/syringe/insulin = 6, /obj/item/reagent_containers/syringe/calomel = 10, /obj/item/reagent_containers/syringe/heparin = 4, /obj/item/reagent_containers/hypospray/autoinjector = 5, /obj/item/reagent_containers/food/pill/salbutamol = 10, - /obj/item/reagent_containers/food/pill/mannitol = 10, /obj/item/reagent_containers/food/pill/mutadone = 5, /obj/item/stack/medical/bruise_pack/advanced = 4, /obj/item/stack/medical/ointment/advanced = 4, /obj/item/stack/medical/bruise_pack = 4, - /obj/item/stack/medical/splint = 4, /obj/item/reagent_containers/glass/beaker = 4, /obj/item/reagent_containers/dropper = 4, /obj/item/healthanalyzer = 4, - /obj/item/healthupgrade = 4, /obj/item/reagent_containers/hypospray/safety = 2, /obj/item/sensor_device = 2, /obj/item/pinpointer/crew = 2) - contraband = list(/obj/item/reagent_containers/glass/bottle/sulfonal = 1, /obj/item/reagent_containers/glass/bottle/pancuronium = 1) + products = list(/obj/item/reagent_containers/syringe = 12, + /obj/item/reagent_containers/food/pill/patch/styptic = 4, + /obj/item/reagent_containers/food/pill/patch/silver_sulf = 4, + /obj/item/reagent_containers/applicator/brute = 3, + /obj/item/reagent_containers/applicator/burn = 3, + /obj/item/reagent_containers/glass/bottle/charcoal = 4, + /obj/item/reagent_containers/glass/bottle/epinephrine = 4, + /obj/item/reagent_containers/glass/bottle/salicylic = 4, + /obj/item/reagent_containers/glass/bottle/potassium_iodide = 3, + /obj/item/reagent_containers/glass/bottle/saline = 5, + /obj/item/reagent_containers/glass/bottle/morphine = 4, + /obj/item/reagent_containers/glass/bottle/atropine = 3, + /obj/item/reagent_containers/glass/bottle/oculine = 2, + /obj/item/reagent_containers/syringe/antiviral = 6, + /obj/item/reagent_containers/syringe/calomel = 10, + /obj/item/reagent_containers/syringe/heparin = 4, + /obj/item/reagent_containers/hypospray/autoinjector = 5, + /obj/item/reagent_containers/food/pill/salbutamol = 10, + /obj/item/reagent_containers/food/pill/mannitol = 10, + /obj/item/reagent_containers/food/pill/mutadone = 5, + /obj/item/stack/medical/bruise_pack/advanced = 4, + /obj/item/stack/medical/ointment/advanced = 4, + /obj/item/stack/medical/bruise_pack = 4, + /obj/item/stack/medical/splint = 4, + /obj/item/reagent_containers/glass/beaker = 4, + /obj/item/reagent_containers/dropper = 4, + /obj/item/healthanalyzer/advanced = 4, + /obj/item/reagent_containers/hypospray/safety = 2, + /obj/item/sensor_device = 2, + /obj/item/pinpointer/crew = 2) + contraband = list(/obj/item/reagent_containers/syringe/insulin = 6, + /obj/item/reagent_containers/glass/bottle/sulfonal = 1, + /obj/item/reagent_containers/glass/bottle/pancuronium = 1) armor = list(melee = 50, bullet = 20, laser = 20, energy = 20, bomb = 0, bio = 0, rad = 0, fire = 100, acid = 70) resistance_flags = FIRE_PROOF refill_canister = /obj/item/vending_refill/medical diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index 92253145eeb..5caf521b3c5 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -298,6 +298,7 @@ REAGENT SCANNER return ..() /obj/item/healthanalyzer/advanced + name = "advanced health analyzer" advanced = TRUE /obj/item/healthanalyzer/advanced/Initialize(mapload) diff --git a/code/modules/reagents/reagent_containers/bottle.dm b/code/modules/reagents/reagent_containers/bottle.dm index 733493a1349..1f3a67b4f8e 100644 --- a/code/modules/reagents/reagent_containers/bottle.dm +++ b/code/modules/reagents/reagent_containers/bottle.dm @@ -96,62 +96,62 @@ list_reagents = list("diethylamine" = 30) /obj/item/reagent_containers/glass/bottle/facid - name = "Fluorosulfuric Acid Bottle" + name = "fluorosulfuric acid bottle" desc = "A small bottle. Contains a small amount of Fluorosulfuric Acid" icon_state = "round_bottle" list_reagents = list("facid" = 30) /obj/item/reagent_containers/glass/bottle/adminordrazine - name = "Adminordrazine Bottle" + name = "adminordrazine bottle" desc = "A small bottle. Contains the liquid essence of the gods." icon = 'icons/obj/drinks.dmi' icon_state = "holyflask" list_reagents = list("adminordrazine" = 30) /obj/item/reagent_containers/glass/bottle/capsaicin - name = "Capsaicin Bottle" + name = "capsaicin bottle" desc = "A small bottle. Contains hot sauce." icon_state = "round_bottle" list_reagents = list("capsaicin" = 30) /obj/item/reagent_containers/glass/bottle/frostoil - name = "Frost Oil Bottle" + name = "frost oil bottle" desc = "A small bottle. Contains cold sauce." icon_state = "round_bottle" list_reagents = list("frostoil" = 30) /obj/item/reagent_containers/glass/bottle/morphine - name = "Morphine Bottle" + name = "morphine bottle" desc = "A small bottle of morphine, a powerful painkiller." icon_state = "bottle" list_reagents = list("morphine" = 30) /obj/item/reagent_containers/glass/bottle/ether - name = "Ether Bottle" + name = "ether bottle" desc = "A small bottle of an ether, a strong anesthetic and sedative." icon_state = "round_bottle" list_reagents = list("ether" = 30) /obj/item/reagent_containers/glass/bottle/charcoal - name = "Charcoal Bottle" + name = "charcoal bottle" desc = "A small bottle. Contains charcoal." icon_state = "wide_bottle" list_reagents = list("charcoal" = 30) /obj/item/reagent_containers/glass/bottle/epinephrine - name = "Epinephrine Bottle" + name = "epinephrine bottle" desc = "A small bottle. Contains epinephrine - used to stabilize patients." icon_state = "round_bottle" list_reagents = list("epinephrine" = 30) /obj/item/reagent_containers/glass/bottle/pancuronium - name = "Pancuronium Bottle" + name = "pancuronium bottle" desc = "A small bottle of pancuronium." icon_state = "round_bottle" list_reagents = list("pancuronium" = 30) /obj/item/reagent_containers/glass/bottle/sulfonal - name = "Sulfonal Bottle" + name = "sulfonal bottle" desc = "A small bottle of Sulfonal." icon_state = "round_bottle" list_reagents = list("sulfonal" = 30) @@ -159,88 +159,88 @@ //Reagent bottles /obj/item/reagent_containers/glass/bottle/reagent - name = "Reagent Bottle" + name = "reagent bottle" desc = "A bottle for storing reagents" icon_state = "reagent_bottle" volume = 50 /obj/item/reagent_containers/glass/bottle/reagent/oil - name = "Oil Bottle" + name = "oil bottle" desc = "A reagent bottle. Contains oil." list_reagents = list("oil" = 50) pixel_x = -4 pixel_y = 6 /obj/item/reagent_containers/glass/bottle/reagent/phenol - name = "Phenol Bottle" + name = "phenol bottle" desc = "A reagent bottle. Contains phenol." list_reagents = list("phenol" = 50) pixel_x = 6 pixel_y = 6 /obj/item/reagent_containers/glass/bottle/reagent/acetone - name = "Acetone Bottle" + name = "acetone bottle" desc = "A reagent bottle. Contains acetone." list_reagents = list("acetone" = 50) pixel_x = -4 /obj/item/reagent_containers/glass/bottle/reagent/ammonia - name = "Ammonia Bottle" + name = "ammonia bottle" desc = "A reagent bottle. Contains ammonia." list_reagents = list("ammonia" = 50) pixel_x = 6 /obj/item/reagent_containers/glass/bottle/reagent/diethylamine - name = "Diethylamine Bottle" + name = "diethylamine bottle" desc = "A reagent bottle. Contains diethylamine." list_reagents = list("diethylamine" = 50) pixel_x = -4 pixel_y = -6 /obj/item/reagent_containers/glass/bottle/reagent/acid - name = "Acid Bottle" + name = "acid bottle" desc = "A reagent bottle. Contains sulfuric acid." list_reagents = list("sacid" = 50) pixel_x = 6 pixel_y = -6 /obj/item/reagent_containers/glass/bottle/reagent/formaldehyde - name = "Formaldehyde Bottle" + name = "formaldehyde bottle" desc = "A reagent bottle. Contains formaldehyde." list_reagents = list("formaldehyde" = 50) /obj/item/reagent_containers/glass/bottle/reagent/synaptizine - name = "Synaptizine Bottle" + name = "synaptizine bottle" desc = "A reagent bottle. Contains synaptizine." list_reagents = list("synaptizine" = 50) /obj/item/reagent_containers/glass/bottle/reagent/morphine - name = "Morphine Bottle" + name = "morphine bottle" desc = "A reagent bottle. Contains morphine." list_reagents = list("morphine" = 50) /obj/item/reagent_containers/glass/bottle/reagent/insulin - name = "Insulin Bottle" + name = "insulin bottle" desc = "A reagent bottle. Contains insulin." list_reagents = list("insulin" = 50) /obj/item/reagent_containers/glass/bottle/reagent/hairgrownium - name = "Hair Grow Gel" + name = "hair grow gel" desc = "A bottle full of a stimulative hair growth formula" list_reagents = list("hairgrownium" = 50) /obj/item/reagent_containers/glass/bottle/reagent/hair_dye - name = "Quantum Hair Dye Bottle" + name = "quantum hair dye bottle" desc = "A bottle of the ever-changing quantum hair dye." list_reagents = list("hair_dye" = 50) /obj/item/reagent_containers/glass/bottle/reagent/omnizine - name = "Omnizine Bottle" + name = "omnizine bottle" desc = "A reagent bottle. Contains Omnizine." list_reagents = list("omnizine" = 50) /obj/item/reagent_containers/glass/bottle/reagent/strange_reagent - name = "Strange Reagent Bottle" + name = "strange reagent bottle" desc = "A bottle of glowing fluid." list_reagents = list("strange_reagent" = 30) diff --git a/code/modules/reagents/reagent_containers/patch.dm b/code/modules/reagents/reagent_containers/patch.dm index 5a5a7c4696f..a6f273f6cd0 100644 --- a/code/modules/reagents/reagent_containers/patch.dm +++ b/code/modules/reagents/reagent_containers/patch.dm @@ -29,14 +29,14 @@ return // thanks inheritance again /obj/item/reagent_containers/food/pill/patch/styptic - name = "healing patch" + name = "brute patch" desc = "Helps with brute injuries." icon_state = "bandaid_brute" instant_application = 1 list_reagents = list("styptic_powder" = 30) /obj/item/reagent_containers/food/pill/patch/styptic/small - name = "healing mini-patch" + name = "brute mini-patch" list_reagents = list("styptic_powder" = 15) /obj/item/reagent_containers/food/pill/patch/silver_sulf diff --git a/code/modules/reagents/reagent_containers/pill.dm b/code/modules/reagents/reagent_containers/pill.dm index c0acdb3af15..49fb17ad9cf 100644 --- a/code/modules/reagents/reagent_containers/pill.dm +++ b/code/modules/reagents/reagent_containers/pill.dm @@ -134,11 +134,11 @@ /obj/item/reagent_containers/food/pill/mutadone name = "\improper Mutadone pill" desc = "Used to cure genetic abnormalities." - icon_state = "pill18" - list_reagents = list("mutadone" = 20) + icon_state = "pill13" + list_reagents = list("mutadone" = 1) /obj/item/reagent_containers/food/pill/mannitol name = "\improper Mannitol pill" desc = "Used to treat cranial swelling." icon_state = "pill19" - list_reagents = list("mannitol" = 20) + list_reagents = list("mannitol" = 10) diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm index 7243fea614b..e157cc7d733 100644 --- a/code/modules/reagents/reagent_containers/syringes.dm +++ b/code/modules/reagents/reagent_containers/syringes.dm @@ -179,32 +179,32 @@ M.update_inv_r_hand() /obj/item/reagent_containers/syringe/antiviral - name = "Syringe (spaceacillin)" + name = "syringe (spaceacillin)" desc = "Contains antiviral agents." list_reagents = list("spaceacillin" = 15) /obj/item/reagent_containers/syringe/charcoal - name = "Syringe (charcoal)" + name = "syringe (charcoal)" desc = "Contains charcoal - used to treat toxins and damage from toxins." list_reagents = list("charcoal" = 15) /obj/item/reagent_containers/syringe/epinephrine - name = "Syringe (Epinephrine)" + name = "syringe (Epinephrine)" desc = "Contains epinephrine - used to stabilize patients." list_reagents = list("epinephrine" = 15) /obj/item/reagent_containers/syringe/insulin - name = "Syringe (insulin)" + name = "syringe (insulin)" desc = "Contains insulin - used to treat diabetes." list_reagents = list("insulin" = 15) /obj/item/reagent_containers/syringe/calomel - name = "Syringe (calomel)" + name = "syringe (calomel)" desc = "Contains calomel, which be used to purge impurities, but is highly toxic itself." list_reagents = list("calomel" = 15) /obj/item/reagent_containers/syringe/heparin - name = "Syringe (heparin)" + name = "syringe (heparin)" desc = "Contains heparin, a blood anticoagulant." list_reagents = list("heparin" = 15)