From 8c3f2bdf64323909d084262370dbf1ea5e88a28a Mon Sep 17 00:00:00 2001
From: shellspeed1 <46614774+shellspeed1@users.noreply.github.com>
Date: Wed, 25 Oct 2023 15:46:06 -0700
Subject: [PATCH] Hypospray & hypokit added to the cargo company listings.
 (#632)

<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request

Adds hypospray kits and hyposprays to cargo.

<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

<!-- Please make sure to actually test your PRs. If you have not tested
your PR mention it. -->

## Why It's Good For The Game

While looking at the cargo offerings, I just had a thought. Why the heck
aren't hyposprays buyable but you can get a full set of surgical tools
for 200 credits. Anyway, adds something else for medical to spend money
on that isn't a gun. Also flavor.

<!-- Argue for the merits of your changes and how they benefit the game,
especially if they are controversial and/or far reaching. If you can't
actually explain WHY what you are doing will improve the game, then it
probably isn't good for the game in the first place. -->

## Changelog

<!-- If your PR modifies aspects of the game that can be concretely
observed by players or admins you should add a changelog. If your change
does NOT meet this description, remove this section. Be sure to properly
mark your PRs to prevent unnecessary GBP loss. You can read up on GBP
and it's effects on PRs in the tgstation guides for contributors. Please
note that maintainers freely reserve the right to remove and add tags
should they deem it appropriate. You can attempt to finagle the system
all you want, but it's best to shoot for clear communication right off
the bat. -->

:cl:
add: Hyposprays and empty Hypospray kits can now be bought from
Deforest.
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

---------

Co-authored-by: projectkepler-RU <99981766+projectkepler-ru@users.noreply.github.com>
---
 .../code/armament_datums/deforest_medical.dm          | 11 +++++++++++
 .../modules/hyposprays/code/hypospray_kits.dm         |  1 +
 2 files changed, 12 insertions(+)

diff --git a/modular_skyrat/modules/company_imports/code/armament_datums/deforest_medical.dm b/modular_skyrat/modules/company_imports/code/armament_datums/deforest_medical.dm
index d6e5be0049e..7fb8c498183 100644
--- a/modular_skyrat/modules/company_imports/code/armament_datums/deforest_medical.dm
+++ b/modular_skyrat/modules/company_imports/code/armament_datums/deforest_medical.dm
@@ -152,6 +152,17 @@
 	item_type = /obj/item/gun/medbeam/afad
 	cost = PAYCHECK_COMMAND * 5
 
+//Bubber Changes
+/datum/armament_entry/company_import/deforest/equipment/hypospray_case
+	item_type = /obj/item/storage/hypospraykit
+	cost = PAYCHECK_LOWER * 2
+
+/datum/armament_entry/company_import/deforest/equipment/hypospray
+	item_type = /obj/item/hypospray/mkii
+	cost = PAYCHECK_LOWER * 2
+
+//End Bubber Changes
+
 // Modsuit Modules from the medical category, here instead of in Nakamura because nobody buys from this company
 
 /datum/armament_entry/company_import/deforest/medical_modules
diff --git a/modular_skyrat/modules/hyposprays/code/hypospray_kits.dm b/modular_skyrat/modules/hyposprays/code/hypospray_kits.dm
index 25565fc7e57..1f5c3d37d3f 100644
--- a/modular_skyrat/modules/hyposprays/code/hypospray_kits.dm
+++ b/modular_skyrat/modules/hyposprays/code/hypospray_kits.dm
@@ -121,3 +121,4 @@
 /obj/item/storage/box/hypospray/PopulateContents()
 	for(var/i in 1 to 4)
 		new /obj/item/storage/hypospraykit/empty(src)
+