Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[NeoDays] Dared #2322

Merged
merged 4 commits into from
Mar 14, 2024
Merged

[NeoDays] Dared #2322

merged 4 commits into from
Mar 14, 2024

Conversation

Golfavel
Copy link
Contributor

Summary

Adds and moves various drugs and closely associated items

Content of the change

Adds:

  • Acetaminophen
  • Antihistamine
  • Ibuprofen
  • Broad-spectrum antibiotics
  • Antacid tablet

Connects:

  • Melatonin tablet to aspirin
  • Metaprolol to antacid tablet
  • Naproxen to fast-acting sedative

Moves:

  • Prozac, panacea, xanax, vitamins, thorazine, sleeping pills, nyquil, lsd, dayquil, codeine, caffeine, asprin, antibiotics, cigarette, cigarette butt, lit cigarette, cigar, cigar butt, lit cigar, crack pipe, joint, lit joint, joint roach, glass pipe, tobacco pipe, inhaler, injectable iron, enpinephrine autoinjector, and cigarette box to ./drugs/
  • dr_stem_cell, berserker_drug_act, and stamina_vial to ../mod/unknown/items/

Testing

Before
neo_drbef
After
neo_draft

Additional information

…yquil, lsd, dayquil, codeine, caffeine, asprin, antibiotics to ./drugs/
…otic, antacid tablet, fast-acting sedative

connected: metlatonin tablet to asprin; metaprolol to antacid tablet, naproxen to fast-acting sedative
…it cigar, crack pipe, joint, lit joint, joint roach, glass pipe, tobacco pipe to ./drugs/
… box to ./drugs/; 'dr_stem_cell', 'berserker_drug_act', and 'stamina_vial' to ../mod/unknown/items/
@Fris0uman Fris0uman merged commit fcac29d into I-am-Erk:master Mar 14, 2024
1 check passed
@Golfavel Golfavel deleted the neo_drugs branch March 14, 2024 20:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants