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.

Sign up for GitHub

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

Jump to bottom

Add Sansufentanyl prescription to Cargo, fix Psicodine prescription (after 3 years) #463

Merged
merged 2 commits into from
Apr 13, 2024
Merged

Add Sansufentanyl prescription to Cargo, fix Psicodine prescription (after 3 years) #463

merged 2 commits into from
Apr 13, 2024

Conversation

MrMelbert
Copy link
Owner

  • Adds Sansufentanyl (1 count) to cargo, so you can order some without buying a big ass crate
  • Fix Psicodine prescription being wrong for 3 years

@MrMelbert MrMelbert added Feature Its a bug Fix Fixing what was broken, I suppose labels Mar 25, 2024
@MrMelbert MrMelbert merged commit 896f9bf into master Apr 13, 2024
23 checks passed
@MrMelbert MrMelbert deleted the prescription branch April 13, 2024 04:57
Constellado added a commit to Constellado/MapleStationCode that referenced this pull request Apr 17, 2024
@Constellado
Squashed commit of the following:
be457ab 
commit c96114d
Author: Constellado <[email protected]>
Date:   Tue Apr 16 13:09:29 2024 +1200

    Volkan's box filled with communication chips is now spawnable. (MrMelbert#471)

    * Volkan now has stuff

    * Fixes the box illustration issue, chips make the disk sound, and makes the boxes not foldable.

    * i forgot to add illustration = null to the chip box. fixed?

    * The communication chips can now be put inside consoles, PDAs and laptops.

    * The chips cannot hold more apps now.

    * updated names and descriptions

    * The USB chip now actually has a working USB connector.

commit d964603
Author: Ed640 <[email protected]>
Date:   Fri Apr 12 23:59:00 2024 -0500

    Adjusts spell Flares Lifetime and Lesser Cooldown (MrMelbert#464)

    Magical flares now randomly stay alight between 5-10 minutes with lesser flares 1-5 minutes. Lesser flares now have a cooldown alongside their cheaper cost.

commit f716052
Author: notfrying1pans <[email protected]>
Date:   Sat Apr 13 00:58:35 2024 -0400

    crucial tgui fix taken from tg (MrMelbert#462)

commit 896f9bf
Author: MrMelbert <[email protected]>
Date:   Fri Apr 12 23:57:53 2024 -0500

    Add Sansufentanyl prescription to Cargo, fix Psicodine prescription (after 3 years) (MrMelbert#463)

commit 846b6f8
Author: Ed640 <[email protected]>
Date:   Fri Apr 12 23:57:42 2024 -0500

    Adds a cooldown to Airhike (MrMelbert#465)

    Adds a 6 second cooldown similar to jump boots.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
Feature Its a bug Fix Fixing what was broken, I suppose
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@MrMelbert