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

[MIRROR] Deforest Medical Cargo Company Update | Not so free healthcare | Medbay watches in horror as assistants overdose themselves on dollar store medpens #838

Merged
merged 1 commit into from
Nov 27, 2023

Conversation

Steals-The-PRs
Copy link
Collaborator

Original PR: Skyrat-SS13/Skyrat-tg#24771

About The Pull Request

The Deforest medical cargo company has had its contents reworked to something a bit... more unique.

What could that mean you ask me? Let me give you an outline.

image

Strange autoinjectors, new medkits, oh my god it even has a random collection of healing items in the middle!

Expect to see miracles! Medicine that the likes of the frontiersfolk have only ever dreamed of!

Wonder nanotech that can repair bones in a flash! (May have side effects)

image

The Subdermal Splint Applicator

A roll of nano-injector lined flexible material that can be applied to any limb to instantly repair a bone wound in that area!

image

The Rapid Coagulant Applicator

A small device (wrapped in an airtight package to keep the bugs out) that can be used on any limb with a bleed to instantly seal the bleed!

However

There is a downside to the use of both of these, as using either will apply a five minute long debuff that increases damage taken by 1.5x and increases the speed of bleeding by 2x for the duration of that five minutes.
You cannot use another one of the two above items until this cooldown has finished.

Treatment options like never seen before! (May have side effects)

image

Coagulant-F

A three-use pack of coagulant meant to be applied to open bleeding wounds. Like a suture, it will reduce the bleeding's severity with more uses. Unlike a suture, however, it will do this nearly twice as effectively, though will heal no damage.

image

Red Sun Balm

Red sun over paradise, behaves similarly to ointment in that it will be highly effective at treating burns, while healing little damage. Unlike ointment, it will only stack to half as much (4), and heals a little bit of brute as well.

The balm will also apply 5u of lidocaine to whoever its used on, temporarily numbing pain.

image

Sealed Antiseptic Gauze

Behaves like regular gauze, though with some difference to its effectiveness against certain wounds. Is a terrible splint for any wounds bone or muscle related. It is, however, extremely effective against burns.

image

Amollin pill bottles

Don't let the name fool you, Amollin is just a fancy brand name for some common galactic painkillers. The bottle contains seven pills with each having 10u miner's salve, 5u lidocaine, 5u sugar. May cause stomach cramps and ulcers.

Medical autoinjectors to suit a whole range of situations you might find yourself in! (May have side effects)

See this document for more information:

https://hackmd.io/@Paxilmaniac/Deforest-Injectors

Medical kits of many new types for carrying all of these new goods in!

image

The Civil Defense Medical Kit

A small pocket-sized medical kit intended for civil defense operations and mass-distribution. Contains four autoinjectors able to heal many common injuries and conditions, and can only carry autoinjectors within its four slots for them.

image

The Frontier Medical Kit

A medical kit commonly seen with explorers, frontier crew, what name you. Carries supplies to quickly contain injuries for areas where medical care might not be so readily available.

image

The Combat Surgeon's Medical Kit

A larger kit able to hold many common surgical tools, often used by combat surgeons for holding larger tools that smaller kits wouldn't allow.

image

The Satchel Medical Kit

A much larger medical kit that won't fit in any bag out there. Its large size allows the storage of a massive 21 medical items, though these must all be small or lower in size to fit. The kit has straps to be worn on the back for easier transportation.

image

The First Responder Surgical Kit

A massive medical kit able to hold 14 medical items of normal size or lower, which is more than even a duffel bag can manage! Due to its bulky size, it can't be stored within most bags, but can be worn on the back for convenience in transport.

How This Contributes To The Skyrat Roleplay Experience

The bell tolls for Deforest medical as a cargo company.

The contents? Kinda lame. Not a single thing unique to it, and its all stuff medbay has in excess already, so nobody really buys from it all that much.

So how can we fix this?

The same answer as always, with the goofiest stuff I can think of.

Proof of Testing

Screenshots/Videos

image
image
image
image

Changelog

🆑 Paxilmaniac
add: A whole host of new and unique items has been added to deforest medical in cargo to spice up their admittedly quite lame selection! Have a look when you get the chance why don't you?
image: So, so many sprites for new stuff made by me.
/:cl:

