Adds NanoPharm and Misc Fluff Meds, now with less Merge Conflicts #19779
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: HanSolo1519 <[email protected]>
github-actions
bot
added
the
🗺️ Mapping - Horizon
HanSolo1519
requested review from
alsoandanswer and
DreamySkrell
as code owners
Arrow768
approved these changes
Aug 18, 2024
Geevies
approved these changes
Aug 18, 2024
github-merge-queue bot
pushed a commit
that referenced
this pull request
Sep 7, 2024
#19779 likely removed the light at Medical Lobby due to layering weirdness, but I am adding it back because the lobby is now too dark.  --------- Co-authored-by: Ben10083 <[email protected]>
hazelrat
pushed a commit
to hazelrat/Aurora.3
that referenced
this pull request
Sep 11, 2024
Aurorastation#19779 likely removed the light at Medical Lobby due to layering weirdness, but I am adding it back because the lobby is now too dark.  --------- Co-authored-by: Ben10083 <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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