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