…ay watches in horror as assistants overdose themselves on dollar store medpens (#24771)

* injectors of various types

* adds a timer to injecting others with the pens

* fixes some of the stuff

* fixes the do after

* replaces the old pens and chems with the new ones in the company

* fixes that too

* fixes injector icons

* gives all of the pens a slight debuff chem so its not all upsides

* stack items and prepacked medkits

* as usual, bug fixes

* makes those names different

* stops accidentally overriding multiver pill bottles

* sprites for bigger bags, mob sprites soon to come

* big medkitted all over the place

* removes unused check

* should fix tests

* removes a single conceptually stupid injector

* changes a few thing saround

* nerfs pentibinin

* adjusts a few of the pens to be a bit better and or worse

* fixes the wearable medkits not being to carry the things they spawn with

* makes the orange wearable unzip faster and slow down less unzipped

* buffs the bags by allowing belt usage

* puts the tiny wound analyzers in some of the medkits

* lets the splint work on muscle issues, changes the sound a bit

* tweaks worn sprites of and gives inhands to wearable medkits

* removes debug message

* adjusts some numbers and docs

* adds some of the kits to cargo so medbay can order in bulk

* adds some of the medical stuff to opfor as well

* gives all the medkits unique inhands

* tweaks a lot of the stuff (pickup sounds wahoo!)

* adds a little more to using the instant wound healing kits

* adds tox damage to twitch overdose so you cannot become fucking invincbl

* makes the comment style more similar across the code

* lets the frontier kit be hooked onto belts + owrn sprite for it

* makes the bandages not get ruined by bleeds as fast

* Update code/__DEFINES/~skyrat_defines/opposing_force_defines.dm

Co-authored-by: GoldenAlpharex <[email protected]>

* Update code/__DEFINES/~skyrat_defines/opposing_force_defines.dm

Co-authored-by: GoldenAlpharex <[email protected]>

* makes the big surgical kit come stocked

* Update modular_skyrat/modules/deforest_medical_items/code/chemicals/demoneye.dm

Co-authored-by: GoldenAlpharex <[email protected]>

* reviews for some of demoneye

* Update modular_skyrat/modules/deforest_medical_items/code/chemicals/demoneye.dm

Co-authored-by: GoldenAlpharex <[email protected]>

* Update modular_skyrat/modules/deforest_medical_items/code/chemicals/demoneye.dm

Co-authored-by: GoldenAlpharex <[email protected]>

* makes the demoneye organ damage list static

* Update modular_skyrat/modules/deforest_medical_items/code/chemicals/twitch.dm

Co-authored-by: GoldenAlpharex <[email protected]>

* more review stuff

* reviews for the injectors

* Update modular_skyrat/modules/deforest_medical_items/code/storage_items.dm

Co-authored-by: GoldenAlpharex <[email protected]>

* Update modular_skyrat/modules/deforest_medical_items/code/storage_items.dm

Co-authored-by: GoldenAlpharex <[email protected]>

* updates the civil defense kit's sprite to be a bit better

* formats the cargo packs a bit nicer

* fixes a slight logic error

* fixes an erroneous comment

* makes the big surgery kit able to hold, and come with a rollerbed

* moves that static list a bit

* fixes first responder surgical kit's left inhand

* makes the combat surgeon kit not missing sprite when worn

* makes the rapid wound fixers actually get used, reworks medkits slightly

* messes with the big surgical kit AGAIN

* makes demoneye need stable plasma to cook to stop conflicts

* Update modular_skyrat/modules/deforest_medical_items/code/storage_items.dm

Co-authored-by: sqnztb <[email protected]>

* Update modular_skyrat/modules/deforest_medical_items/code/storage_items.dm

Co-authored-by: sqnztb <[email protected]>

* Fixes the trait that had to be moved!

* fixes demon-eye colors and twitch afterimage length

---------

Co-authored-by: GoldenAlpharex <[email protected]>
Co-authored-by: sqnztb <[email protected]>
Co-authored-by: GoldenAlpharex <[email protected]>
@Iajret Iajret merged commit ad2386f into master Nov 27, 2023
24 checks passed
@Iajret Iajret deleted the upstream-mirror-24771 branch November 27, 2023 09:10
AnywayFarus added a commit that referenced this pull request Nov 27, 2023
Iajret pushed a commit that referenced this pull request Feb 8, 2024
* Adds a suicide_act() to the smite spell (#81252)

## About The Pull Request
What it says on the tin
## Why It's Good For The Game

https://youtu.be/cvfLHTyDv9o?t=4
## Changelog
:cl: Wallem
add: Adds a new suicide_act() to the smite spell
/:cl:

* Adds a suicide_act() to the smite spell

---------

Co-authored-by: Wallem <[email protected]>
ReezeBL pushed a commit that referenced this pull request Feb 9, 2024
* Adds a suicide_act() to the smite spell (#81252)

## About The Pull Request
What it says on the tin
## Why It's Good For The Game

https://youtu.be/cvfLHTyDv9o?t=4
## Changelog
:cl: Wallem
add: Adds a new suicide_act() to the smite spell
/:cl:

* Adds a suicide_act() to the smite spell

---------

Co-authored-by: NovaBot <[email protected]>
Co-authored-by: Wallem <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants