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
@@ -180,3 +180,19 @@
name = "bottle of 10u Ryetalyn pills"
desc = "Contains pills used to treat genetic and immune diseases."
starts_with = list(/obj/item/reagent_containers/pill/ryetalyn = 4)
/obj/item/storage/pill_bottle/caffeine
name = "bottle of 5u Caffeine pills"
desc = "Contains pills used to help with alertness and fatigue. The label warns against taking more than 2 in a 6-hour period. Possible side effects include jitteriness, heart palpitations, difficulty with concentrating, and even death."
starts_with = list(/obj/item/reagent_containers/pill/caffeine = 7)
/obj/item/storage/pill_bottle/nicotine
name = "bottle of 10u Nicotine pills"
desc = "Contains pills used to treat nicotine addiction."
starts_with = list(/obj/item/reagent_containers/pill/nicotine = 7)
/obj/item/storage/pill_bottle/vitamin
name = "bottle of Vitamin supplements"
desc = "Contains pills used to treat vitamin deficiency."
starts_with = list(/obj/item/reagent_containers/pill/bio_vitamin/cheap = 7)