Adds NanoPharm and Misc Fluff Meds, now with less Merge Conflicts (#19779)

Your coworkers getting you down? Struggling to keep that headache at bay
during a day at the office? Just need a pick-me-up? Look no further!

Adds the Nanopharm, a simple vending machine giving access to some
over-the-counter pharmaceuticals. Caffine pills, Cough medicine, that
sort of thing. Amazing for 'My coworkers are such a headache I need to
pop pills over it' rp.

Please actually do feel free to give feedback over what should be added
or omitted. I want to give some variety without adding things that
should be prescription and controlled substances. Current things of note
are caffeine pills, nicotine pills, and vitamins which this PR adds.


Same as #19740, but with less conflicts hopefully. Credit to
Courierbravo for helping with the map when my SDMM install messed up

---------

Signed-off-by: HanSolo1519 <72716882+HanSolo1519@users.noreply.github.com>
This commit is contained in:
HanSolo1519
2024-08-20 14:02:03 +00:00
committed by GitHub
parent 60603e6098
commit e3a54abf58
7 changed files with 184 additions and 19 deletions
@@ -1920,3 +1920,42 @@
var/obj/item/organ/external/E = Z.parent_organ
Z.curing = TRUE
to_chat(M, SPAN_WARNING("Your [E.name] tightens, pulses, and squirms as \the [Z] fights back against the antibodies!"))
/singleton/reagent/caffeine // Copied from Hyperzine
name = "Caffeine"
description = "Caffeine is a central nervous system stimulant found naturally in many plants. It's used as a mild cognitive enhancer to increase alertness, attentional performance, and improve cardiovascular health."
reagent_state = SOLID
color = "#f9edea"
metabolism = REM * 0.15
overdose = 11
var/datum/modifier = null
taste_description = "bitter"
metabolism_min = REM * 0.025
breathe_met = REM * 0.15 * 0.5
/singleton/reagent/caffeine/get_od_min_dose(mob/living/carbon/M, location, datum/reagents/holder)
if(REAGENT_VOLUME(M.reagents, /singleton/reagent/adrenaline) > 5)
return 0 // Takes effect instantly.
. = od_minimum_dose
/singleton/reagent/caffeine/affect_blood(var/mob/living/carbon/M, var/alien, var/removed, var/datum/reagents/holder)
if(prob(5))
to_chat(M, SPAN_GOOD(pick("You feel alert!", "You feel awake!", "You feel pumped!")))
if(check_min_dose(M, 0.5))
M.add_chemical_effect(CE_PULSE, 1)
/singleton/reagent/caffeine/overdose(var/mob/living/carbon/M, var/alien, var/removed, var/datum/reagents/holder)
M.adjustNutritionLoss(5*removed)
M.add_chemical_effect(CE_PULSE, 2)
M.add_chemical_effect(CE_SPEEDBOOST, 0.35) // Coffee = 0.3, Zora Soda = 0.4, Thirteen Loko = 0.5. Seems fine here, if a bit low.
M.make_jittery(5)
if(prob(5))
to_chat(M, SPAN_WARNING(pick("You have a headache!", "Energy, energy, energy - so much energy!", "You can't sit still!", "It's difficult to focus right now... but that's not important!", "Your heart is beating rapidly!", "Your chest hurts!", "You've totally over-exerted yourself!")))
if(prob(M.chem_doses[type] / 3))
M.emote(pick("twitch", "blink_r", "shiver"))
M.take_organ_damage(5 * removed, 0)
M.adjustHalLoss(15)
/singleton/reagent/caffeine/Destroy()
QDEL_NULL(modifier)
return ..()
@@ -293,7 +293,7 @@
icon_state = "pill19"
reagents_to_add = list(/singleton/reagent/thetamycin = 15)
/obj/item/reagent_containers/pill/bio_vitamin
/obj/item/reagent_containers/pill/bio_vitamin //Biogenerator Version
name = "Vitamin Pill"
desc = "Contains a meal's worth of nutrients."
icon_state = "pill11"
@@ -302,7 +302,12 @@
/obj/item/reagent_containers/pill/bio_vitamin/Initialize()
. = ..()
var/juice = pick(/singleton/reagent/drink/banana, /singleton/reagent/drink/berryjuice, /singleton/reagent/drink/grapejuice, /singleton/reagent/drink/lemonjuice, /singleton/reagent/drink/limejuice, /singleton/reagent/drink/orangejuice, /singleton/reagent/drink/watermelonjuice)
reagents.add_reagent(juice, 1)
reagents.add_reagent(juice, 5)
/obj/item/reagent_containers/pill/bio_vitamin/cheap //Vending machine version
name = "Vitamin Pill"
desc = "Has all the vitamins a person needs."
reagents_to_add = list(/singleton/reagent/nutriment = 2)
/obj/item/reagent_containers/pill/rmt
name = "15u Regenerative-Muscular Tissue Supplement Pill"
@@ -375,3 +380,15 @@
desc = "A medicine used to treat genetic conditions, including benign and malignant tumours."
icon_state = "pill11"
reagents_to_add = list(/singleton/reagent/ryetalyn = 10)
/obj/item/reagent_containers/pill/caffeine
name = "5u Caffeine Pill"
desc = "A stimulant used to help with alertness and fatigue."
icon_state = "pill18"
reagents_to_add = list(/singleton/reagent/caffeine = 5)
/obj/item/reagent_containers/pill/nicotine
name = "5u Nicotine Pill"
desc = "A pill used to treat nicotine addiction."
icon_state = "pill18"
reagents_to_add = list(/singleton/reagent/mental/nicotine = 5)