Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Ports hyposprays MK. II#14814

Merged
JamieD1 merged 9 commits intoyogstation13:masterfrom
nmajask:hypospray-II-port
Jul 16, 2022
Merged

Ports hyposprays MK. II#14814
JamieD1 merged 9 commits intoyogstation13:masterfrom
nmajask:hypospray-II-port

Conversation

@nmajask
Copy link
Copy Markdown
Contributor

@nmajask nmajask commented Jul 12, 2022

Document the changes in your pull request

Ports "Hypospray Mk. IIs" #20 by MarkSuckerberg (though its based on "[READY] Hypospray MK IIs" #5722 by Poojawa) and hypospray sprites from "Resprites and Beaker (and Bottle) Lids" #31 by triplezeta, cleaned up and slightly refactored to be much easier to read and use our vials. Sprites for the hyposprays are by me, and they are subject to change. Makes vial boxes less of a pain to use and gives one to the CMO with large vials with a bunch of healing chems. The new hypospray can be obtained either through a new medkit in the medical vendor also containing various vials or through the advanced biotech tech node.

Spriting

image
image
image

Wiki Documentation

Add the hypospray to the vendor page, add the designs to the research page.

Changelog

🆑 Poojawa, MarkSuckerberg, triplezeta, nmajask
rscadd: Added new hyposprays that replace the CMO's hypospray and available to doctors which can be loaded with vials
rscadd: Added bluespace (60u) and large (30u) vials
rscadd: Added a new medkit containing a hypospray and some vials for 300 credits in the medical vendor
tweak: vials can now be renamed with pens
tweak: vials boxes no longer have a lid, so you can unlock them with alt click
/:cl:

@Yogbot-13 Yogbot-13 added Feature This adds new content to the game Mapping Will result in a change to a map. Sprites This PR has spriting changes Tweak This PR contains changes to the game. labels Jul 12, 2022
@Hislyna
Copy link
Copy Markdown

Hislyna commented Jul 12, 2022

Please for the love of god give brig phys one on round start so they can actually heal sec on the go

@github-actions github-actions bot added the Sound This PR changes audio files label Jul 12, 2022
Copy link
Copy Markdown
Contributor

@KillerOrcaCora KillerOrcaCora left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggest going back to the old sprite and just with a updated design for the hypospray

@VaelophisNyx
Copy link
Copy Markdown
Contributor

I think the new sprites look fantastic tbh

@ynot01
Copy link
Copy Markdown
Contributor

ynot01 commented Jul 12, 2022

dont like the sprites

@nmajask
Copy link
Copy Markdown
Contributor Author

nmajask commented Jul 12, 2022

Sprites now use shiptest's hypospray with a little overlay to indicate the amount/color of the reagents in the vial. Also added sprites for a syringe like hypospray.
image

@ynot01
Copy link
Copy Markdown
Contributor

ynot01 commented Jul 13, 2022

hot

@nmajask nmajask marked this pull request as ready for review July 13, 2022 07:46
@nmajask nmajask requested review from a team as code owners July 13, 2022 07:46
Copy link
Copy Markdown
Contributor

@ToasterBiome ToasterBiome left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Map approval

@redmoogle
Copy link
Copy Markdown
Contributor

Very cool

Copy link
Copy Markdown
Contributor

@KillerOrcaCora KillerOrcaCora left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Emir approve this

@JamieD1 JamieD1 merged commit 0fb4001 into yogstation13:master Jul 16, 2022
Yogbot-13 added a commit that referenced this pull request Jul 16, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

Feature This adds new content to the game Mapping Will result in a change to a map. Sound This PR changes audio files Sprites This PR has spriting changes Tweak This PR contains changes to the game.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

9 participants