From ddf833d16ca86290ce5e9abc42b040f966ae3935 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Fri, 8 Feb 2019 08:26:42 -0500 Subject: [PATCH] [Ready] Makes Adv surgery tools more common around the station! (#7938) * Fixing updater * Adds the belt with tools! * Adds belt to CMO locker * Synda bag * Adds the medical bag to uplink * adds in cargo crate * Apply suggestions from code review Rag spelling check a base line item I guess Co-Authored-By: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> * Apply suggestions from code review Spell check Rag at it again fixing Trilbys failers Co-Authored-By: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> --- code/game/objects/items/storage/backpack.dm | 17 +++++++++++++ code/game/objects/items/storage/belt.dm | 14 +++++++++++ .../crates_lockers/closets/secure/medical.dm | 3 ++- code/modules/cargo/packs.dm | 25 +++++++++++++------ code/modules/uplink/uplink_items.dm | 7 ++++++ 5 files changed, 58 insertions(+), 8 deletions(-) diff --git a/code/game/objects/items/storage/backpack.dm b/code/game/objects/items/storage/backpack.dm index 996ee8cd02..25fc96c251 100644 --- a/code/game/objects/items/storage/backpack.dm +++ b/code/game/objects/items/storage/backpack.dm @@ -441,6 +441,23 @@ new /obj/item/clothing/mask/muzzle(src) new /obj/item/mmi/syndie(src) +/obj/item/storage/backpack/duffelbag/syndie/surgery_adv + name = "advanced surgery duffel bag" + desc = "A large duffel bag for holding surgical tools. Bears the logo of an advanced med-tech firm." + +/obj/item/storage/backpack/duffelbag/syndie/surgery_adv/PopulateContents() + new /obj/item/hemostat/adv(src) + new /obj/item/circular_saw/adv(src) + new /obj/item/scalpel/adv(src) + new /obj/item/retractor/adv(src) + new /obj/item/cautery/adv(src) + new /obj/item/surgicaldrill/adv(src) + new /obj/item/surgical_drapes(src) + new /obj/item/storage/firstaid/tactical(src) + new /obj/item/clothing/suit/straight_jacket(src) + new /obj/item/clothing/mask/muzzle(src) + new /obj/item/mmi/syndie(src) + /obj/item/storage/backpack/duffelbag/syndie/ammo name = "ammunition duffel bag" desc = "A large duffel bag for holding extra weapons ammunition and supplies." diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm index 7414e0d5c2..8b932cf615 100755 --- a/code/game/objects/items/storage/belt.dm +++ b/code/game/objects/items/storage/belt.dm @@ -168,6 +168,20 @@ /obj/item/pinpointer/crew )) + +/obj/item/storage/belt/medical/surgery_belt_adv + name = "surgical supply belt" + desc = "A specialized belt designed for holding surgical equipment. It seems to have specific pockets for each and every surgical tool you can think of." + +/obj/item/storage/belt/medical/surgery_belt_adv/PopulateContents() + new /obj/item/hemostat/adv(src) + new /obj/item/circular_saw/adv(src) + new /obj/item/scalpel/adv(src) + new /obj/item/retractor/adv(src) + new /obj/item/cautery/adv(src) + new /obj/item/surgicaldrill/adv(src) + new /obj/item/surgical_drapes(src) + /obj/item/storage/belt/security name = "security belt" desc = "Can hold security gear like handcuffs and flashes." diff --git a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm index d424bcf876..5ef952b139 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm @@ -74,6 +74,7 @@ new /obj/item/door_remote/chief_medical_officer(src) new /obj/item/clothing/neck/petcollar(src) new /obj/item/pet_carrier(src) + new /obj/item/storage/belt/medical/surgery_belt_adv(src) new /obj/item/wallframe/defib_mount(src) new /obj/item/circuitboard/machine/techfab/department/medical(src) new /obj/item/storage/photo_album/CMO(src) @@ -99,4 +100,4 @@ new /obj/item/storage/box/pillbottles(src) new /obj/item/storage/box/pillbottles(src) new /obj/item/storage/box/medsprays(src) - new /obj/item/storage/box/medsprays(src) \ No newline at end of file + new /obj/item/storage/box/medsprays(src) diff --git a/code/modules/cargo/packs.dm b/code/modules/cargo/packs.dm index 66c34e0779..5f8985b423 100644 --- a/code/modules/cargo/packs.dm +++ b/code/modules/cargo/packs.dm @@ -1236,6 +1236,24 @@ /obj/item/storage/firstaid/regular) crate_name = "first aid kit crate" +/datum/supply_pack/medical/iv_drip + name = "IV Drip Crate" + desc = "Contains a single IV drip stand for intravenous delivery." + cost = 700 + contains = list(/obj/machinery/iv_drip) + crate_name = "iv drip crate" + +/datum/supply_pack/science/adv_surgery_tools + name = "Med-Co Advanced surgery tools" + desc = "A full set of Med-Co advanced surgery tools, this crate also comes with a spay of synth flesh as well as a can of . Requires Surgery access to open." + cost = 5000 + access = ACCESS_SURGERY + contains = list(/obj/item/storage/belt/medical/surgery_belt_adv, + /obj/item/reagent_containers/medspray/synthflesh, + /obj/item/reagent_containers/medspray/sterilizine) + crate_name = "medco newest surgery tools" + crate_type = /obj/structure/closet/crate/medical + /datum/supply_pack/medical/medicalhardsuit name = "Medical Hardsuit" desc = "Got people being spaced left and right? Hole in the same room as the dead body of Hos or cap? Fear not, now you can buy one medical hardsuit with a mask and air tank to save your fellow crewmembers." @@ -1245,13 +1263,6 @@ /obj/item/clothing/suit/space/hardsuit/medical) crate_name = "medical hardsuit" -/datum/supply_pack/medical/iv_drip - name = "IV Drip Crate" - desc = "Contains a single IV drip for administering blood to patients." - cost = 700 - contains = list(/obj/machinery/iv_drip) - crate_name = "iv drip crate" - /datum/supply_pack/medical/supplies name = "Medical Supplies Crate" desc = "Contains seven beakers, syringes, and bodybags. Three morphine bottles, four insulin pills. Two charcoal bottles, epinephrine bottles, antitoxin bottles, and large beakers. Finally, a single roll of medical gauze, as well as a bottle of stimulant pills for long, hard work days. German doctor not included." diff --git a/code/modules/uplink/uplink_items.dm b/code/modules/uplink/uplink_items.dm index 1e3060137a..05fdbadf87 100644 --- a/code/modules/uplink/uplink_items.dm +++ b/code/modules/uplink/uplink_items.dm @@ -988,6 +988,13 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) item = /obj/item/storage/backpack/duffelbag/syndie/surgery cost = 3 +/datum/uplink_item/device_tools/surgerybag_adv + name = "Syndicate Surgery Duffel Bag" + desc = "The Syndicate surgery duffel bag is a toolkit containing all newest surgery tools, surgical drapes, \ + a Syndicate brand MMI, a straitjacket, a muzzle, and a full Syndicate Combat Medic Kit." + item = /obj/item/storage/backpack/duffelbag/syndie/surgery_adv + cost = 15 //Mite be to cheap + /datum/uplink_item/device_tools/military_belt name = "Chest Rig" desc = "A robust seven-slot set of webbing that is capable of holding all manner of tactical equipment."