From c383756f251c7568837f49b66fb10415a906b876 Mon Sep 17 00:00:00 2001 From: Steelpoint Date: Thu, 11 Jan 2024 17:42:26 +0800 Subject: [PATCH 1/8] asd --- code/datums/tutorial/marine/medical_basic.dm | 2 +- .../tutorial/marine/medical_basic_item.dm | 325 ++++++++++++++++++ .../vendor_types/squad_prep/tutorial.dm | 92 ++++- 3 files changed, 416 insertions(+), 3 deletions(-) create mode 100644 code/datums/tutorial/marine/medical_basic_item.dm diff --git a/code/datums/tutorial/marine/medical_basic.dm b/code/datums/tutorial/marine/medical_basic.dm index 3a42a6d2ecc2..4817adba7bbd 100644 --- a/code/datums/tutorial/marine/medical_basic.dm +++ b/code/datums/tutorial/marine/medical_basic.dm @@ -1,5 +1,5 @@ /datum/tutorial/marine/medical_basic - name = "Marine - Medical (Basic)" + name = "Marine - Medical Tutorial 1 (Introduction)" desc = "Learn how to treat common injuries you may face as a marine." tutorial_id = "marine_medical_1" tutorial_template = /datum/map_template/tutorial/s7x7 diff --git a/code/datums/tutorial/marine/medical_basic_item.dm b/code/datums/tutorial/marine/medical_basic_item.dm new file mode 100644 index 000000000000..0bb6cb1adc8d --- /dev/null +++ b/code/datums/tutorial/marine/medical_basic_item.dm @@ -0,0 +1,325 @@ +/datum/tutorial/marine/medical_basic_item + name = "Marine - Medical Tutorial 2 (Standard Tools)" + desc = "Learn the medical tools you'll need to use to heal yourself and others" + tutorial_id = "marine_medical_2" + tutorial_template = /datum/map_template/tutorial/s8x9 + + var/clothing_items_to_vend = 7 + var/med_one_items_to_vend = 1 + var/med_two_items_to_vend = 1 + var/med_three_items_to_vend = 1 + +// START OF SCRIPTING + +/datum/tutorial/marine/medical_basic_item/start_tutorial(mob/starting_mob) + . = ..() + if(!.) + return + + init_mob() + message_to_player("This tutorial will discuss the medical tools you will use as a standard Marine.") + addtimer(CALLBACK(src, PROC_REF(intro_one)), 6 SECONDS) +//pouch_one intro_one +/datum/tutorial/marine/medical_basic_item/proc/intro_one() + message_to_player("You are capable of tending to your own basic injuries without needing Corpsman (sometimes called a Medic) to assist you.") + update_objective("") + addtimer(CALLBACK(src, PROC_REF(intro_two)), 6 SECONDS) + +/datum/tutorial/marine/medical_basic_item/proc/intro_two() + message_to_player("The knowledge and ability to tend to your own injuries will allow you to not only survive, but thrive, on the battlefield.") + update_objective("") + addtimer(CALLBACK(src, PROC_REF(kit_one)), 6 SECONDS) + +/datum/tutorial/marine/medical_basic_item/proc/kit_one() + message_to_player("We will now show and discuss the basic medical items you can use. Afterwards, we will examine where you can find and store these items.") + update_objective("") + addtimer(CALLBACK(src, PROC_REF(kit_two)), 6 SECONDS) + +/datum/tutorial/marine/medical_basic_item/proc/kit_two() + SIGNAL_HANDLER + + message_to_player("These are Bandages. You can use these to heal Brute damage and stop bleeding. You always want to carry one of these.") + update_objective("") + var/obj/item/stack/medical/bruise_pack/bandage = new(loc_from_corner(0, 5)) + add_to_tracking_atoms(bandage) + add_highlight(bandage) + addtimer(CALLBACK(src, PROC_REF(kit_three)), 6 SECONDS) + +/datum/tutorial/marine/medical_basic_item/proc/kit_three() + SIGNAL_HANDLER + + TUTORIAL_ATOM_FROM_TRACKING(/obj/item/stack/medical/bruise_pack, bandage) + remove_highlight(bandage) + message_to_player("These are Ointments. You can use these to heal Burn damage. These are less important to carry, but are useful if you have the space for it.") + update_objective("") + var/obj/item/stack/medical/ointment/cream = new(loc_from_corner(0, 6)) + add_to_tracking_atoms(cream) + add_highlight(cream) + addtimer(CALLBACK(src, PROC_REF(kit_four)), 6 SECONDS) + +/datum/tutorial/marine/medical_basic_item/proc/kit_four() + SIGNAL_HANDLER + + TUTORIAL_ATOM_FROM_TRACKING(/obj/item/stack/medical/ointment, cream) + remove_highlight(cream) + message_to_player("These are Splints. You can use these to stabalize fractures. These are very important to use, as a unsplinted fracture can cause permanent injuries.") + update_objective("") + var/obj/item/stack/medical/splint/splint = new(loc_from_corner(1, 5)) + add_to_tracking_atoms(splint) + add_highlight(splint) + addtimer(CALLBACK(src, PROC_REF(interject_one)), 6 SECONDS) + +/datum/tutorial/marine/medical_basic_item/proc/interject_one() + message_to_player("It is significantly faster for someone else to apply a splint to you. It is suggested you ask someone else to splint your fractures.") + update_objective("") + addtimer(CALLBACK(src, PROC_REF(interject_two)), 6 SECONDS) + +/datum/tutorial/marine/medical_basic_item/proc/interject_two() + message_to_player("Furthermore, splints can be broken by further damage, requiring a replacement. Keep a close eye on your splints for this.") + update_objective("") + addtimer(CALLBACK(src, PROC_REF(kit_five)), 6 SECONDS) + +/datum/tutorial/marine/medical_basic_item/proc/kit_five() + SIGNAL_HANDLER + + TUTORIAL_ATOM_FROM_TRACKING(/obj/item/stack/medical/splint, splint) + remove_highlight(splint) + message_to_player("These are autoinjectors, these can be used to inject yourself with a healing chemical. This one is a Bicaradine autoinjector, it heals Brute damage.") + update_objective("") + var/obj/item/reagent_container/hypospray/autoinjector/bicaridine/autobic = new(loc_from_corner(1, 6)) + add_to_tracking_atoms(autobic) + add_highlight(autobic) + addtimer(CALLBACK(src, PROC_REF(kit_six)), 6 SECONDS) + +/datum/tutorial/marine/medical_basic_item/proc/kit_six() + SIGNAL_HANDLER + + TUTORIAL_ATOM_FROM_TRACKING(/obj/item/reagent_container/hypospray/autoinjector/bicaridine, autobic) + remove_highlight(autobic) + message_to_player("This one is a Kelotane autoinjector, it heals Burn damage.") + update_objective("") + var/obj/item/reagent_container/hypospray/autoinjector/kelotane/autokel = new(loc_from_corner(2, 5)) + add_to_tracking_atoms(autokel) + add_highlight(autokel) + addtimer(CALLBACK(src, PROC_REF(kit_seven)), 6 SECONDS) + +/datum/tutorial/marine/medical_basic_item/proc/kit_seven() + SIGNAL_HANDLER + + TUTORIAL_ATOM_FROM_TRACKING(/obj/item/reagent_container/hypospray/autoinjector/kelotane, autokel) + remove_highlight(autokel) + message_to_player("This one is a Tramadol autoinjector, it helps counter Pain, which is generated by being injured.") + update_objective("") + var/obj/item/reagent_container/hypospray/autoinjector/tramadol/autotra = new(loc_from_corner(2, 6)) + add_to_tracking_atoms(autotra) + add_highlight(autotra) + addtimer(CALLBACK(src, PROC_REF(kit_eight)), 6 SECONDS) + +/datum/tutorial/marine/medical_basic_item/proc/kit_eight() + message_to_player("Tramadol is a highly dangerous medication, be certain to not overdose yourself be injecting more than three doses of this at a time. You will die if you do this.") + update_objective("") + addtimer(CALLBACK(src, PROC_REF(kit_nine)), 6 SECONDS) + +/datum/tutorial/marine/medical_basic_item/proc/kit_nine() + SIGNAL_HANDLER + + TUTORIAL_ATOM_FROM_TRACKING(/obj/item/reagent_container/hypospray/autoinjector/tramadol, autotra) + remove_highlight(autotra) + message_to_player("This one is a Tricordrazine autoinjector, it heals all damage types but slower than other chemicals. Its useful as a generalist medication for minor injuries.") + update_objective("") + var/obj/item/reagent_container/hypospray/autoinjector/tricord/autotri = new(loc_from_corner(3, 5)) + add_to_tracking_atoms(autotri) + add_highlight(autotri) + addtimer(CALLBACK(src, PROC_REF(kit_ten)), 6 SECONDS) + +/datum/tutorial/marine/medical_basic_item/proc/kit_ten() + SIGNAL_HANDLER + + TUTORIAL_ATOM_FROM_TRACKING(/obj/item/reagent_container/hypospray/autoinjector/tricord, autotri) + remove_highlight(autotri) + message_to_player("This is an Emergency autoinjector. It is unique in that it is a single use, non-refillable, injector. It will inject you with a large amount of healing medications and a powerful pain killer. Use this when you are on the brink of death.") + update_objective("") + var/obj/item/reagent_container/hypospray/autoinjector/emergency/autoemer = new(loc_from_corner(3, 6)) + add_to_tracking_atoms(autoemer) + add_highlight(autoemer) + addtimer(CALLBACK(src, PROC_REF(kit_eleven)), 8 SECONDS) + +/datum/tutorial/marine/medical_basic_item/proc/kit_eleven() + SIGNAL_HANDLER + + TUTORIAL_ATOM_FROM_TRACKING(/obj/item/reagent_container/hypospray/autoinjector/emergency, autoemer) + remove_highlight(autoemer) + message_to_player("These are pill packets. They are uncommonly issued. You get four pills per packet, one dose more than a autoinjector. But you can not refill these.") + update_objective("") + var/obj/item/storage/pill_bottle/packet/bicaridine/packetbic = new(loc_from_corner(4, 5)) + var/obj/item/storage/pill_bottle/packet/kelotane/packetkel = new(loc_from_corner(4, 6)) + var/obj/item/storage/pill_bottle/packet/tramadol/packettram = new(loc_from_corner(5, 5)) + add_to_tracking_atoms(packetbic) + add_to_tracking_atoms(packetkel) + add_to_tracking_atoms(packettram) + add_highlight(packetbic) + add_highlight(packetkel) + add_highlight(packettram) + addtimer(CALLBACK(src, PROC_REF(kit_twelve)), 8 SECONDS) + +/datum/tutorial/marine/medical_basic_item/proc/kit_twelve() + SIGNAL_HANDLER + + TUTORIAL_ATOM_FROM_TRACKING(/obj/item/storage/pill_bottle/packet/bicaridine, packetbic) + TUTORIAL_ATOM_FROM_TRACKING(/obj/item/storage/pill_bottle/packet/kelotane, packetkel) + TUTORIAL_ATOM_FROM_TRACKING(/obj/item/storage/pill_bottle/packet/tramadol, packettram) + remove_highlight(packetbic) + remove_highlight(packetkel) + remove_highlight(packettram) + message_to_player("Take this moment to pause and review the previous chat logs, or the medical items on the floor. When you are ready, please take the food bar and eat it.") + update_objective("Eat the food bar when you are ready to continue") + var/obj/item/reagent_container/food/snacks/protein_pack/food = new(loc_from_corner(3, 3)) + add_to_tracking_atoms(food) + add_highlight(food) + RegisterSignal(tutorial_mob, COMSIG_MOB_EATEN_SNACK, PROC_REF(pouch_one)) + +/datum/tutorial/marine/medical_basic_item/proc/pouch_one() + SIGNAL_HANDLER + + UnregisterSignal(tutorial_mob, COMSIG_MOB_EATEN_SNACK) + TUTORIAL_ATOM_FROM_TRACKING(/obj/item/reagent_container/food/snacks/protein_pack, food) + remove_highlight(food) + message_to_player("This section of the tutorial will discuss where to get these items, and how to store them. To begin, go to the equipment vendor and equip a standard Marine loadout.") + update_objective("Vend everything inside the ColMarTech Automated Closet.") + TUTORIAL_ATOM_FROM_TRACKING(/obj/structure/machinery/cm_vending/clothing/tutorialmed, clothing_vendor) + add_highlight(clothing_vendor) + clothing_vendor.req_access = list() + RegisterSignal(clothing_vendor, COMSIG_VENDOR_SUCCESSFUL_VEND, PROC_REF(pouch_two)) + +/datum/tutorial/marine/medical_basic_item/proc/pouch_two() + SIGNAL_HANDLER + + clothing_items_to_vend-- + if(clothing_items_to_vend <= 0) + TUTORIAL_ATOM_FROM_TRACKING(/obj/structure/machinery/cm_vending/clothing/tutorialmed, clothing_vendor) + UnregisterSignal(clothing_vendor, COMSIG_VENDOR_SUCCESSFUL_VEND) + clothing_vendor.req_access = list(ACCESS_TUTORIAL_LOCKED) + remove_highlight(clothing_vendor) + message_to_player("Now, go to your personal equipment vendor and vend the First-Aid Pouch (Refillable Injectors).") + update_objective("Vend the first-aid pouch.") + TUTORIAL_ATOM_FROM_TRACKING(/obj/structure/machinery/cm_vending/clothing/medic_equip, medic_vendor_alpha) + add_highlight(medic_vendor_alpha) + medic_vendor_alpha.req_access = list() + RegisterSignal(medic_vendor_alpha, COMSIG_VENDOR_SUCCESSFUL_VEND, PROC_REF(pouch_three)) + +/datum/tutorial/marine/medical_basic_item/proc/pouch_three() + SIGNAL_HANDLER + + med_one_items_to_vend-- + if(med_one_items_to_vend <= 0) + TUTORIAL_ATOM_FROM_TRACKING(/obj/structure/machinery/cm_vending/clothing/medic_equip, medic_vendor_alpha) + UnregisterSignal(medic_vendor_alpha, COMSIG_VENDOR_SUCCESSFUL_VEND) + medic_vendor_alpha.req_access = list(ACCESS_TUTORIAL_LOCKED) + remove_highlight(medic_vendor_alpha) + message_to_player("You have equipped this pouch into your pouch slot. This is the first of three medical pouches you can vend for yourself, this is the injector pouch, which contains the basic injectors and a emergency injector.") + update_objective("") + addtimer(CALLBACK(src, PROC_REF(pouch_four)), 6 SECONDS) + +/datum/tutorial/marine/medical_basic_item/proc/pouch_four() + message_to_player("This pouch is unique as you can only get this from your personal vendor, the remaining two pouches can be acquired freely from the squad vendor.") + update_objective("") + addtimer(CALLBACK(src, PROC_REF(pouch_five)), 6 SECONDS) + +/datum/tutorial/marine/medical_basic_item/proc/pouch_five() + SIGNAL_HANDLER + + message_to_player("Vend the First-Aid Pouch (Splints, Gauze, Ointment).") + update_objective("Vend everything inside the ColMarTech Automated Closet.") + TUTORIAL_ATOM_FROM_TRACKING(/obj/structure/machinery/cm_vending/clothing/medic_equip_bravo, medic_vendor_bravo) + add_highlight(medic_vendor_bravo) + medic_vendor_bravo.req_access = list() + RegisterSignal(medic_vendor_bravo, COMSIG_VENDOR_SUCCESSFUL_VEND, PROC_REF(pouch_six)) + +/datum/tutorial/marine/medical_basic_item/proc/pouch_six() + SIGNAL_HANDLER + + med_two_items_to_vend-- + if(med_two_items_to_vend <= 0) + TUTORIAL_ATOM_FROM_TRACKING(/obj/structure/machinery/cm_vending/clothing/medic_equip_bravo, medic_vendor_bravo) + UnregisterSignal(medic_vendor_bravo, COMSIG_VENDOR_SUCCESSFUL_VEND) + medic_vendor_bravo.req_access = list(ACCESS_TUTORIAL_LOCKED) + remove_highlight(medic_vendor_bravo) + message_to_player("This pouch contains a set of bandages, ointment, splints and a tricodrazine injector. It is a good generalist pouch.") + update_objective("") + addtimer(CALLBACK(src, PROC_REF(pouch_seven)), 6 SECONDS) + +/datum/tutorial/marine/medical_basic_item/proc/pouch_seven() + message_to_player("You can vend these items from the marine medical vendor in the ship's medbay, as an alternative source.") + update_objective("") + addtimer(CALLBACK(src, PROC_REF(pouch_eight)), 6 SECONDS) + +/datum/tutorial/marine/medical_basic_item/proc/pouch_eight() + SIGNAL_HANDLER + + message_to_player("Vend the First-Aid Pouch (Pills).") + update_objective("Vend everything inside the ColMarTech Automated Closet.") + TUTORIAL_ATOM_FROM_TRACKING(/obj/structure/machinery/cm_vending/sorted/uniform_supply/medic_equip_charlie, medic_vendor_charlie) + add_highlight(medic_vendor_charlie) + medic_vendor_charlie.req_access = list() + RegisterSignal(medic_vendor_charlie, COMSIG_VENDOR_SUCCESSFUL_VEND, PROC_REF(pouch_nine)) + +/datum/tutorial/marine/medical_basic_item/proc/pouch_nine() + SIGNAL_HANDLER + + med_three_items_to_vend-- + if(med_three_items_to_vend <= 0) + TUTORIAL_ATOM_FROM_TRACKING(/obj/structure/machinery/cm_vending/sorted/uniform_supply/medic_equip_charlie, medic_vendor_charlie) + UnregisterSignal(medic_vendor_charlie, COMSIG_VENDOR_SUCCESSFUL_VEND) + medic_vendor_charlie.req_access = list(ACCESS_TUTORIAL_LOCKED) + remove_highlight(medic_vendor_charlie) + message_to_player("This pouch contains a set of pills. You can only get these pill packets from your personal or squad vendor.") + update_objective("") + addtimer(CALLBACK(src, PROC_REF(pouch_ten)), 6 SECONDS) + +/datum/tutorial/marine/medical_basic_item/proc/pouch_ten() + message_to_player("It will be up to you to figure out which of these you should take. You can consider using these pouches, or placing some of them in your satchel/backpack.") + update_objective("") + addtimer(CALLBACK(src, PROC_REF(pouch_eleven)), 6 SECONDS) + +/datum/tutorial/marine/medical_basic_item/proc/pouch_eleven() + SIGNAL_HANDLER + + message_to_player("Feel free to examine these items. When you are finished, eat the food to end the tutoiral.") + update_objective("Eat the food bar when you are ready to end the tutorial") + var/obj/item/reagent_container/food/snacks/protein_pack/food = new(loc_from_corner(3, 3)) + add_to_tracking_atoms(food) + add_highlight(food) + RegisterSignal(tutorial_mob, COMSIG_MOB_EATEN_SNACK, PROC_REF(the_end)) + +/datum/tutorial/marine/medical_basic_item/proc/the_end() + SIGNAL_HANDLER + + message_to_player("Good luck Marine") + update_objective("") + tutorial_end_in(5 SECONDS, TRUE) + +// END OF SCRIPTING +// START OF SCRIPT HELPERS + +// END OF SCRIPT HELPERS + +/datum/tutorial/marine/medical_basic_item/init_mob() + . = ..() + arm_equipment(tutorial_mob, /datum/equipment_preset/tutorial/fed) + + +/datum/tutorial/marine/medical_basic_item/init_map() + new /obj/structure/surface/table/almayer(loc_from_corner(0, 4)) + new /obj/structure/surface/table/almayer(loc_from_corner(1, 4)) + new /obj/structure/surface/table/almayer(loc_from_corner(2, 4)) + new /obj/structure/surface/table/almayer(loc_from_corner(3, 4)) + new /obj/structure/surface/table/almayer(loc_from_corner(4, 4)) + new /obj/structure/surface/table/almayer(loc_from_corner(5, 4)) + var/obj/structure/machinery/cm_vending/clothing/tutorialmed/clothing_vendor = new(loc_from_corner(5, 0)) + add_to_tracking_atoms(clothing_vendor) + var/obj/structure/machinery/cm_vending/clothing/medic_equip/medic_vendor_alpha = new(loc_from_corner(5, 1)) + add_to_tracking_atoms(medic_vendor_alpha) + var/obj/structure/machinery/cm_vending/clothing/medic_equip_bravo/medic_vendor_bravo = new(loc_from_corner(5, 2)) + add_to_tracking_atoms(medic_vendor_bravo) + var/obj/structure/machinery/cm_vending/sorted/uniform_supply/medic_equip_charlie/medic_vendor_charlie = new(loc_from_corner(5, 3)) + add_to_tracking_atoms(medic_vendor_charlie) diff --git a/code/game/machinery/vending/vendor_types/squad_prep/tutorial.dm b/code/game/machinery/vending/vendor_types/squad_prep/tutorial.dm index c1cedd85c7fc..9eeace9156f6 100644 --- a/code/game/machinery/vending/vendor_types/squad_prep/tutorial.dm +++ b/code/game/machinery/vending/vendor_types/squad_prep/tutorial.dm @@ -26,5 +26,93 @@ GLOBAL_LIST_INIT(cm_vending_clothing_tutorial, list( vendor_role = list() -/obj/structure/machinery/cm_vending/clothing/tutorial/get_listed_products(mob/user) - return GLOB.cm_vending_clothing_tutorial +/obj/structure/machinery/cm_vending/clothing/tutorialmed/get_listed_products(mob/user) + return GLOB.cm_vending_clothing_tutorialstandard + +// Med Standard Vendor Tutorial +GLOBAL_LIST_INIT(cm_vending_clothing_tutorialstandard, list( + list("STANDARD EQUIPMENT (TAKE ALL)", 0, null, null, null), + list("Standard Marine Apparel", 0, list(/obj/item/clothing/under/marine, /obj/item/clothing/shoes/marine/knife, /obj/item/clothing/gloves/marine, /obj/item/clothing/head/helmet/marine), MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_MANDATORY), + + list("ARMOR (CHOOSE 1)", 0, null, null, null), + list("Medium Armor", 0, /obj/item/clothing/suit/storage/marine/medium, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_REGULAR), + + list("BACKPACK (CHOOSE 1)", 0, null, null, null), + list("Satchel", 0, /obj/item/storage/backpack/marine/satchel, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_RECOMMENDED), + + list("BELT (CHOOSE 1)", 0, null, null, null), + list("M276 Ammo Load Rig", 0, /obj/item/storage/belt/marine, MARINE_CAN_BUY_BELT, VENDOR_ITEM_RECOMMENDED), + + )) + +/obj/structure/machinery/cm_vending/clothing/tutorialmed + name = "\improper ColMarTech Automated Marine Equipment Rack" + desc = "An automated rack hooked up to a colossal storage of Marine Rifleman standard-issue equipment." + icon_state = "mar_rack" + show_points = TRUE + vendor_theme = VENDOR_THEME_USCM + req_access = list(ACCESS_TUTORIAL_LOCKED) + + vendor_role = list() + +/obj/structure/machinery/cm_vending/clothing/tutorialmed/get_listed_products(mob/user) + return GLOB.cm_vending_clothing_tutorialstandard + + + +//Standard Med Vendor 1 +GLOBAL_LIST_INIT(cm_vending_clothing_tutorial_medic, list( + list("POUCHES (CHOOSE 1)", 0, null, null, null), + list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + )) + +/obj/structure/machinery/cm_vending/clothing/medic_equip + name = "\improper ColMarTech Automated Marine Equipment Rack" + desc = "An automated rack hooked up to a colossal storage of Marine Rifleman standard-issue equipment." + icon_state = "mar_rack" + show_points = TRUE + vendor_theme = VENDOR_THEME_USCM + req_access = list(ACCESS_TUTORIAL_LOCKED) + + vendor_role = list() + +/obj/structure/machinery/cm_vending/clothing/medic_equip/get_listed_products(mob/user) + return GLOB.cm_vending_clothing_tutorial_medic + +//Standard Med Vendor 2 +GLOBAL_LIST_INIT(cm_vending_clothing_tutorial_medic_bravo, list( + list("POUCHES (CHOOSE 1)", 0, null, null, null), + list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + )) +/obj/structure/machinery/cm_vending/clothing/medic_equip_bravo + name = "\improper ColMarTech Automated Marine Equipment Rack" + desc = "An automated rack hooked up to a colossal storage of Marine Rifleman standard-issue equipment." + icon_state = "mar_rack" + show_points = TRUE + vendor_theme = VENDOR_THEME_USCM + req_access = list(ACCESS_TUTORIAL_LOCKED) + + vendor_role = list() + +/obj/structure/machinery/cm_vending/clothing/medic_equip_bravo/get_listed_products(mob/user) + return GLOB.cm_vending_clothing_tutorial_medic_bravo + +//Standard Med Vendor 3 +GLOBAL_LIST_INIT(cm_vending_clothing_tutorial_medic_charlie, list( + list("POUCHES (CHOOSE 1)", 0, null, null, null), + list("First-Aid Pouch (Pill Packets)", 1, /obj/item/storage/pouch/firstaid/full/pills, VENDOR_ITEM_REGULAR), + )) + +/obj/structure/machinery/cm_vending/sorted/uniform_supply/medic_equip_charlie + name = "\improper ColMarTech Surplus Uniform Vendor" + desc = "An automated supply rack hooked up to a small storage of standard marine uniforms." + icon_state = "mar_rack" + show_points = TRUE + vendor_theme = VENDOR_THEME_USCM + req_access = list(ACCESS_TUTORIAL_LOCKED) + req_one_access = list() + + vendor_role = list() + +/obj/structure/machinery/cm_vending/sorted/uniform_supply/medic_equip_charlie/get_listed_products(mob/user) + return GLOB.cm_vending_clothing_tutorial_medic_charlie From e94d3e5616de410b0e7abd7ece9026aa7b925836 Mon Sep 17 00:00:00 2001 From: Steelpoint Date: Thu, 11 Jan 2024 17:49:28 +0800 Subject: [PATCH 2/8] aaaaaaaa --- code/datums/tutorial/marine/medical_basic_item.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/datums/tutorial/marine/medical_basic_item.dm b/code/datums/tutorial/marine/medical_basic_item.dm index 0bb6cb1adc8d..308e8c578c53 100644 --- a/code/datums/tutorial/marine/medical_basic_item.dm +++ b/code/datums/tutorial/marine/medical_basic_item.dm @@ -285,7 +285,7 @@ SIGNAL_HANDLER message_to_player("Feel free to examine these items. When you are finished, eat the food to end the tutoiral.") - update_objective("Eat the food bar when you are ready to end the tutorial") + update_objective("Eat the food bar when you are ready to end the tutorial.") var/obj/item/reagent_container/food/snacks/protein_pack/food = new(loc_from_corner(3, 3)) add_to_tracking_atoms(food) add_highlight(food) @@ -295,7 +295,7 @@ SIGNAL_HANDLER message_to_player("Good luck Marine") - update_objective("") + update_objective("Tutorial completed") tutorial_end_in(5 SECONDS, TRUE) // END OF SCRIPTING From b0198e8ac8f572a775d8cf62573110d622feb1fb Mon Sep 17 00:00:00 2001 From: Steelpoint Date: Thu, 11 Jan 2024 17:58:45 +0800 Subject: [PATCH 3/8] Fix --- .../machinery/vending/vendor_types/squad_prep/tutorial.dm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/code/game/machinery/vending/vendor_types/squad_prep/tutorial.dm b/code/game/machinery/vending/vendor_types/squad_prep/tutorial.dm index 9eeace9156f6..e6efe26c28cd 100644 --- a/code/game/machinery/vending/vendor_types/squad_prep/tutorial.dm +++ b/code/game/machinery/vending/vendor_types/squad_prep/tutorial.dm @@ -26,10 +26,11 @@ GLOBAL_LIST_INIT(cm_vending_clothing_tutorial, list( vendor_role = list() -/obj/structure/machinery/cm_vending/clothing/tutorialmed/get_listed_products(mob/user) - return GLOB.cm_vending_clothing_tutorialstandard +/obj/structure/machinery/cm_vending/clothing/tutorial/get_listed_products(mob/user) + return GLOB.cm_vending_clothing_tutorial // Med Standard Vendor Tutorial + GLOBAL_LIST_INIT(cm_vending_clothing_tutorialstandard, list( list("STANDARD EQUIPMENT (TAKE ALL)", 0, null, null, null), list("Standard Marine Apparel", 0, list(/obj/item/clothing/under/marine, /obj/item/clothing/shoes/marine/knife, /obj/item/clothing/gloves/marine, /obj/item/clothing/head/helmet/marine), MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_MANDATORY), @@ -58,8 +59,6 @@ GLOBAL_LIST_INIT(cm_vending_clothing_tutorialstandard, list( /obj/structure/machinery/cm_vending/clothing/tutorialmed/get_listed_products(mob/user) return GLOB.cm_vending_clothing_tutorialstandard - - //Standard Med Vendor 1 GLOBAL_LIST_INIT(cm_vending_clothing_tutorial_medic, list( list("POUCHES (CHOOSE 1)", 0, null, null, null), From 084b541cb2971024655ecff8898a1fb477476095 Mon Sep 17 00:00:00 2001 From: Steelpoint Date: Thu, 11 Jan 2024 18:06:56 +0800 Subject: [PATCH 4/8] ForgotSomething --- colonialmarines.dme | 1 + 1 file changed, 1 insertion(+) diff --git a/colonialmarines.dme b/colonialmarines.dme index ec330db86a4d..41364efe98f8 100644 --- a/colonialmarines.dme +++ b/colonialmarines.dme @@ -675,6 +675,7 @@ #include "code\datums\tutorial\ss13\_ss13.dm" #include "code\datums\tutorial\ss13\basic_ss13.dm" #include "code\datums\tutorial\ss13\intents.dm" +#include "code\datums\tutorial\marine\medical_basic_item.dm" #include "code\datums\weather\weather_event.dm" #include "code\datums\weather\weather_map_holder.dm" #include "code\datums\weather\weather_events\big_red.dm" From f286fc043c6cd42adcb54064aefc385ac2032adb Mon Sep 17 00:00:00 2001 From: Steelpoint Date: Thu, 11 Jan 2024 18:15:14 +0800 Subject: [PATCH 5/8] FinalTutChangeMainNoFix --- .../tutorial/marine/medical_basic_item.dm | 13 ++- .../vendor_types/squad_prep/tutorial.dm | 83 +++++++++++++++++++ colonialmarines.dme | 2 +- 3 files changed, 93 insertions(+), 5 deletions(-) diff --git a/code/datums/tutorial/marine/medical_basic_item.dm b/code/datums/tutorial/marine/medical_basic_item.dm index 308e8c578c53..caf8224271eb 100644 --- a/code/datums/tutorial/marine/medical_basic_item.dm +++ b/code/datums/tutorial/marine/medical_basic_item.dm @@ -19,7 +19,7 @@ init_mob() message_to_player("This tutorial will discuss the medical tools you will use as a standard Marine.") addtimer(CALLBACK(src, PROC_REF(intro_one)), 6 SECONDS) -//pouch_one intro_one + /datum/tutorial/marine/medical_basic_item/proc/intro_one() message_to_player("You are capable of tending to your own basic injuries without needing Corpsman (sometimes called a Medic) to assist you.") update_objective("") @@ -284,8 +284,11 @@ /datum/tutorial/marine/medical_basic_item/proc/pouch_eleven() SIGNAL_HANDLER - message_to_player("Feel free to examine these items. When you are finished, eat the food to end the tutoiral.") - update_objective("Eat the food bar when you are ready to end the tutorial.") + message_to_player("Feel free to examine these items, and use the prep vendor to experiment with storing these medical items. When you are finished, eat the food to end the tutoiral.") + update_objective("Eat the food bar when you are ready to end the tutorial") + TUTORIAL_ATOM_FROM_TRACKING(/obj/structure/machinery/cm_vending/sorted/uniform_supply/squad_prep_tutorial, prep_vendor) + add_highlight(prep_vendor) + prep_vendor.req_access = list() var/obj/item/reagent_container/food/snacks/protein_pack/food = new(loc_from_corner(3, 3)) add_to_tracking_atoms(food) add_highlight(food) @@ -295,7 +298,7 @@ SIGNAL_HANDLER message_to_player("Good luck Marine") - update_objective("Tutorial completed") + update_objective("") tutorial_end_in(5 SECONDS, TRUE) // END OF SCRIPTING @@ -323,3 +326,5 @@ add_to_tracking_atoms(medic_vendor_bravo) var/obj/structure/machinery/cm_vending/sorted/uniform_supply/medic_equip_charlie/medic_vendor_charlie = new(loc_from_corner(5, 3)) add_to_tracking_atoms(medic_vendor_charlie) + var/obj/structure/machinery/cm_vending/sorted/uniform_supply/squad_prep_tutorial/prep_vendor = new(loc_from_corner(0, 2)) + add_to_tracking_atoms(prep_vendor) diff --git a/code/game/machinery/vending/vendor_types/squad_prep/tutorial.dm b/code/game/machinery/vending/vendor_types/squad_prep/tutorial.dm index e6efe26c28cd..236819fd698d 100644 --- a/code/game/machinery/vending/vendor_types/squad_prep/tutorial.dm +++ b/code/game/machinery/vending/vendor_types/squad_prep/tutorial.dm @@ -115,3 +115,86 @@ GLOBAL_LIST_INIT(cm_vending_clothing_tutorial_medic_charlie, list( /obj/structure/machinery/cm_vending/sorted/uniform_supply/medic_equip_charlie/get_listed_products(mob/user) return GLOB.cm_vending_clothing_tutorial_medic_charlie + +/obj/structure/machinery/cm_vending/sorted/uniform_supply/squad_prep_tutorial + name = "\improper ColMarTech Surplus Uniform Vendor" + desc = "An automated supply rack hooked up to a small storage of standard marine uniforms." + vendor_theme = VENDOR_THEME_USCM + req_access = list(ACCESS_TUTORIAL_LOCKED) + req_one_access = list() + + vendor_role = list() + +/obj/structure/machinery/cm_vending/sorted/uniform_supply/squad_prep_tutorial/get_listed_products(mob/user) + return GLOB.cm_vending_clothing_tutorial_prep + +GLOBAL_LIST_INIT(cm_vending_clothing_tutorial_prep, list( + list("STANDARD EQUIPMENT", 0, null, null, null), + list("Marine Combat Boots", 1, /obj/item/clothing/shoes/marine, VENDOR_ITEM_REGULAR), + list("Marine Brown Combat Boots", 1, /obj/item/clothing/shoes/marine/brown, VENDOR_ITEM_REGULAR), + list("USCM Uniform", 1, /obj/item/clothing/under/marine, VENDOR_ITEM_REGULAR), + list("Marine Combat Gloves", 1, /obj/item/clothing/gloves/marine, VENDOR_ITEM_REGULAR), + list("Marine Brown Combat Gloves", 1, /obj/item/clothing/gloves/marine/brown, VENDOR_ITEM_REGULAR), + list("Marine Black Combat Gloves", 1, /obj/item/clothing/gloves/marine/black, VENDOR_ITEM_REGULAR), + list("Marine Radio Headset", 1, /obj/item/device/radio/headset/almayer, VENDOR_ITEM_REGULAR), + list("M10 Pattern Marine Helmet", 1, /obj/item/clothing/head/helmet/marine, VENDOR_ITEM_REGULAR), + + list("WEBBINGS", 0, null, null), + list("Brown Webbing Vest", 1, /obj/item/clothing/accessory/storage/black_vest/brown_vest, VENDOR_ITEM_REGULAR), + list("Black Webbing Vest", 1, /obj/item/clothing/accessory/storage/black_vest, VENDOR_ITEM_REGULAR), + list("Webbing", 1, /obj/item/clothing/accessory/storage/webbing, VENDOR_ITEM_REGULAR), + list("Drop Pouch", 1, /obj/item/clothing/accessory/storage/droppouch, VENDOR_ITEM_REGULAR), + list("Shoulder Holster", 1, /obj/item/clothing/accessory/storage/holster, VENDOR_ITEM_REGULAR), + + list("ARMOR", 0, null, null), + list("M3 Pattern Carrier Marine Armor", 1, /obj/item/clothing/suit/storage/marine/medium/carrier, VENDOR_ITEM_REGULAR), + list("M3-EOD Pattern Heavy Armor", 1, /obj/item/clothing/suit/storage/marine/heavy, VENDOR_ITEM_REGULAR), + list("M3-L Pattern Light Armor", 1, /obj/item/clothing/suit/storage/marine/light, VENDOR_ITEM_REGULAR), + + list("BACKPACK", 0, null, null, null), + list("Lightweight IMP Backpack", 1, /obj/item/storage/backpack/marine, VENDOR_ITEM_REGULAR), + list("Technician Backpack", 1, /obj/item/storage/backpack/marine/tech, VENDOR_ITEM_REGULAR), + list("Medical Backpack", 1, /obj/item/storage/backpack/marine/medic, VENDOR_ITEM_REGULAR), + list("USCM Satchel", 1, /obj/item/storage/backpack/marine/satchel, VENDOR_ITEM_REGULAR), + list("USCM Technical Satchel", 1, /obj/item/storage/backpack/marine/satchel/tech, VENDOR_ITEM_REGULAR), + list("USCM Technical Chestrig", 1, /obj/item/storage/backpack/marine/engineerpack/welder_chestrig, VENDOR_ITEM_REGULAR), + list("Medical Satchel", 1, /obj/item/storage/backpack/marine/satchel/medic, VENDOR_ITEM_REGULAR), + list("Shotgun Scabbard", 1, /obj/item/storage/large_holster/m37, VENDOR_ITEM_REGULAR), + + list("RESTRICTED BACKPACKS", 0, null, null), + list("USCM Technician Welderpack", 1, /obj/item/storage/backpack/marine/engineerpack, VENDOR_ITEM_REGULAR), + list("Technician Welder-Satchel", 1, /obj/item/storage/backpack/marine/engineerpack/satchel, VENDOR_ITEM_REGULAR), + list("Radio Telephone Backpack", 1, /obj/item/storage/backpack/marine/satchel/rto, VENDOR_ITEM_REGULAR), + + list("BELTS", 0, null, null), + list("M276 Pattern Ammo Load Rig", 1, /obj/item/storage/belt/marine, VENDOR_ITEM_REGULAR), + list("M276 Pattern M40 Grenade Rig", 1, /obj/item/storage/belt/grenade, VENDOR_ITEM_REGULAR), + list("M276 Pattern Shotgun Shell Loading Rig", 1, /obj/item/storage/belt/shotgun, VENDOR_ITEM_REGULAR), + list("M276 Pattern General Pistol Holster Rig", 1, /obj/item/storage/belt/gun/m4a3, VENDOR_ITEM_REGULAR), + list("M276 Pattern M39 Holster Rig", 1, /obj/item/storage/large_holster/m39, VENDOR_ITEM_REGULAR), + list("M276 Pattern M39 Holster Rig And Pouch", 1, /obj/item/storage/belt/gun/m39, VENDOR_ITEM_REGULAR), + list("M276 Pattern M44 Holster Rig", 1, /obj/item/storage/belt/gun/m44, VENDOR_ITEM_REGULAR), + list("M276 Pattern M82F Holster Rig", 1, /obj/item/storage/belt/gun/flaregun, VENDOR_ITEM_REGULAR), + list("M276 Knife Rig (Full)", 1, /obj/item/storage/belt/knifepouch, VENDOR_ITEM_REGULAR), + list("M276 G8-A General Utility Pouch", 1, /obj/item/storage/backpack/general_belt, VENDOR_ITEM_REGULAR), + + list("POUCHES", 0, null, null, null), + list("Bayonet Sheath (Full)",1, /obj/item/storage/pouch/bayonet, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Splints, Gauze, Ointment)", 1, /obj/item/storage/pouch/firstaid/full/alternate, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Pill Packets)", 1, /obj/item/storage/pouch/firstaid/full/pills, VENDOR_ITEM_REGULAR), + list("Flare Pouch (Full)", 1, /obj/item/storage/pouch/flare/full, VENDOR_ITEM_REGULAR), + list("Small Document Pouch", 1, /obj/item/storage/pouch/document/small, VENDOR_ITEM_REGULAR), + list("Magazine Pouch", 1, /obj/item/storage/pouch/magazine, VENDOR_ITEM_REGULAR), + list("Shotgun Shell Pouch", 1, /obj/item/storage/pouch/shotgun, VENDOR_ITEM_REGULAR), + list("Medium General Pouch", 1, /obj/item/storage/pouch/general/medium, VENDOR_ITEM_REGULAR), + list("Pistol Magazine Pouch", 1, /obj/item/storage/pouch/magazine/pistol, VENDOR_ITEM_REGULAR), + list("Pistol Pouch", 1, /obj/item/storage/pouch/pistol, VENDOR_ITEM_REGULAR), + + list("RESTRICTED POUCHES", 0, null, null, null), + list("Construction Pouch", 1, /obj/item/storage/pouch/construction, VENDOR_ITEM_REGULAR), + list("Explosive Pouch", 1, /obj/item/storage/pouch/explosive, VENDOR_ITEM_REGULAR), + list("First Responder Pouch (Empty)", 1, /obj/item/storage/pouch/first_responder, VENDOR_ITEM_REGULAR), + list("Large Pistol Magazine Pouch", 1, /obj/item/storage/pouch/magazine/pistol/large, VENDOR_ITEM_REGULAR), + list("Tools Pouch", 1, /obj/item/storage/pouch/tools, VENDOR_ITEM_REGULAR), + list("Sling Pouch", 1, /obj/item/storage/pouch/sling, VENDOR_ITEM_REGULAR), + )) diff --git a/colonialmarines.dme b/colonialmarines.dme index 41364efe98f8..ac159dda6bfe 100644 --- a/colonialmarines.dme +++ b/colonialmarines.dme @@ -672,10 +672,10 @@ #include "code\datums\tutorial\marine\_marine.dm" #include "code\datums\tutorial\marine\basic_marine.dm" #include "code\datums\tutorial\marine\medical_basic.dm" +#include "code\datums\tutorial\marine\medical_basic_item.dm" #include "code\datums\tutorial\ss13\_ss13.dm" #include "code\datums\tutorial\ss13\basic_ss13.dm" #include "code\datums\tutorial\ss13\intents.dm" -#include "code\datums\tutorial\marine\medical_basic_item.dm" #include "code\datums\weather\weather_event.dm" #include "code\datums\weather\weather_map_holder.dm" #include "code\datums\weather\weather_events\big_red.dm" From ef27697301da5157c31321f66540865d44fd5b4d Mon Sep 17 00:00:00 2001 From: Steelpoint Date: Thu, 11 Jan 2024 18:19:31 +0800 Subject: [PATCH 6/8] asdasdasd --- .../tutorial/marine/medical_basic_item.dm | 38 +++++-------------- .../vendor_types/squad_prep/tutorial.dm | 12 +++--- 2 files changed, 15 insertions(+), 35 deletions(-) diff --git a/code/datums/tutorial/marine/medical_basic_item.dm b/code/datums/tutorial/marine/medical_basic_item.dm index caf8224271eb..66960ed17724 100644 --- a/code/datums/tutorial/marine/medical_basic_item.dm +++ b/code/datums/tutorial/marine/medical_basic_item.dm @@ -22,24 +22,18 @@ /datum/tutorial/marine/medical_basic_item/proc/intro_one() message_to_player("You are capable of tending to your own basic injuries without needing Corpsman (sometimes called a Medic) to assist you.") - update_objective("") addtimer(CALLBACK(src, PROC_REF(intro_two)), 6 SECONDS) /datum/tutorial/marine/medical_basic_item/proc/intro_two() message_to_player("The knowledge and ability to tend to your own injuries will allow you to not only survive, but thrive, on the battlefield.") - update_objective("") addtimer(CALLBACK(src, PROC_REF(kit_one)), 6 SECONDS) /datum/tutorial/marine/medical_basic_item/proc/kit_one() message_to_player("We will now show and discuss the basic medical items you can use. Afterwards, we will examine where you can find and store these items.") - update_objective("") addtimer(CALLBACK(src, PROC_REF(kit_two)), 6 SECONDS) /datum/tutorial/marine/medical_basic_item/proc/kit_two() - SIGNAL_HANDLER - message_to_player("These are Bandages. You can use these to heal Brute damage and stop bleeding. You always want to carry one of these.") - update_objective("") var/obj/item/stack/medical/bruise_pack/bandage = new(loc_from_corner(0, 5)) add_to_tracking_atoms(bandage) add_highlight(bandage) @@ -51,7 +45,6 @@ TUTORIAL_ATOM_FROM_TRACKING(/obj/item/stack/medical/bruise_pack, bandage) remove_highlight(bandage) message_to_player("These are Ointments. You can use these to heal Burn damage. These are less important to carry, but are useful if you have the space for it.") - update_objective("") var/obj/item/stack/medical/ointment/cream = new(loc_from_corner(0, 6)) add_to_tracking_atoms(cream) add_highlight(cream) @@ -63,7 +56,6 @@ TUTORIAL_ATOM_FROM_TRACKING(/obj/item/stack/medical/ointment, cream) remove_highlight(cream) message_to_player("These are Splints. You can use these to stabalize fractures. These are very important to use, as a unsplinted fracture can cause permanent injuries.") - update_objective("") var/obj/item/stack/medical/splint/splint = new(loc_from_corner(1, 5)) add_to_tracking_atoms(splint) add_highlight(splint) @@ -71,12 +63,10 @@ /datum/tutorial/marine/medical_basic_item/proc/interject_one() message_to_player("It is significantly faster for someone else to apply a splint to you. It is suggested you ask someone else to splint your fractures.") - update_objective("") addtimer(CALLBACK(src, PROC_REF(interject_two)), 6 SECONDS) /datum/tutorial/marine/medical_basic_item/proc/interject_two() message_to_player("Furthermore, splints can be broken by further damage, requiring a replacement. Keep a close eye on your splints for this.") - update_objective("") addtimer(CALLBACK(src, PROC_REF(kit_five)), 6 SECONDS) /datum/tutorial/marine/medical_basic_item/proc/kit_five() @@ -85,7 +75,6 @@ TUTORIAL_ATOM_FROM_TRACKING(/obj/item/stack/medical/splint, splint) remove_highlight(splint) message_to_player("These are autoinjectors, these can be used to inject yourself with a healing chemical. This one is a Bicaradine autoinjector, it heals Brute damage.") - update_objective("") var/obj/item/reagent_container/hypospray/autoinjector/bicaridine/autobic = new(loc_from_corner(1, 6)) add_to_tracking_atoms(autobic) add_highlight(autobic) @@ -97,7 +86,6 @@ TUTORIAL_ATOM_FROM_TRACKING(/obj/item/reagent_container/hypospray/autoinjector/bicaridine, autobic) remove_highlight(autobic) message_to_player("This one is a Kelotane autoinjector, it heals Burn damage.") - update_objective("") var/obj/item/reagent_container/hypospray/autoinjector/kelotane/autokel = new(loc_from_corner(2, 5)) add_to_tracking_atoms(autokel) add_highlight(autokel) @@ -109,7 +97,6 @@ TUTORIAL_ATOM_FROM_TRACKING(/obj/item/reagent_container/hypospray/autoinjector/kelotane, autokel) remove_highlight(autokel) message_to_player("This one is a Tramadol autoinjector, it helps counter Pain, which is generated by being injured.") - update_objective("") var/obj/item/reagent_container/hypospray/autoinjector/tramadol/autotra = new(loc_from_corner(2, 6)) add_to_tracking_atoms(autotra) add_highlight(autotra) @@ -117,7 +104,6 @@ /datum/tutorial/marine/medical_basic_item/proc/kit_eight() message_to_player("Tramadol is a highly dangerous medication, be certain to not overdose yourself be injecting more than three doses of this at a time. You will die if you do this.") - update_objective("") addtimer(CALLBACK(src, PROC_REF(kit_nine)), 6 SECONDS) /datum/tutorial/marine/medical_basic_item/proc/kit_nine() @@ -126,7 +112,6 @@ TUTORIAL_ATOM_FROM_TRACKING(/obj/item/reagent_container/hypospray/autoinjector/tramadol, autotra) remove_highlight(autotra) message_to_player("This one is a Tricordrazine autoinjector, it heals all damage types but slower than other chemicals. Its useful as a generalist medication for minor injuries.") - update_objective("") var/obj/item/reagent_container/hypospray/autoinjector/tricord/autotri = new(loc_from_corner(3, 5)) add_to_tracking_atoms(autotri) add_highlight(autotri) @@ -138,7 +123,6 @@ TUTORIAL_ATOM_FROM_TRACKING(/obj/item/reagent_container/hypospray/autoinjector/tricord, autotri) remove_highlight(autotri) message_to_player("This is an Emergency autoinjector. It is unique in that it is a single use, non-refillable, injector. It will inject you with a large amount of healing medications and a powerful pain killer. Use this when you are on the brink of death.") - update_objective("") var/obj/item/reagent_container/hypospray/autoinjector/emergency/autoemer = new(loc_from_corner(3, 6)) add_to_tracking_atoms(autoemer) add_highlight(autoemer) @@ -150,7 +134,6 @@ TUTORIAL_ATOM_FROM_TRACKING(/obj/item/reagent_container/hypospray/autoinjector/emergency, autoemer) remove_highlight(autoemer) message_to_player("These are pill packets. They are uncommonly issued. You get four pills per packet, one dose more than a autoinjector. But you can not refill these.") - update_objective("") var/obj/item/storage/pill_bottle/packet/bicaridine/packetbic = new(loc_from_corner(4, 5)) var/obj/item/storage/pill_bottle/packet/kelotane/packetkel = new(loc_from_corner(4, 6)) var/obj/item/storage/pill_bottle/packet/tramadol/packettram = new(loc_from_corner(5, 5)) @@ -202,7 +185,7 @@ remove_highlight(clothing_vendor) message_to_player("Now, go to your personal equipment vendor and vend the First-Aid Pouch (Refillable Injectors).") update_objective("Vend the first-aid pouch.") - TUTORIAL_ATOM_FROM_TRACKING(/obj/structure/machinery/cm_vending/clothing/medic_equip, medic_vendor_alpha) + TUTORIAL_ATOM_FROM_TRACKING(/obj/structure/machinery/cm_vending/clothing/tutorial_medic_equip, medic_vendor_alpha) add_highlight(medic_vendor_alpha) medic_vendor_alpha.req_access = list() RegisterSignal(medic_vendor_alpha, COMSIG_VENDOR_SUCCESSFUL_VEND, PROC_REF(pouch_three)) @@ -212,7 +195,7 @@ med_one_items_to_vend-- if(med_one_items_to_vend <= 0) - TUTORIAL_ATOM_FROM_TRACKING(/obj/structure/machinery/cm_vending/clothing/medic_equip, medic_vendor_alpha) + TUTORIAL_ATOM_FROM_TRACKING(/obj/structure/machinery/cm_vending/clothing/tutorial_medic_equip, medic_vendor_alpha) UnregisterSignal(medic_vendor_alpha, COMSIG_VENDOR_SUCCESSFUL_VEND) medic_vendor_alpha.req_access = list(ACCESS_TUTORIAL_LOCKED) remove_highlight(medic_vendor_alpha) @@ -222,7 +205,6 @@ /datum/tutorial/marine/medical_basic_item/proc/pouch_four() message_to_player("This pouch is unique as you can only get this from your personal vendor, the remaining two pouches can be acquired freely from the squad vendor.") - update_objective("") addtimer(CALLBACK(src, PROC_REF(pouch_five)), 6 SECONDS) /datum/tutorial/marine/medical_basic_item/proc/pouch_five() @@ -230,7 +212,7 @@ message_to_player("Vend the First-Aid Pouch (Splints, Gauze, Ointment).") update_objective("Vend everything inside the ColMarTech Automated Closet.") - TUTORIAL_ATOM_FROM_TRACKING(/obj/structure/machinery/cm_vending/clothing/medic_equip_bravo, medic_vendor_bravo) + TUTORIAL_ATOM_FROM_TRACKING(/obj/structure/machinery/cm_vending/clothing/tutorial_medic_equip_bravo, medic_vendor_bravo) add_highlight(medic_vendor_bravo) medic_vendor_bravo.req_access = list() RegisterSignal(medic_vendor_bravo, COMSIG_VENDOR_SUCCESSFUL_VEND, PROC_REF(pouch_six)) @@ -240,7 +222,7 @@ med_two_items_to_vend-- if(med_two_items_to_vend <= 0) - TUTORIAL_ATOM_FROM_TRACKING(/obj/structure/machinery/cm_vending/clothing/medic_equip_bravo, medic_vendor_bravo) + TUTORIAL_ATOM_FROM_TRACKING(/obj/structure/machinery/cm_vending/clothing/tutorial_medic_equip_bravo, medic_vendor_bravo) UnregisterSignal(medic_vendor_bravo, COMSIG_VENDOR_SUCCESSFUL_VEND) medic_vendor_bravo.req_access = list(ACCESS_TUTORIAL_LOCKED) remove_highlight(medic_vendor_bravo) @@ -250,7 +232,6 @@ /datum/tutorial/marine/medical_basic_item/proc/pouch_seven() message_to_player("You can vend these items from the marine medical vendor in the ship's medbay, as an alternative source.") - update_objective("") addtimer(CALLBACK(src, PROC_REF(pouch_eight)), 6 SECONDS) /datum/tutorial/marine/medical_basic_item/proc/pouch_eight() @@ -258,7 +239,7 @@ message_to_player("Vend the First-Aid Pouch (Pills).") update_objective("Vend everything inside the ColMarTech Automated Closet.") - TUTORIAL_ATOM_FROM_TRACKING(/obj/structure/machinery/cm_vending/sorted/uniform_supply/medic_equip_charlie, medic_vendor_charlie) + TUTORIAL_ATOM_FROM_TRACKING(/obj/structure/machinery/cm_vending/sorted/uniform_supply/tutorial_medic_equip_charlie, medic_vendor_charlie) add_highlight(medic_vendor_charlie) medic_vendor_charlie.req_access = list() RegisterSignal(medic_vendor_charlie, COMSIG_VENDOR_SUCCESSFUL_VEND, PROC_REF(pouch_nine)) @@ -268,7 +249,7 @@ med_three_items_to_vend-- if(med_three_items_to_vend <= 0) - TUTORIAL_ATOM_FROM_TRACKING(/obj/structure/machinery/cm_vending/sorted/uniform_supply/medic_equip_charlie, medic_vendor_charlie) + TUTORIAL_ATOM_FROM_TRACKING(/obj/structure/machinery/cm_vending/sorted/uniform_supply/tutorial_medic_equip_charlie, medic_vendor_charlie) UnregisterSignal(medic_vendor_charlie, COMSIG_VENDOR_SUCCESSFUL_VEND) medic_vendor_charlie.req_access = list(ACCESS_TUTORIAL_LOCKED) remove_highlight(medic_vendor_charlie) @@ -278,7 +259,6 @@ /datum/tutorial/marine/medical_basic_item/proc/pouch_ten() message_to_player("It will be up to you to figure out which of these you should take. You can consider using these pouches, or placing some of them in your satchel/backpack.") - update_objective("") addtimer(CALLBACK(src, PROC_REF(pouch_eleven)), 6 SECONDS) /datum/tutorial/marine/medical_basic_item/proc/pouch_eleven() @@ -320,11 +300,11 @@ new /obj/structure/surface/table/almayer(loc_from_corner(5, 4)) var/obj/structure/machinery/cm_vending/clothing/tutorialmed/clothing_vendor = new(loc_from_corner(5, 0)) add_to_tracking_atoms(clothing_vendor) - var/obj/structure/machinery/cm_vending/clothing/medic_equip/medic_vendor_alpha = new(loc_from_corner(5, 1)) + var/obj/structure/machinery/cm_vending/clothing/tutorial_medic_equip/medic_vendor_alpha = new(loc_from_corner(5, 1)) add_to_tracking_atoms(medic_vendor_alpha) - var/obj/structure/machinery/cm_vending/clothing/medic_equip_bravo/medic_vendor_bravo = new(loc_from_corner(5, 2)) + var/obj/structure/machinery/cm_vending/clothing/tutorial_medic_equip_bravo/medic_vendor_bravo = new(loc_from_corner(5, 2)) add_to_tracking_atoms(medic_vendor_bravo) - var/obj/structure/machinery/cm_vending/sorted/uniform_supply/medic_equip_charlie/medic_vendor_charlie = new(loc_from_corner(5, 3)) + var/obj/structure/machinery/cm_vending/sorted/uniform_supply/tutorial_medic_equip_charlie/medic_vendor_charlie = new(loc_from_corner(5, 3)) add_to_tracking_atoms(medic_vendor_charlie) var/obj/structure/machinery/cm_vending/sorted/uniform_supply/squad_prep_tutorial/prep_vendor = new(loc_from_corner(0, 2)) add_to_tracking_atoms(prep_vendor) diff --git a/code/game/machinery/vending/vendor_types/squad_prep/tutorial.dm b/code/game/machinery/vending/vendor_types/squad_prep/tutorial.dm index 236819fd698d..dd1418a873db 100644 --- a/code/game/machinery/vending/vendor_types/squad_prep/tutorial.dm +++ b/code/game/machinery/vending/vendor_types/squad_prep/tutorial.dm @@ -65,7 +65,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_tutorial_medic, list( list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), )) -/obj/structure/machinery/cm_vending/clothing/medic_equip +/obj/structure/machinery/cm_vending/clothing/tutorial_medic_equip name = "\improper ColMarTech Automated Marine Equipment Rack" desc = "An automated rack hooked up to a colossal storage of Marine Rifleman standard-issue equipment." icon_state = "mar_rack" @@ -75,7 +75,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_tutorial_medic, list( vendor_role = list() -/obj/structure/machinery/cm_vending/clothing/medic_equip/get_listed_products(mob/user) +/obj/structure/machinery/cm_vending/clothing/tutorial_medic_equip/get_listed_products(mob/user) return GLOB.cm_vending_clothing_tutorial_medic //Standard Med Vendor 2 @@ -83,7 +83,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_tutorial_medic_bravo, list( list("POUCHES (CHOOSE 1)", 0, null, null, null), list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), )) -/obj/structure/machinery/cm_vending/clothing/medic_equip_bravo +/obj/structure/machinery/cm_vending/clothing/tutorial_medic_equip_bravo name = "\improper ColMarTech Automated Marine Equipment Rack" desc = "An automated rack hooked up to a colossal storage of Marine Rifleman standard-issue equipment." icon_state = "mar_rack" @@ -93,7 +93,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_tutorial_medic_bravo, list( vendor_role = list() -/obj/structure/machinery/cm_vending/clothing/medic_equip_bravo/get_listed_products(mob/user) +/obj/structure/machinery/cm_vending/clothing/tutorial_medic_equip_bravo/get_listed_products(mob/user) return GLOB.cm_vending_clothing_tutorial_medic_bravo //Standard Med Vendor 3 @@ -102,7 +102,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_tutorial_medic_charlie, list( list("First-Aid Pouch (Pill Packets)", 1, /obj/item/storage/pouch/firstaid/full/pills, VENDOR_ITEM_REGULAR), )) -/obj/structure/machinery/cm_vending/sorted/uniform_supply/medic_equip_charlie +/obj/structure/machinery/cm_vending/sorted/uniform_supply/tutorial_medic_equip_charlie name = "\improper ColMarTech Surplus Uniform Vendor" desc = "An automated supply rack hooked up to a small storage of standard marine uniforms." icon_state = "mar_rack" @@ -113,7 +113,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_tutorial_medic_charlie, list( vendor_role = list() -/obj/structure/machinery/cm_vending/sorted/uniform_supply/medic_equip_charlie/get_listed_products(mob/user) +/obj/structure/machinery/cm_vending/sorted/uniform_supply/tutorial_medic_equip_charlie/get_listed_products(mob/user) return GLOB.cm_vending_clothing_tutorial_medic_charlie /obj/structure/machinery/cm_vending/sorted/uniform_supply/squad_prep_tutorial From c49dbf030b10e8f8dbf6d6cea74e9de9f41e2e10 Mon Sep 17 00:00:00 2001 From: Steelpoint Date: Thu, 11 Jan 2024 18:21:35 +0800 Subject: [PATCH 7/8] morefixFix --- .../datums/tutorial/marine/medical_basic_item.dm | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/code/datums/tutorial/marine/medical_basic_item.dm b/code/datums/tutorial/marine/medical_basic_item.dm index 66960ed17724..39cb6da8736e 100644 --- a/code/datums/tutorial/marine/medical_basic_item.dm +++ b/code/datums/tutorial/marine/medical_basic_item.dm @@ -40,8 +40,6 @@ addtimer(CALLBACK(src, PROC_REF(kit_three)), 6 SECONDS) /datum/tutorial/marine/medical_basic_item/proc/kit_three() - SIGNAL_HANDLER - TUTORIAL_ATOM_FROM_TRACKING(/obj/item/stack/medical/bruise_pack, bandage) remove_highlight(bandage) message_to_player("These are Ointments. You can use these to heal Burn damage. These are less important to carry, but are useful if you have the space for it.") @@ -51,8 +49,6 @@ addtimer(CALLBACK(src, PROC_REF(kit_four)), 6 SECONDS) /datum/tutorial/marine/medical_basic_item/proc/kit_four() - SIGNAL_HANDLER - TUTORIAL_ATOM_FROM_TRACKING(/obj/item/stack/medical/ointment, cream) remove_highlight(cream) message_to_player("These are Splints. You can use these to stabalize fractures. These are very important to use, as a unsplinted fracture can cause permanent injuries.") @@ -70,8 +66,6 @@ addtimer(CALLBACK(src, PROC_REF(kit_five)), 6 SECONDS) /datum/tutorial/marine/medical_basic_item/proc/kit_five() - SIGNAL_HANDLER - TUTORIAL_ATOM_FROM_TRACKING(/obj/item/stack/medical/splint, splint) remove_highlight(splint) message_to_player("These are autoinjectors, these can be used to inject yourself with a healing chemical. This one is a Bicaradine autoinjector, it heals Brute damage.") @@ -81,8 +75,6 @@ addtimer(CALLBACK(src, PROC_REF(kit_six)), 6 SECONDS) /datum/tutorial/marine/medical_basic_item/proc/kit_six() - SIGNAL_HANDLER - TUTORIAL_ATOM_FROM_TRACKING(/obj/item/reagent_container/hypospray/autoinjector/bicaridine, autobic) remove_highlight(autobic) message_to_player("This one is a Kelotane autoinjector, it heals Burn damage.") @@ -92,8 +84,6 @@ addtimer(CALLBACK(src, PROC_REF(kit_seven)), 6 SECONDS) /datum/tutorial/marine/medical_basic_item/proc/kit_seven() - SIGNAL_HANDLER - TUTORIAL_ATOM_FROM_TRACKING(/obj/item/reagent_container/hypospray/autoinjector/kelotane, autokel) remove_highlight(autokel) message_to_player("This one is a Tramadol autoinjector, it helps counter Pain, which is generated by being injured.") @@ -107,8 +97,6 @@ addtimer(CALLBACK(src, PROC_REF(kit_nine)), 6 SECONDS) /datum/tutorial/marine/medical_basic_item/proc/kit_nine() - SIGNAL_HANDLER - TUTORIAL_ATOM_FROM_TRACKING(/obj/item/reagent_container/hypospray/autoinjector/tramadol, autotra) remove_highlight(autotra) message_to_player("This one is a Tricordrazine autoinjector, it heals all damage types but slower than other chemicals. Its useful as a generalist medication for minor injuries.") @@ -118,8 +106,6 @@ addtimer(CALLBACK(src, PROC_REF(kit_ten)), 6 SECONDS) /datum/tutorial/marine/medical_basic_item/proc/kit_ten() - SIGNAL_HANDLER - TUTORIAL_ATOM_FROM_TRACKING(/obj/item/reagent_container/hypospray/autoinjector/tricord, autotri) remove_highlight(autotri) message_to_player("This is an Emergency autoinjector. It is unique in that it is a single use, non-refillable, injector. It will inject you with a large amount of healing medications and a powerful pain killer. Use this when you are on the brink of death.") @@ -129,8 +115,6 @@ addtimer(CALLBACK(src, PROC_REF(kit_eleven)), 8 SECONDS) /datum/tutorial/marine/medical_basic_item/proc/kit_eleven() - SIGNAL_HANDLER - TUTORIAL_ATOM_FROM_TRACKING(/obj/item/reagent_container/hypospray/autoinjector/emergency, autoemer) remove_highlight(autoemer) message_to_player("These are pill packets. They are uncommonly issued. You get four pills per packet, one dose more than a autoinjector. But you can not refill these.") From fc0d8e12b52361f935b3b7cdeb8830f01d611f5a Mon Sep 17 00:00:00 2001 From: Steelpoint Date: Fri, 12 Jan 2024 01:15:11 +0800 Subject: [PATCH 8/8] ReqChange --- .../tutorial/marine/medical_basic_item.dm | 74 +++++++++---------- .../vendor_types/squad_prep/tutorial.dm | 16 ++-- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/code/datums/tutorial/marine/medical_basic_item.dm b/code/datums/tutorial/marine/medical_basic_item.dm index 39cb6da8736e..452e06381d7e 100644 --- a/code/datums/tutorial/marine/medical_basic_item.dm +++ b/code/datums/tutorial/marine/medical_basic_item.dm @@ -33,7 +33,7 @@ addtimer(CALLBACK(src, PROC_REF(kit_two)), 6 SECONDS) /datum/tutorial/marine/medical_basic_item/proc/kit_two() - message_to_player("These are Bandages. You can use these to heal Brute damage and stop bleeding. You always want to carry one of these.") + message_to_player("This is a Bandage. You can use these to heal Brute damage and stop bleeding. You always want to carry one of these.") var/obj/item/stack/medical/bruise_pack/bandage = new(loc_from_corner(0, 5)) add_to_tracking_atoms(bandage) add_highlight(bandage) @@ -42,7 +42,7 @@ /datum/tutorial/marine/medical_basic_item/proc/kit_three() TUTORIAL_ATOM_FROM_TRACKING(/obj/item/stack/medical/bruise_pack, bandage) remove_highlight(bandage) - message_to_player("These are Ointments. You can use these to heal Burn damage. These are less important to carry, but are useful if you have the space for it.") + message_to_player("This is Ointment. You can use these to heal Burn damage. These are less important to carry, but are useful if you have the space for it.") var/obj/item/stack/medical/ointment/cream = new(loc_from_corner(0, 6)) add_to_tracking_atoms(cream) add_highlight(cream) @@ -51,7 +51,7 @@ /datum/tutorial/marine/medical_basic_item/proc/kit_four() TUTORIAL_ATOM_FROM_TRACKING(/obj/item/stack/medical/ointment, cream) remove_highlight(cream) - message_to_player("These are Splints. You can use these to stabalize fractures. These are very important to use, as a unsplinted fracture can cause permanent injuries.") + message_to_player("This is a Splint. You can use these to stabalize fractures. These are very important to use, as a unsplinted fracture can cause permanent injuries.") var/obj/item/stack/medical/splint/splint = new(loc_from_corner(1, 5)) add_to_tracking_atoms(splint) add_highlight(splint) @@ -138,8 +138,8 @@ remove_highlight(packetbic) remove_highlight(packetkel) remove_highlight(packettram) - message_to_player("Take this moment to pause and review the previous chat logs, or the medical items on the floor. When you are ready, please take the food bar and eat it.") - update_objective("Eat the food bar when you are ready to continue") + message_to_player("Take this moment to pause and review the previous chat logs or the medical items on the floor. When you are ready, please take the food bar and eat it.") + update_objective("Eat the food bar when you are ready to continue.") var/obj/item/reagent_container/food/snacks/protein_pack/food = new(loc_from_corner(3, 3)) add_to_tracking_atoms(food) add_highlight(food) @@ -169,20 +169,20 @@ remove_highlight(clothing_vendor) message_to_player("Now, go to your personal equipment vendor and vend the First-Aid Pouch (Refillable Injectors).") update_objective("Vend the first-aid pouch.") - TUTORIAL_ATOM_FROM_TRACKING(/obj/structure/machinery/cm_vending/clothing/tutorial_medic_equip, medic_vendor_alpha) - add_highlight(medic_vendor_alpha) - medic_vendor_alpha.req_access = list() - RegisterSignal(medic_vendor_alpha, COMSIG_VENDOR_SUCCESSFUL_VEND, PROC_REF(pouch_three)) + TUTORIAL_ATOM_FROM_TRACKING(/obj/structure/machinery/cm_vending/clothing/tutorial_medic_equip, medic_vendor_injector) + add_highlight(medic_vendor_injector) + medic_vendor_injector.req_access = list() + RegisterSignal(medic_vendor_injector, COMSIG_VENDOR_SUCCESSFUL_VEND, PROC_REF(pouch_three)) /datum/tutorial/marine/medical_basic_item/proc/pouch_three() SIGNAL_HANDLER med_one_items_to_vend-- if(med_one_items_to_vend <= 0) - TUTORIAL_ATOM_FROM_TRACKING(/obj/structure/machinery/cm_vending/clothing/tutorial_medic_equip, medic_vendor_alpha) - UnregisterSignal(medic_vendor_alpha, COMSIG_VENDOR_SUCCESSFUL_VEND) - medic_vendor_alpha.req_access = list(ACCESS_TUTORIAL_LOCKED) - remove_highlight(medic_vendor_alpha) + TUTORIAL_ATOM_FROM_TRACKING(/obj/structure/machinery/cm_vending/clothing/tutorial_medic_equip, medic_vendor_injector) + UnregisterSignal(medic_vendor_injector, COMSIG_VENDOR_SUCCESSFUL_VEND) + medic_vendor_injector.req_access = list(ACCESS_TUTORIAL_LOCKED) + remove_highlight(medic_vendor_injector) message_to_player("You have equipped this pouch into your pouch slot. This is the first of three medical pouches you can vend for yourself, this is the injector pouch, which contains the basic injectors and a emergency injector.") update_objective("") addtimer(CALLBACK(src, PROC_REF(pouch_four)), 6 SECONDS) @@ -196,20 +196,20 @@ message_to_player("Vend the First-Aid Pouch (Splints, Gauze, Ointment).") update_objective("Vend everything inside the ColMarTech Automated Closet.") - TUTORIAL_ATOM_FROM_TRACKING(/obj/structure/machinery/cm_vending/clothing/tutorial_medic_equip_bravo, medic_vendor_bravo) - add_highlight(medic_vendor_bravo) - medic_vendor_bravo.req_access = list() - RegisterSignal(medic_vendor_bravo, COMSIG_VENDOR_SUCCESSFUL_VEND, PROC_REF(pouch_six)) + TUTORIAL_ATOM_FROM_TRACKING(/obj/structure/machinery/cm_vending/clothing/tutorial_medic_equip_bandage, medic_vendor_bandage) + add_highlight(medic_vendor_bandage) + medic_vendor_bandage.req_access = list() + RegisterSignal(medic_vendor_bandage, COMSIG_VENDOR_SUCCESSFUL_VEND, PROC_REF(pouch_six)) /datum/tutorial/marine/medical_basic_item/proc/pouch_six() SIGNAL_HANDLER med_two_items_to_vend-- if(med_two_items_to_vend <= 0) - TUTORIAL_ATOM_FROM_TRACKING(/obj/structure/machinery/cm_vending/clothing/tutorial_medic_equip_bravo, medic_vendor_bravo) - UnregisterSignal(medic_vendor_bravo, COMSIG_VENDOR_SUCCESSFUL_VEND) - medic_vendor_bravo.req_access = list(ACCESS_TUTORIAL_LOCKED) - remove_highlight(medic_vendor_bravo) + TUTORIAL_ATOM_FROM_TRACKING(/obj/structure/machinery/cm_vending/clothing/tutorial_medic_equip_bandage, medic_vendor_bandage) + UnregisterSignal(medic_vendor_bandage, COMSIG_VENDOR_SUCCESSFUL_VEND) + medic_vendor_bandage.req_access = list(ACCESS_TUTORIAL_LOCKED) + remove_highlight(medic_vendor_bandage) message_to_player("This pouch contains a set of bandages, ointment, splints and a tricodrazine injector. It is a good generalist pouch.") update_objective("") addtimer(CALLBACK(src, PROC_REF(pouch_seven)), 6 SECONDS) @@ -223,20 +223,20 @@ message_to_player("Vend the First-Aid Pouch (Pills).") update_objective("Vend everything inside the ColMarTech Automated Closet.") - TUTORIAL_ATOM_FROM_TRACKING(/obj/structure/machinery/cm_vending/sorted/uniform_supply/tutorial_medic_equip_charlie, medic_vendor_charlie) - add_highlight(medic_vendor_charlie) - medic_vendor_charlie.req_access = list() - RegisterSignal(medic_vendor_charlie, COMSIG_VENDOR_SUCCESSFUL_VEND, PROC_REF(pouch_nine)) + TUTORIAL_ATOM_FROM_TRACKING(/obj/structure/machinery/cm_vending/sorted/uniform_supply/tutorial_medic_equip_pill, medic_vendor_pill) + add_highlight(medic_vendor_pill) + medic_vendor_pill.req_access = list() + RegisterSignal(medic_vendor_pill, COMSIG_VENDOR_SUCCESSFUL_VEND, PROC_REF(pouch_nine)) /datum/tutorial/marine/medical_basic_item/proc/pouch_nine() SIGNAL_HANDLER med_three_items_to_vend-- if(med_three_items_to_vend <= 0) - TUTORIAL_ATOM_FROM_TRACKING(/obj/structure/machinery/cm_vending/sorted/uniform_supply/tutorial_medic_equip_charlie, medic_vendor_charlie) - UnregisterSignal(medic_vendor_charlie, COMSIG_VENDOR_SUCCESSFUL_VEND) - medic_vendor_charlie.req_access = list(ACCESS_TUTORIAL_LOCKED) - remove_highlight(medic_vendor_charlie) + TUTORIAL_ATOM_FROM_TRACKING(/obj/structure/machinery/cm_vending/sorted/uniform_supply/tutorial_medic_equip_pill, medic_vendor_pill) + UnregisterSignal(medic_vendor_pill, COMSIG_VENDOR_SUCCESSFUL_VEND) + medic_vendor_pill.req_access = list(ACCESS_TUTORIAL_LOCKED) + remove_highlight(medic_vendor_pill) message_to_player("This pouch contains a set of pills. You can only get these pill packets from your personal or squad vendor.") update_objective("") addtimer(CALLBACK(src, PROC_REF(pouch_ten)), 6 SECONDS) @@ -249,7 +249,7 @@ SIGNAL_HANDLER message_to_player("Feel free to examine these items, and use the prep vendor to experiment with storing these medical items. When you are finished, eat the food to end the tutoiral.") - update_objective("Eat the food bar when you are ready to end the tutorial") + update_objective("Eat the food bar when you are ready to end the tutorial.") TUTORIAL_ATOM_FROM_TRACKING(/obj/structure/machinery/cm_vending/sorted/uniform_supply/squad_prep_tutorial, prep_vendor) add_highlight(prep_vendor) prep_vendor.req_access = list() @@ -261,7 +261,7 @@ /datum/tutorial/marine/medical_basic_item/proc/the_end() SIGNAL_HANDLER - message_to_player("Good luck Marine") + message_to_player("Good luck Marine.") update_objective("") tutorial_end_in(5 SECONDS, TRUE) @@ -284,11 +284,11 @@ new /obj/structure/surface/table/almayer(loc_from_corner(5, 4)) var/obj/structure/machinery/cm_vending/clothing/tutorialmed/clothing_vendor = new(loc_from_corner(5, 0)) add_to_tracking_atoms(clothing_vendor) - var/obj/structure/machinery/cm_vending/clothing/tutorial_medic_equip/medic_vendor_alpha = new(loc_from_corner(5, 1)) - add_to_tracking_atoms(medic_vendor_alpha) - var/obj/structure/machinery/cm_vending/clothing/tutorial_medic_equip_bravo/medic_vendor_bravo = new(loc_from_corner(5, 2)) - add_to_tracking_atoms(medic_vendor_bravo) - var/obj/structure/machinery/cm_vending/sorted/uniform_supply/tutorial_medic_equip_charlie/medic_vendor_charlie = new(loc_from_corner(5, 3)) - add_to_tracking_atoms(medic_vendor_charlie) + var/obj/structure/machinery/cm_vending/clothing/tutorial_medic_equip/medic_vendor_injector = new(loc_from_corner(5, 1)) + add_to_tracking_atoms(medic_vendor_injector) + var/obj/structure/machinery/cm_vending/clothing/tutorial_medic_equip_bandage/medic_vendor_bandage = new(loc_from_corner(5, 2)) + add_to_tracking_atoms(medic_vendor_bandage) + var/obj/structure/machinery/cm_vending/sorted/uniform_supply/tutorial_medic_equip_pill/medic_vendor_pill = new(loc_from_corner(5, 3)) + add_to_tracking_atoms(medic_vendor_pill) var/obj/structure/machinery/cm_vending/sorted/uniform_supply/squad_prep_tutorial/prep_vendor = new(loc_from_corner(0, 2)) add_to_tracking_atoms(prep_vendor) diff --git a/code/game/machinery/vending/vendor_types/squad_prep/tutorial.dm b/code/game/machinery/vending/vendor_types/squad_prep/tutorial.dm index dd1418a873db..47cb81ee8be9 100644 --- a/code/game/machinery/vending/vendor_types/squad_prep/tutorial.dm +++ b/code/game/machinery/vending/vendor_types/squad_prep/tutorial.dm @@ -79,11 +79,11 @@ GLOBAL_LIST_INIT(cm_vending_clothing_tutorial_medic, list( return GLOB.cm_vending_clothing_tutorial_medic //Standard Med Vendor 2 -GLOBAL_LIST_INIT(cm_vending_clothing_tutorial_medic_bravo, list( +GLOBAL_LIST_INIT(cm_vending_clothing_tutorial_medic_bandage, list( list("POUCHES (CHOOSE 1)", 0, null, null, null), list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), )) -/obj/structure/machinery/cm_vending/clothing/tutorial_medic_equip_bravo +/obj/structure/machinery/cm_vending/clothing/tutorial_medic_equip_bandage name = "\improper ColMarTech Automated Marine Equipment Rack" desc = "An automated rack hooked up to a colossal storage of Marine Rifleman standard-issue equipment." icon_state = "mar_rack" @@ -93,16 +93,16 @@ GLOBAL_LIST_INIT(cm_vending_clothing_tutorial_medic_bravo, list( vendor_role = list() -/obj/structure/machinery/cm_vending/clothing/tutorial_medic_equip_bravo/get_listed_products(mob/user) - return GLOB.cm_vending_clothing_tutorial_medic_bravo +/obj/structure/machinery/cm_vending/clothing/tutorial_medic_equip_bandage/get_listed_products(mob/user) + return GLOB.cm_vending_clothing_tutorial_medic_bandage //Standard Med Vendor 3 -GLOBAL_LIST_INIT(cm_vending_clothing_tutorial_medic_charlie, list( +GLOBAL_LIST_INIT(cm_vending_clothing_tutorial_medic_pill, list( list("POUCHES (CHOOSE 1)", 0, null, null, null), list("First-Aid Pouch (Pill Packets)", 1, /obj/item/storage/pouch/firstaid/full/pills, VENDOR_ITEM_REGULAR), )) -/obj/structure/machinery/cm_vending/sorted/uniform_supply/tutorial_medic_equip_charlie +/obj/structure/machinery/cm_vending/sorted/uniform_supply/tutorial_medic_equip_pill name = "\improper ColMarTech Surplus Uniform Vendor" desc = "An automated supply rack hooked up to a small storage of standard marine uniforms." icon_state = "mar_rack" @@ -113,8 +113,8 @@ GLOBAL_LIST_INIT(cm_vending_clothing_tutorial_medic_charlie, list( vendor_role = list() -/obj/structure/machinery/cm_vending/sorted/uniform_supply/tutorial_medic_equip_charlie/get_listed_products(mob/user) - return GLOB.cm_vending_clothing_tutorial_medic_charlie +/obj/structure/machinery/cm_vending/sorted/uniform_supply/tutorial_medic_equip_pill/get_listed_products(mob/user) + return GLOB.cm_vending_clothing_tutorial_medic_pill /obj/structure/machinery/cm_vending/sorted/uniform_supply/squad_prep_tutorial name = "\improper ColMarTech Surplus Uniform Vendor"