Skip to content

Fixes duplicate Interdyne cargo entries and outdated stuff in the Interdyne medkits. #249

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

Closed
Infernal-0 wants to merge 5 commits into from
Closed

Fixes duplicate Interdyne cargo entries and outdated stuff in the Interdyne medkits. #249

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9cee30e
fuckass duplicate bullshit smh
Infernal-0 May 19, 2026
f8e05ca
combat defib can be put into the uhhh yeah . back into the. m.
Infernal-0 May 19, 2026
ca2930f
glorp
Infernal-0 May 19, 2026
4ea9ab5
Update interdyne_kits.dm
Infernal-0 May 19, 2026
21a1a5d
Revert "Update interdyne_kits.dm"
Infernal-0 May 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 2 additions & 26 deletions modular_nova/modules/company_imports/code/armament_datums/interdyne_pharmaceuticals.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,20 +65,8 @@
contains = list(/obj/item/storage/medkit/tactical/premium/interdyne/empty = 3,)
cost = CARGO_CRATE_VALUE * 1.5

/datum/supply_pack/companies/medical/interdyne/doctorkit
name = "Interdyne Doctor Kit"
desc = "A surgical kit designed for surgical aid, made by doctors for doctors!"
contains = list(/obj/item/storage/medkit/tactical/premium/interdyne )
cost = CARGO_CRATE_VALUE * 5

/datum/supply_pack/companies/medical/interdyne/doctorkit_bulk
name = "Multi Pack of Interdyne Doctor Kits"
desc = "Multiple surgical trauma kits, made by doctors, for doctors."
contains = list(/obj/item/storage/medkit/tactical/premium/interdyne = 3 )
cost = CARGO_CRATE_VALUE * 13.5

/datum/supply_pack/companies/medical/interdyne/large_traumakit
name = "Interdyne Large Trauma Kits"
name = "Interdyne Large Trauma Kit"
desc = "A trauma kit designed for immediate medical aid, made by doctors for doctors!"
contains = list(/obj/item/storage/medkit/tactical/premium/interdyne )
cost = CARGO_CRATE_VALUE * 5
Expand Down Expand Up @@ -113,18 +101,6 @@
contains = list(/obj/item/storage/medkit/tactical/premium/interdyne/medium/surgical = 3)
cost = CARGO_CRATE_VALUE * 9

/datum/supply_pack/companies/medical/interdyne/medium_kit_oxytoxloss
name = "Interdyne OxyTox Trauma Kit"
desc = "A kit filled with oxygen and toxins related ailments, made by doctors, for doctors."
contains = list(/obj/item/storage/medkit/tactical/premium/interdyne/medium/Tox_Oxy)
cost = CARGO_CRATE_VALUE * 3.5

/datum/supply_pack/companies/medical/interdyne/medium_kit_oxytoxloss_bulk
name = "Multi Pack of Interdyne OxyTox Trauma Kit"
desc = "Multiple trauma kits filled with oxygen and toxins related ailments, made by doctors, for doctors."
contains = list(/obj/item/storage/medkit/tactical/premium/interdyne/medium/Tox_Oxy = 3)
cost = CARGO_CRATE_VALUE * 9

/datum/supply_pack/companies/medical/interdyne/firstaidkit
name = "Interdyne First Aid Kit"
desc = "A first aid kit designed for a variety of traumas!"
Expand Down Expand Up @@ -187,7 +163,7 @@

