From a1cc129d0bddb4ce399c1c8e029b1f66324665e4 Mon Sep 17 00:00:00 2001 From: Hatterhat Date: Fri, 13 Dec 2019 21:10:12 -0600 Subject: [PATCH] slightly better storage, cucks the surgery duffel --- code/game/objects/items/storage/backpack.dm | 2 +- code/game/objects/items/storage/firstaid.dm | 19 ++++++++++++++++++- .../reagents/reagent_containers/hypospray.dm | 5 +++++ code/modules/uplink/uplink_items.dm | 4 ++-- 4 files changed, 26 insertions(+), 4 deletions(-) diff --git a/code/game/objects/items/storage/backpack.dm b/code/game/objects/items/storage/backpack.dm index f6e169a4d5..2fe0dcd62b 100644 --- a/code/game/objects/items/storage/backpack.dm +++ b/code/game/objects/items/storage/backpack.dm @@ -551,7 +551,7 @@ /obj/item/storage/backpack/duffelbag/syndie/med/medicalbundle/PopulateContents() new /obj/item/clothing/shoes/magboots/syndie(src) - new /obj/item/storage/firstaid/tactical(src) + new /obj/item/storage/firstaid/tactical/nukeop(src) new /obj/item/gun/ballistic/automatic/l6_saw/toy(src) new /obj/item/ammo_box/foambox/riot(src) diff --git a/code/game/objects/items/storage/firstaid.dm b/code/game/objects/items/storage/firstaid.dm index 6f7d2b617d..fbffc259f3 100644 --- a/code/game/objects/items/storage/firstaid.dm +++ b/code/game/objects/items/storage/firstaid.dm @@ -172,8 +172,25 @@ . = ..() var/datum/component/storage/STR = GetComponent(/datum/component/storage) STR.max_w_class = WEIGHT_CLASS_NORMAL + STR.max_combined_w_class = 16 + STR.max_items = 8 /obj/item/storage/firstaid/tactical/PopulateContents() + if(empty) + return + new /obj/item/stack/medical/gauze(src) + new /obj/item/defibrillator/compact/combat/loaded(src) + new /obj/item/reagent_containers/hypospray/combat/omnizine(src) + new /obj/item/reagent_containers/medspray/styptic(src) + new /obj/item/reagent_containers/medspray/silver_sulf(src) + new /obj/item/healthanalyzer/advanced(src) + new /obj/item/reagent_containers/syringe/lethal/choral(src) // what the fuck does anyone use this piece of shit for + new /obj/item/clothing/glasses/hud/health/night(src) + +/obj/item/storage/firstaid/tactical/nukeop + name = "improved combat medical kit" + +/obj/item/storage/firstaid/tactical/nukeop/PopulateContents() if(empty) return new /obj/item/stack/medical/gauze(src) @@ -184,7 +201,7 @@ new /obj/item/healthanalyzer/advanced(src) new /obj/item/reagent_containers/syringe/lethal/choral(src) // what the fuck does anyone use this piece of shit for new /obj/item/clothing/glasses/hud/health/night(src) - + /* * Pill Bottles */ diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm index 32f471e943..99047577f0 100644 --- a/code/modules/reagents/reagent_containers/hypospray.dm +++ b/code/modules/reagents/reagent_containers/hypospray.dm @@ -63,6 +63,11 @@ ignore_flags = 1 // So they can heal their comrades. list_reagents = list("epinephrine" = 30, "lesser_syndicate_nanites" = 40, "leporazine" = 15, "atropine" = 15) +/obj/item/reagent_containers/hypospray/combat/omnizine // owned idiot + desc = "A modified air-needle autoinjector, used by underfunded support operatives to slowly heal injuries in combat and limp away from a fight." + volume = 90 + list_reagents = list("epinephrine" = 30, "omnizine" = 30, "leporazine" = 15, "atropine" = 15) + /obj/item/reagent_containers/hypospray/combat/nanites desc = "A modified air-needle autoinjector for use in combat situations. Prefilled with experimental medical compounds for rapid healing." volume = 100 diff --git a/code/modules/uplink/uplink_items.dm b/code/modules/uplink/uplink_items.dm index aef3b31895..11b125d291 100644 --- a/code/modules/uplink/uplink_items.dm +++ b/code/modules/uplink/uplink_items.dm @@ -1543,7 +1543,7 @@ datum/uplink_item/stealthy_weapons/taeclowndo_shoes desc = "This first aid kit is a suspicious brown and red. Included is a combat stimulant injector \ for rapid healing, a medical night vision HUD for quick identification of injured personnel, \ and other supplies helpful for a field medic." - item = /obj/item/storage/firstaid/tactical + item = /obj/item/storage/firstaid/tactical/nukeop cost = 4 include_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops) @@ -1557,7 +1557,7 @@ datum/uplink_item/stealthy_weapons/taeclowndo_shoes /datum/uplink_item/device_tools/surgerybag_adv name = "Advanced Syndicate Surgery Duffel Bag" desc = "The Syndicate surgery duffel bag is a toolkit containing all advanced surgery tools, surgical drapes, \ - a Syndicate brand MMI, a straitjacket, a muzzle, and a full Syndicate Combat Medic Kit." + a Syndicate brand MMI, a straitjacket, a muzzle, and an outdated, yet still useful Combat Medic Kit." item = /obj/item/storage/backpack/duffelbag/syndie/surgery_adv cost = 10