Skip to content

Commit

Permalink
ReqChange
Browse files Browse the repository at this point in the history
  • Loading branch information
Steelpoint committed Jan 11, 2024
1 parent c49dbf0 commit fc0d8e1
Show file tree
Hide file tree
Showing 2 changed files with 45 additions and 45 deletions.
74 changes: 37 additions & 37 deletions code/datums/tutorial/marine/medical_basic_item.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 <b>Bandages</b>. You can use these to heal <b>Brute</b> damage and stop bleeding. You always want to carry one of these.")
message_to_player("This is a <b>Bandage</b>. You can use these to heal <b>Brute</b> 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)
Expand All @@ -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 <b>Ointments</b>. You can use these to heal <b>Burn</b> damage. These are less important to carry, but are useful if you have the space for it.")
message_to_player("This is <b>Ointment</b>. You can use these to heal <b>Burn</b> 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)
Expand All @@ -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 <b>Splints</b>. You can use these to stabalize <b>fractures</b>. These are very important to use, as a unsplinted fracture can cause permanent injuries.")
message_to_player("This is a <b>Splint</b>. You can use these to stabalize <b>fractures</b>. 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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -169,20 +169,20 @@
remove_highlight(clothing_vendor)
message_to_player("Now, go to your personal equipment vendor and vend the <b>First-Aid Pouch (Refillable Injectors)</b>.")
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)
Expand All @@ -196,20 +196,20 @@

message_to_player("Vend the <b>First-Aid Pouch (Splints, Gauze, Ointment)</b>.")
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)
Expand All @@ -223,20 +223,20 @@

message_to_player("Vend the <b>First-Aid Pouch (Pills)</b>.")
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)
Expand All @@ -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()
Expand All @@ -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)

Expand All @@ -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)
16 changes: 8 additions & 8 deletions code/game/machinery/vending/vendor_types/squad_prep/tutorial.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand All @@ -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"
Expand Down

0 comments on commit fc0d8e1

Please sign in to comment.