/datum/supply_pack/companies/medical/interdyne/biohazard_box
name = "Interdyne Biohazard Response Box"
desc = "Multiple surgical trauma kits, made by doctors, for doctors."
desc = "Oh god what the fuck did you do to have to order this."
contains = list(
/obj/item/clothing/suit/bio_suit/interdyne = 3,
/obj/item/clothing/head/bio_hood/interdyne = 3,
Expand Down
36 changes: 7 additions & 29 deletions modular_nova/modules/company_imports/code/objects/interdyne/interdyne_kits.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
new_icon_state = "interdyne_premium_surgical"

/obj/item/storage/medkit/tactical/premium/interdyne
name = "\improper Interdyne Premium Doctor's Kit"
name = "\improper Interdyne Trauma Kit"
desc = "a kit specially made by the interdyne corporation to utilize the most essential tools."
icon_state = "interdyne_premium_surgical"
icon = 'modular_nova/master_files/icons/obj/storage/medkit.dmi'
Expand All @@ -87,11 +87,11 @@
/obj/item/retractor/advanced = 1,
/obj/item/cautery/advanced = 1,
/obj/item/defibrillator/compact/combat/loaded/interdyne = 1,
/obj/item/circular_saw/field_medic/lowforce = 1,
/obj/item/bonesetter = 1,
/obj/item/stack/medical/wrap/sticky_tape/surgical = 1,
/obj/item/blood_filter/advanced = 1,
/obj/item/stack/medical/wrap/sticky_tape/surgical = 2,
/obj/item/reagent_containers/medigel/sterilizine = 1,
/obj/item/stack/medical/bone_gel = 1,
/obj/item/stack/medical/bone_gel = 2,
/obj/item/emergency_bed = 1,
)
generate_items_inside(items_inside, src)

Expand Down Expand Up @@ -193,28 +193,6 @@
var/list/items_inside = list()
generate_items_inside(items_inside,src)

/obj/item/storage/medkit/tactical/premium/interdyne/medium/Tox_Oxy
name = "\improper Interdyne Critical Burn-Brute Kit"
desc = "a kit specially made by the interdyne corporation to utilize the most essential tools. Meant for treating critical bruises"
icon_state = "interdyne_brute"

/obj/item/storage/medkit/tactical/premium/interdyne/medium/Tox_Oxy/PopulateContents()
var/list/items_inside = list(
/obj/item/stack/medical/suture/medicated = 2,
/obj/item/stack/medical/mesh/advanced = 2,
/obj/item/healthanalyzer/advanced = 1,
/obj/item/stack/medical/wrap/gauze = 2,
/obj/item/storage/box/bandages/interdyne = 1,
/obj/item/storage/box/bandages/interdyne/burn = 1,
/obj/item/reagent_containers/hypospray/medipen/morphine = 2,
/obj/item/reagent_containers/hypospray/medipen = 2,
/obj/item/storage/hypospraykit/interdyne = 1,
/obj/item/reagent_containers/cup/beaker/dyne_brutemix = 2,
/obj/item/reagent_containers/cup/beaker/dyne_burnmix= 2,
/obj/item/reagent_containers/spray/hercuri = 1,
)
generate_items_inside(items_inside,src)

/obj/item/storage/medkit/tactical/premium/interdyne/medium/surgical
name = "\improper Interdyne Field Surgical Kit"
desc = "a kit specially made by the interdyne corporation to utilize the most essential tools. Meant for fielld surgeries."
Expand All @@ -225,14 +203,14 @@
/obj/item/scalpel/advanced = 1,
/obj/item/retractor/advanced = 1,
/obj/item/cautery/advanced = 1,
/obj/item/bonesetter = 1,
/obj/item/blood_filter/advanced = 1,
/obj/item/surgical_drapes = 1,
/obj/item/reagent_containers/hypospray/medipen/morphine = 2,
/obj/item/stack/medical/wrap/sticky_tape/surgical = 3,
/obj/item/stack/medical/bone_gel = 3,
/obj/item/storage/pill_bottle/painkiller = 2,
/obj/item/reagent_containers/medigel/sterilizine = 2,
/obj/item/stack/medical/wrap/gauze/sterilized = 3,
/obj/item/emergency_bed = 1,
)
generate_items_inside(items_inside,src)

Expand Down
3 changes: 2 additions & 1 deletion modular_nova/modules/deforest_medical_items/code/storage_items.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,7 @@

/datum/storage/duffel/deforest_big_surgery
max_total_storage = 14 * WEIGHT_CLASS_NORMAL
max_slots = 14
max_slots = 21

/datum/storage/duffel/deforest_big_surgery/New()
. = ..()
Expand Down Expand Up @@ -393,6 +393,7 @@
/obj/item/handheld_soulcatcher,
/obj/item/wrench/medical,
/obj/item/emergency_bed,
/obj/item/defibrillator/compact,
/obj/item/storage/box/bandages,
/obj/item/bodybag,
))
Expand Down