From 509b89f45c6bb9545b07afcbb3f6631be04f5480 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Tue, 10 Jan 2023 14:26:08 +0100 Subject: [PATCH] [MIRROR] Contextual tutorials for swapping hands and dropping items [MDB IGNORE] (#18604) * Contextual tutorials for swapping hands and dropping items * Fixes * Oops Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com> Co-authored-by: Useroth <37159550+Useroth@users.noreply.github.com> --- SQL/database_changelog.txt | 22 +- SQL/tgstation_schema.sql | 8 + SQL/tgstation_schema_prefixed.sql | 8 + code/__DEFINES/colors.dm | 1 + .../signals/signals_mob/signals_mob_living.dm | 4 + .../signals/signals_mob/signals_mob_main.dm | 11 +- code/__DEFINES/layers.dm | 3 + code/__DEFINES/matrices.dm | 3 +- code/__DEFINES/subsystems.dm | 2 +- code/__HELPERS/screen_objs.dm | 20 +- code/_onclick/item_attack.dm | 8 + .../configuration/entries/game_options.dm | 1 + code/controllers/subsystem/tutorials.dm | 111 ++++++++ code/datums/components/twohanded.dm | 4 +- code/game/objects/items.dm | 1 + code/modules/mob/inventory.dm | 6 + code/modules/mob/living/carbon/carbon.dm | 2 +- .../mob/living/silicon/robot/inventory.dm | 2 +- .../mob/living/simple_animal/simple_animal.dm | 2 +- code/modules/mob/mob.dm | 16 +- code/modules/tutorials/_tutorial.dm | 257 ++++++++++++++++++ .../modules/tutorials/tutorial_instruction.dm | 53 ++++ code/modules/tutorials/tutorials/drop.dm | 109 ++++++++ .../tutorials/tutorials/switch_hands.dm | 86 ++++++ code/modules/unit_tests/_unit_tests.dm | 1 + code/modules/unit_tests/tutorial_sanity.dm | 19 ++ config/game_options.txt | 5 + interface/VCR_OSD_Mono.ttf | Bin 0 -> 75864 bytes interface/fonts.dm | 10 + interface/license.txt | 2 + tgstation.dme | 6 + 31 files changed, 764 insertions(+), 19 deletions(-) create mode 100644 code/controllers/subsystem/tutorials.dm create mode 100644 code/modules/tutorials/_tutorial.dm create mode 100644 code/modules/tutorials/tutorial_instruction.dm create mode 100644 code/modules/tutorials/tutorials/drop.dm create mode 100644 code/modules/tutorials/tutorials/switch_hands.dm create mode 100644 code/modules/unit_tests/tutorial_sanity.dm create mode 100644 interface/VCR_OSD_Mono.ttf create mode 100644 interface/fonts.dm create mode 100644 interface/license.txt diff --git a/SQL/database_changelog.txt b/SQL/database_changelog.txt index 96165390988..58efbbb5435 100644 --- a/SQL/database_changelog.txt +++ b/SQL/database_changelog.txt @@ -2,22 +2,36 @@ Any time you make a change to the schema files, remember to increment the databa Make sure to also update `DB_MAJOR_VERSION` and `DB_MINOR_VERSION`, which can be found in `code/__DEFINES/subsystem.dm`. -The latest database version is 5.24 (5.22 for /tg/); The query to update the schema revision table is: +The latest database version is 5.25 (5.23 for /tg/); The query to update the schema revision table is: -INSERT INTO `schema_revision` (`major`, `minor`) VALUES (5, 24); +INSERT INTO `schema_revision` (`major`, `minor`) VALUES (5, 25); or -INSERT INTO `SS13_schema_revision` (`major`, `minor`) VALUES (5, 24); +INSERT INTO `SS13_schema_revision` (`major`, `minor`) VALUES (5, 25); In any query remember to add a prefix to the table names if you use one. +----------------------------------------------------- +Version 5.25, 28 December 2022, by Mothblocks +Added `tutorial_completions` to mark what ckeys have completed contextual tutorials. + +``` +CREATE TABLE `tutorial_completions` ( + `id` INT NOT NULL AUTO_INCREMENT, + `ckey` VARCHAR(32) NOT NULL, + `tutorial_key` VARCHAR(64) NOT NULL, + PRIMARY KEY (`id`), + UNIQUE INDEX `ckey_tutorial_unique` (`ckey`, `tutorial_key`)); +``` + +----------------------------------------------------- Version 5.24, 22 December 2021, by Mothblocks Fixes a bug in `telemetry_connections` that limited the range of IPs. ``` ALTER TABLE `telemetry_connections` MODIFY COLUMN `address` INT(10) UNSIGNED NOT NULL; ``` ------------------------------------------------------ +----------------------------------------------------- Version 5.23, 15 December 2021, by Mothblocks Adds `telemetry_connections` table for tracking tgui telemetry. diff --git a/SQL/tgstation_schema.sql b/SQL/tgstation_schema.sql index 52f999c4101..ed6ebb3c992 100644 --- a/SQL/tgstation_schema.sql +++ b/SQL/tgstation_schema.sql @@ -716,6 +716,14 @@ CREATE TABLE `telemetry_connections` ( UNIQUE INDEX `unique_constraints` (`ckey` , `telemetry_ckey` , `address` , `computer_id`) ); +DROP TABLE IF EXISTS `tutorial_completions`; +CREATE TABLE `tutorial_completions` ( + `id` INT NOT NULL AUTO_INCREMENT, + `ckey` VARCHAR(32) NOT NULL, + `tutorial_key` VARCHAR(64) NOT NULL, + PRIMARY KEY (`id`), + UNIQUE INDEX `ckey_tutorial_unique` (`ckey`, `tutorial_key`)); + /*!40101 SET SQL_MODE=@OLD_SQL_MODE */; /*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */; /*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */; diff --git a/SQL/tgstation_schema_prefixed.sql b/SQL/tgstation_schema_prefixed.sql index 3a9773b9dc5..e69cd9ee046 100644 --- a/SQL/tgstation_schema_prefixed.sql +++ b/SQL/tgstation_schema_prefixed.sql @@ -700,6 +700,14 @@ CREATE TABLE `SS13_telemetry_connections` ( UNIQUE INDEX `unique_constraints` (`ckey` , `telemetry_ckey` , `address` , `computer_id`) ); +DROP TABLE IF EXISTS `SS13_tutorial_completions`; +CREATE TABLE `SS13_tutorial_completions` ( + `id` INT NOT NULL AUTO_INCREMENT, + `ckey` VARCHAR(32) NOT NULL, + `tutorial_key` VARCHAR(64) NOT NULL, + PRIMARY KEY (`id`), + UNIQUE INDEX `ckey_tutorial_unique` (`ckey`, `tutorial_key`)); + /*!40101 SET SQL_MODE=@OLD_SQL_MODE */; /*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */; /*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */; diff --git a/code/__DEFINES/colors.dm b/code/__DEFINES/colors.dm index 1a025c502ac..9e1fe18270a 100644 --- a/code/__DEFINES/colors.dm +++ b/code/__DEFINES/colors.dm @@ -28,6 +28,7 @@ #define COLOR_ALMOST_BLACK "#333333" #define COLOR_FULL_TONER_BLACK "#101010" #define COLOR_PRISONER_BLACK "#292929" +#define COLOR_NEARLY_ALL_BLACK "#111111" #define COLOR_BLACK "#000000" #define COLOR_HALF_TRANSPARENT_BLACK "#0000007A" diff --git a/code/__DEFINES/dcs/signals/signals_mob/signals_mob_living.dm b/code/__DEFINES/dcs/signals/signals_mob/signals_mob_living.dm index b878fb21823..5e5864665be 100644 --- a/code/__DEFINES/dcs/signals/signals_mob/signals_mob_living.dm +++ b/code/__DEFINES/dcs/signals/signals_mob/signals_mob_living.dm @@ -133,5 +133,9 @@ /// From /mob/living/befriend() : (mob/living/new_friend) #define COMSIG_LIVING_BEFRIENDED "living_befriended" + +/// From /obj/item/proc/pickup(): (/obj/item/picked_up_item) +#define COMSIG_LIVING_PICKED_UP_ITEM "living_picked_up_item" + /// From /mob/living/unfriend() : (mob/living/old_friend) #define COMSIG_LIVING_UNFRIENDED "living_unfriended" diff --git a/code/__DEFINES/dcs/signals/signals_mob/signals_mob_main.dm b/code/__DEFINES/dcs/signals/signals_mob/signals_mob_main.dm index 1cac348d152..005d6594257 100644 --- a/code/__DEFINES/dcs/signals/signals_mob/signals_mob_main.dm +++ b/code/__DEFINES/dcs/signals/signals_mob/signals_mob_main.dm @@ -116,9 +116,12 @@ #define MOB_DEADSAY_SIGNAL_INTERCEPT (1<<0) ///from /mob/living/emote(): () #define COMSIG_MOB_EMOTE "mob_emote" -///from base of mob/swap_hand(): (obj/item) -#define COMSIG_MOB_SWAP_HANDS "mob_swap_hands" +///from base of mob/swap_hand(): (obj/item/currently_held_item) +#define COMSIG_MOB_SWAPPING_HANDS "mob_swapping_hands" #define COMPONENT_BLOCK_SWAP (1<<0) +/// from base of mob/swap_hand(): () +/// Performed after the hands are swapped. +#define COMSIG_MOB_SWAP_HANDS "mob_swap_hands" ///from base of /mob/verb/pointed: (atom/A) #define COMSIG_MOB_POINTED "mob_pointed" ///Mob is trying to open the wires of a target [/atom], from /datum/wires/interactable(): (atom/target) @@ -171,5 +174,9 @@ ///from living/flash_act(), when a mob is successfully flashed. #define COMSIG_MOB_FLASHED "mob_flashed" + /// from mob/get_status_tab_items(): (list/items) #define COMSIG_MOB_GET_STATUS_TAB_ITEMS "mob_get_status_tab_items" + +/// from mob/proc/dropItemToGround() +#define COMSIG_MOB_DROPPING_ITEM "mob_dropping_item" diff --git a/code/__DEFINES/layers.dm b/code/__DEFINES/layers.dm index a06085bbf04..2ecdda04738 100644 --- a/code/__DEFINES/layers.dm +++ b/code/__DEFINES/layers.dm @@ -240,6 +240,9 @@ ///Layer for screentips #define SCREENTIP_LAYER 4 +/// Layer for tutorial instructions +#define TUTORIAL_INSTRUCTIONS_LAYER 5 + #define LOBBY_BACKGROUND_LAYER 3 #define LOBBY_BUTTON_LAYER 4 diff --git a/code/__DEFINES/matrices.dm b/code/__DEFINES/matrices.dm index b7240751b63..1bb86f9ff47 100644 --- a/code/__DEFINES/matrices.dm +++ b/code/__DEFINES/matrices.dm @@ -1,2 +1,3 @@ -/// Helper macro for compile time translation +/// Helper macro for creating a matrix at the given offsets. +/// Works at compile time. #define TRANSLATE_MATRIX(offset_x, offset_y) matrix(1, 0, (offset_x), 0, 1, (offset_y)) diff --git a/code/__DEFINES/subsystems.dm b/code/__DEFINES/subsystems.dm index 3e6e3d385c8..68d7bfc6c4a 100644 --- a/code/__DEFINES/subsystems.dm +++ b/code/__DEFINES/subsystems.dm @@ -20,7 +20,7 @@ * * make sure you add an update to the schema_version stable in the db changelog */ -#define DB_MINOR_VERSION 24 +#define DB_MINOR_VERSION 25 //! ## Timing subsystem diff --git a/code/__HELPERS/screen_objs.dm b/code/__HELPERS/screen_objs.dm index aa86b6d5795..7debecf816f 100644 --- a/code/__HELPERS/screen_objs.dm +++ b/code/__HELPERS/screen_objs.dm @@ -18,14 +18,26 @@ y += view_size[2] if(findtext(screen_loc, "SOUTH")) y += world.icon_size - // Cut out everything we just parsed - screen_loc = cut_relative_direction(screen_loc) var/list/x_and_y = splittext(screen_loc, ",") + var/list/x_pack = splittext(x_and_y[1], ":") var/list/y_pack = splittext(x_and_y[2], ":") - x += text2num(x_pack[1]) * world.icon_size - y += text2num(y_pack[1]) * world.icon_size + + var/x_coord = x_pack[1] + var/y_coord = y_pack[1] + + if (findtext(x_coord, "CENTER")) + x += view_size[1] / 2 + + if (findtext(y_coord, "CENTER")) + y += view_size[2] / 2 + + x_coord = text2num(cut_relative_direction(x_coord)) + y_coord = text2num(cut_relative_direction(y_coord)) + + x += x_coord * world.icon_size + y += y_coord * world.icon_size if(length(x_pack) > 1) x += text2num(x_pack[2]) diff --git a/code/_onclick/item_attack.dm b/code/_onclick/item_attack.dm index 0399d7146d5..18984c7b27f 100644 --- a/code/_onclick/item_attack.dm +++ b/code/_onclick/item_attack.dm @@ -59,6 +59,14 @@ if (after_attack_secondary_result == SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN || after_attack_secondary_result == SECONDARY_ATTACK_CONTINUE_CHAIN) return TRUE + var/afterattack_result = afterattack(target, user, TRUE, params) + + if (!(afterattack_result & AFTERATTACK_PROCESSED_ITEM) && isitem(target)) + if (isnull(user.get_inactive_held_item())) + SStutorials.suggest_tutorial(user, /datum/tutorial/switch_hands, params2list(params)) + else + SStutorials.suggest_tutorial(user, /datum/tutorial/drop, params2list(params)) + return afterattack(target, user, TRUE, params) == TRUE /// Called when the item is in the active hand, and clicked; alternately, there is an 'activate held object' verb or you can hit pagedown. diff --git a/code/controllers/configuration/entries/game_options.dm b/code/controllers/configuration/entries/game_options.dm index e822a4d88e3..032ff23afee 100644 --- a/code/controllers/configuration/entries/game_options.dm +++ b/code/controllers/configuration/entries/game_options.dm @@ -414,3 +414,4 @@ /datum/config_entry/flag/disallow_circuit_sounds +/datum/config_entry/flag/give_tutorials_without_db diff --git a/code/controllers/subsystem/tutorials.dm b/code/controllers/subsystem/tutorials.dm new file mode 100644 index 00000000000..3df3df116cb --- /dev/null +++ b/code/controllers/subsystem/tutorials.dm @@ -0,0 +1,111 @@ +/// Namespace for housing code relating to giving contextual tutorials to users. +SUBSYSTEM_DEF(tutorials) + name = "Tutorials" + flags = SS_NO_FIRE + + /// A mapping of /datum/tutorial type to their manager singleton. + /// You probably shouldn't be indexing this directly. + var/list/datum/tutorial_manager/tutorial_managers = list() + + VAR_PRIVATE/list/datum/tutorial_manager/tutorial_managers_by_key = list() + +/datum/controller/subsystem/tutorials/Initialize() + init_tutorial_managers() + load_initial_tutorial_completions() + RegisterSignal(SSdcs, COMSIG_GLOB_CLIENT_CONNECT, PROC_REF(on_client_connect)) + + return SS_INIT_SUCCESS + +/// Will suggest the passed tutorial type to the user. +/// Will check that they should actually see it, e.g. hasn't completed it yet, etc. +/// Then, calls `/datum/tutorial/subtype/perform` with the extra arguments passed in. +/datum/controller/subsystem/tutorials/proc/suggest_tutorial(mob/user, datum/tutorial/tutorial_type, ...) + var/datum/tutorial_manager/tutorial_manager = tutorial_managers[tutorial_type] + if (isnull(tutorial_manager)) + CRASH("[tutorial_type] is not a valid tutorial type") + + if (!tutorial_manager.should_run(user)) + return + + INVOKE_ASYNC(tutorial_manager, TYPE_PROC_REF(/datum/tutorial_manager, try_perform), user, args.Copy(3)) + +/datum/controller/subsystem/tutorials/proc/init_tutorial_managers() + PRIVATE_PROC(TRUE) + + for (var/datum/tutorial/tutorial_type as anything in subtypesof(/datum/tutorial)) + var/datum/tutorial_manager/tutorial_manager = new /datum/tutorial_manager(tutorial_type) + tutorial_managers[tutorial_type] = tutorial_manager + tutorial_managers_by_key[tutorial_manager.get_key()] = tutorial_manager + +/datum/controller/subsystem/tutorials/proc/load_initial_tutorial_completions() + PRIVATE_PROC(TRUE) + set waitfor = FALSE // There's no reason to halt init for this + + var/list/ckey_options = list() + var/list/ckeys = list() + + for (var/client/client as anything in GLOB.clients) + var/ckey = client?.ckey + if (!ckey) + continue // client shenanigans, never trust + + var/index = ckeys.len + 1 + ckey_options += ":ckey[index]" + ckeys["ckey[index]"] = ckey + + if (ckey_options.len == 0) + return + + var/datum/db_query/select_all_query = SSdbcore.NewQuery( + "SELECT ckey, tutorial_key FROM [format_table_name("tutorial_completions")] WHERE ckey in ([ckey_options.Join(", ")])", + ckeys, + ) + + if (!select_all_query.Execute()) + qdel(select_all_query) + return + + while (select_all_query.NextRow()) + var/ckey = select_all_query.item[1] + var/tutorial_key = select_all_query.item[2] + + mark_ckey_completed_tutorial(ckey, tutorial_key) + + qdel(select_all_query) + +/datum/controller/subsystem/tutorials/proc/on_client_connect(datum/source, client/client) + SIGNAL_HANDLER + + var/ckey = client.ckey + if (!ckey) + return + + INVOKE_ASYNC(src, PROC_REF(check_completed_tutorials_for_ckey), ckey) + +/datum/controller/subsystem/tutorials/proc/check_completed_tutorials_for_ckey(ckey) + if (!SSdbcore.IsConnected()) + return + + var/datum/db_query/select_tutorials_for_ckey = SSdbcore.NewQuery( + "SELECT tutorial_key FROM [format_table_name("tutorial_completions")] WHERE ckey = :ckey", + list("ckey" = ckey) + ) + + if (!select_tutorials_for_ckey.Execute()) + return + + while (select_tutorials_for_ckey.NextRow()) + var/tutorial_key = select_tutorials_for_ckey.item[1] + + mark_ckey_completed_tutorial(ckey, tutorial_key) + + qdel(select_tutorials_for_ckey) + +/datum/controller/subsystem/tutorials/proc/mark_ckey_completed_tutorial(ckey, tutorial_key) + var/datum/tutorial_manager/tutorial_manager = tutorial_managers_by_key[tutorial_key] + if (isnull(tutorial_manager)) + // Not necessarily a bug. + // Could be an outdated server or a removed tutorial. + return + + tutorial_manager.mark_as_completed(ckey) diff --git a/code/datums/components/twohanded.dm b/code/datums/components/twohanded.dm index 2c0de250a2a..3c438b8c085 100644 --- a/code/datums/components/twohanded.dm +++ b/code/datums/components/twohanded.dm @@ -173,7 +173,7 @@ return // blocked wield from item wielded = TRUE ADD_TRAIT(parent, TRAIT_WIELDED, REF(src)) - RegisterSignal(user, COMSIG_MOB_SWAP_HANDS, PROC_REF(on_swap_hands)) + RegisterSignal(user, COMSIG_MOB_SWAPPING_HANDS, PROC_REF(on_swapping_hands)) wield_callback?.Invoke(parent, user) // update item stats and name @@ -307,7 +307,7 @@ /** * on_swap_hands Triggers on swapping hands, blocks swap if the other hand is busy */ -/datum/component/two_handed/proc/on_swap_hands(mob/user, obj/item/held_item) +/datum/component/two_handed/proc/on_swapping_hands(mob/user, obj/item/held_item) SIGNAL_HANDLER if(!held_item) diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index b6747a6dcde..61368081a7b 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -678,6 +678,7 @@ GLOBAL_DATUM_INIT(fire_overlay, /mutable_appearance, mutable_appearance('icons/e /obj/item/proc/pickup(mob/user) SHOULD_CALL_PARENT(TRUE) SEND_SIGNAL(src, COMSIG_ITEM_PICKUP, user) + SEND_SIGNAL(user, COMSIG_LIVING_PICKED_UP_ITEM, src) item_flags |= IN_INVENTORY /// called when "found" in pockets and storage items. Returns 1 if the search should end. diff --git a/code/modules/mob/inventory.dm b/code/modules/mob/inventory.dm index c493ed5f35e..1549ae2acb0 100644 --- a/code/modules/mob/inventory.dm +++ b/code/modules/mob/inventory.dm @@ -280,9 +280,15 @@ * If the item can be dropped, it will be forceMove()'d to the ground and the turf's Entered() will be called. */ /mob/proc/dropItemToGround(obj/item/I, force = FALSE, silent = FALSE, invdrop = TRUE) + if (isnull(I)) + return TRUE + + SEND_SIGNAL(src, COMSIG_MOB_DROPPING_ITEM) . = doUnEquip(I, force, drop_location(), FALSE, invdrop = invdrop, silent = silent) + if(!. || !I) //ensure the item exists and that it was dropped properly. return + if(!(I.item_flags & NO_PIXEL_RANDOM_DROP)) I.pixel_x = I.base_pixel_x + rand(-6, 6) I.pixel_y = I.base_pixel_y + rand(-6, 6) diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index 6b23ef61ccd..e022be2d07f 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -30,7 +30,7 @@ QDEL_NULL(dna) GLOB.carbon_list -= src -/mob/living/carbon/swap_hand(held_index) +/mob/living/carbon/perform_hand_swap(held_index) . = ..() if(!.) return diff --git a/code/modules/mob/living/silicon/robot/inventory.dm b/code/modules/mob/living/silicon/robot/inventory.dm index f972cb0d885..e86ca257f12 100644 --- a/code/modules/mob/living/silicon/robot/inventory.dm +++ b/code/modules/mob/living/silicon/robot/inventory.dm @@ -397,7 +397,7 @@ if(slot_num > 4) // not >3 otherwise cycling with just one item on module 3 wouldn't work slot_num = 1 //Wrap around. -/mob/living/silicon/robot/swap_hand() +/mob/living/silicon/robot/perform_hand_swap() cycle_modules() /mob/living/silicon/robot/can_hold_items(obj/item/I) diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm index 3f206619222..eb1cf2c78a6 100644 --- a/code/modules/mob/living/simple_animal/simple_animal.dm +++ b/code/modules/mob/living/simple_animal/simple_animal.dm @@ -616,7 +616,7 @@ else mode() -/mob/living/simple_animal/swap_hand(hand_index) +/mob/living/simple_animal/perform_hand_swap(hand_index) . = ..() if(!.) return diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index 1c39a8f1f14..24f2caa7b63 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -885,11 +885,23 @@ return data -/mob/proc/swap_hand() +/mob/proc/swap_hand(held_index) + SHOULD_NOT_OVERRIDE(TRUE) // Override perform_hand_swap instead + var/obj/item/held_item = get_active_held_item() - if(SEND_SIGNAL(src, COMSIG_MOB_SWAP_HANDS, held_item) & COMPONENT_BLOCK_SWAP) + if(SEND_SIGNAL(src, COMSIG_MOB_SWAPPING_HANDS, held_item) & COMPONENT_BLOCK_SWAP) to_chat(src, span_warning("Your other hand is too busy holding [held_item].")) return FALSE + + var/result = perform_hand_swap(held_index) + if (result) + SEND_SIGNAL(src, COMSIG_MOB_SWAP_HANDS) + + return result + +/// Performs the actual ritual of swapping hands, such as setting the held index variables +/mob/proc/perform_hand_swap(held_index) + PROTECTED_PROC(TRUE) return TRUE /mob/proc/activate_hand(selhand) diff --git a/code/modules/tutorials/_tutorial.dm b/code/modules/tutorials/_tutorial.dm new file mode 100644 index 00000000000..69f63738955 --- /dev/null +++ b/code/modules/tutorials/_tutorial.dm @@ -0,0 +1,257 @@ +/// The base for a contextual tutorial. +/// In order to give a tutorial to someone, use `SStutorials.suggest_tutorial(user, /datum/tutorial/subtype)` +/datum/tutorial + /// If set, any account who started playing before this date will not be given this tutorial. + /// Date is in YYYY-MM-DD format. + var/grandfather_date + + /// The mob we are giving the tutorial to + VAR_PROTECTED/mob/user + + VAR_PRIVATE/atom/movable/screen/tutorial_instruction/instruction_screen + +/datum/tutorial/New(mob/user) + src.user = user + + RegisterSignal(user, COMSIG_PARENT_QDELETING, PROC_REF(destroy_self)) + RegisterSignal(user.client, COMSIG_PARENT_QDELETING, PROC_REF(destroy_self)) + +/datum/tutorial/Destroy(force, ...) + user.client?.screen -= instruction_screen + QDEL_NULL(instruction_screen) + + user = null + + return ..() + +/// Gets the [`/datum/tutorial_manager`] that owns this tutorial. +/datum/tutorial/proc/manager() + RETURN_TYPE(/datum/tutorial_manager) + return SStutorials.tutorial_managers[type] + +/// The actual steps of the tutorial. Is given any excess arguments of suggest_tutorial. +/// Must be overridden. +/datum/tutorial/proc/perform() + SHOULD_CALL_PARENT(FALSE) + CRASH("[type] does not override perform()") + +/// Returns TRUE/FALSE if this tutorial should be given. +/// If FALSE, does not mean it won't come back later. +/datum/tutorial/proc/should_perform() + SHOULD_CALL_PARENT(FALSE) + return TRUE + +/// Called by the tutorial when the user has successfully completed it. +/// Will mark it as completed in the datbaase and kick off destruction of the tutorial. +/datum/tutorial/proc/complete() + SIGNAL_HANDLER + PROTECTED_PROC(TRUE) + SHOULD_NOT_OVERRIDE(TRUE) + + manager().complete(user) + perform_base_completion_effects() + +/// As opposed to `complete()`, this merely hides the tutorial. +/// This should be used when the user doesn't need the tutorial anymore, but didn't +/// actually properly finish it. +/datum/tutorial/proc/dismiss() + SIGNAL_HANDLER + PROTECTED_PROC(TRUE) + SHOULD_NOT_OVERRIDE(TRUE) + + manager().dismiss(user) + perform_base_completion_effects() + +#define INSTRUCTION_SCREEN_DELAY (1 SECONDS) + +/datum/tutorial/proc/perform_base_completion_effects() + SHOULD_NOT_OVERRIDE(TRUE) + + var/delay = perform_completion_effects_with_delay() + + if (!isnull(instruction_screen)) + animate(instruction_screen, time = INSTRUCTION_SCREEN_DELAY, alpha = 0, easing = SINE_EASING) + delay += INSTRUCTION_SCREEN_DELAY + + QDEL_IN(src, delay) + +/// Called when the tutorial is being hidden, but before it is deleted. +/// You should unregister signals and fade out any of your creations in here. +/// Returns how long extra to delay the deletion. +/datum/tutorial/proc/perform_completion_effects_with_delay() + SHOULD_CALL_PARENT(FALSE) + PROTECTED_PROC(TRUE) + + return 0 + +#undef INSTRUCTION_SCREEN_DELAY + +/datum/tutorial/proc/destroy_self() + SIGNAL_HANDLER + PRIVATE_PROC(TRUE) + SHOULD_NOT_OVERRIDE(TRUE) + + manager().dismiss(user) + qdel(src) + +/// Shows a large piece of text on the user's screen with the given message. +/// If a message already exists, will fade it out and replace it. +/datum/tutorial/proc/show_instruction(message) + PROTECTED_PROC(TRUE) + + if (isnull(instruction_screen)) + instruction_screen = new(null, message, user.client) + user.client?.screen += instruction_screen + else + instruction_screen.change_message(message) + +/// Given a keybind and a message, will replace %KEY% in `message` with the first keybind they have. +/// As a fallback, will return the third parameter, `message_without_keybinds`, if none are set. +/datum/tutorial/proc/keybinding_message(datum/keybinding/keybinding_type, message, message_without_keybinds) + PROTECTED_PROC(TRUE) + + var/list/keybinds = user.client?.prefs.key_bindings[initial(keybinding_type.name)] + return keybinds?.len > 0 ? replacetext(message, "%KEY%", "[keybinds[1]]") : message_without_keybinds + +/// Creates a UI element with the given `icon_state`, starts it at `initial_screen_loc`, and animates it to `target_screen_loc`. +/// Waits `animate_start_time` before moving. +/datum/tutorial/proc/animate_ui_element(icon_state, initial_screen_loc, target_screen_loc, animate_start_time) + PROTECTED_PROC(TRUE) + + var/atom/movable/screen/preview = new + preview.icon = ui_style2icon(user.client?.prefs.read_preference(/datum/preference/choiced/ui_style) || GLOB.available_ui_styles[1]) + preview.icon_state = icon_state + preview.mouse_opacity = MOUSE_OPACITY_TRANSPARENT + preview.screen_loc = "1,1" + + var/view = user.client?.view + + var/list/origin_offsets = screen_loc_to_offset(initial_screen_loc, view) + + // A little offset to the right + var/matrix/origin_transform = TRANSLATE_MATRIX(origin_offsets[1] - world.icon_size * 0.5, origin_offsets[2] - world.icon_size * 1.5) + + var/list/target_offsets = screen_loc_to_offset(target_screen_loc, view) + // `- world.icon_Size * 0.5` to patch over a likely bug in screen_loc_to_offset with CENTER, needs more looking at + var/matrix/animate_to_transform = TRANSLATE_MATRIX(target_offsets[1] - world.icon_size * 1.5, target_offsets[2] - world.icon_size) + + preview.transform = origin_transform + + preview.alpha = 0 + animate(preview, time = animate_start_time, alpha = 255, easing = CUBIC_EASING) + animate(1.4 SECONDS) + animate(transform = animate_to_transform, time = 2 SECONDS, easing = SINE_EASING | EASE_IN) + animate(alpha = 0, time = 2.4 SECONDS, easing = CUBIC_EASING | EASE_IN, flags = ANIMATION_PARALLEL) + + user.client?.screen += preview + + return preview + +/// A singleton that manages when to create tutorials of a specific tutorial type. +/datum/tutorial_manager + VAR_PRIVATE/datum/tutorial/tutorial_type + + /// ckeys that we know have finished the tutorial + VAR_PRIVATE/list/finished_ckeys = list() + + /// ckeys that have performed the tutorial, but have not completed it. + /// Doesn't mean that they can still see the tutorial, might have meant the tutorial was dismissed + /// without being completed, such as during a log out. + VAR_PRIVATE/list/performing_ckeys = list() + +/datum/tutorial_manager/New(tutorial_type) + ASSERT(ispath(tutorial_type, /datum/tutorial)) + src.tutorial_type = tutorial_type + +/datum/tutorial_manager/Destroy(force, ...) + if (!force) + stack_trace("Something is trying to destroy [type], which is a singleton") + return QDEL_HINT_LETMELIVE + return ..() + +/// Checks if we should perform the tutorial for the given user, and performs if so. +/// Use `SStutorials.suggest_tutorial` instead of calling this directly. +/datum/tutorial_manager/proc/try_perform(mob/user, list/arguments) + var/datum/tutorial/tutorial = new tutorial_type(user) + if (!tutorial.should_perform(user)) + qdel(tutorial) + return + + performing_ckeys[user.ckey] = TRUE + + tutorial.perform(arglist(arguments)) + +/// Checks if the user should be given this tutorial +/datum/tutorial_manager/proc/should_run(mob/user) + var/ckey = user.ckey + + if (isnull(ckey)) + return FALSE + + if (ckey in finished_ckeys) + return FALSE + + if (ckey in performing_ckeys) + return FALSE + + if (!SSdbcore.IsConnected()) + return CONFIG_GET(flag/give_tutorials_without_db) + + var/player_join_date = user.client?.player_join_date + if (isnull(player_join_date)) + return FALSE + + // This works because ISO-8601 is cool + var/grandfather_date = initial(tutorial_type.grandfather_date) + if (!isnull(grandfather_date) && player_join_date < grandfather_date) + return FALSE + + return TRUE + +/// Marks the tutorial as completed. +/// Call `/datum/tutorial/proc/complete()` instead. +/datum/tutorial_manager/proc/complete(mob/user) + set waitfor = FALSE + + ASSERT(!isnull(user.ckey)) + + finished_ckeys[user.ckey] = TRUE + performing_ckeys -= user.ckey + + SSblackbox.record_feedback("tally", "tutorial_completed", 1, "[tutorial_type]") + log_game("[key_name(user)] completed the [tutorial_type] tutorial.") + + if (SSdbcore.IsConnected()) + INVOKE_ASYNC(src, PROC_REF(log_completion_to_database), user.ckey) + +/datum/tutorial_manager/proc/log_completion_to_database(ckey) + PRIVATE_PROC(TRUE) + + var/datum/db_query/insert_tutorial_query = SSdbcore.NewQuery( + "INSERT INTO [format_table_name("tutorial_completions")] (ckey, tutorial_key) VALUES (:ckey, :tutorial_key) ON DUPLICATE KEY UPDATE tutorial_key = tutorial_key", + list( + "ckey" = ckey, + "tutorial_key" = get_key(), + ) + ) + + insert_tutorial_query.warn_execute() + + qdel(insert_tutorial_query) + +/// Dismisses the tutorial, not marking it as completed in the database. +/// Call `/datum/tutorial/proc/dismiss()` instead. +/datum/tutorial_manager/proc/dismiss(mob/user) + performing_ckeys -= user.ckey + +/// Given a ckey, will mark them as being completed without affecting the database. +/// Call `/datum/tutorial/proc/complete()` instead. +/datum/tutorial_manager/proc/mark_as_completed(ckey) + finished_ckeys[ckey] = TRUE + performing_ckeys -= ckey + +/// Gives the key that will be saved in the database. +/// Must be 64 characters or less. +/datum/tutorial_manager/proc/get_key() + SHOULD_BE_PURE(TRUE) + return copytext("[tutorial_type]", length("[/datum/tutorial]") + 2) diff --git a/code/modules/tutorials/tutorial_instruction.dm b/code/modules/tutorials/tutorial_instruction.dm new file mode 100644 index 00000000000..488b3558eef --- /dev/null +++ b/code/modules/tutorials/tutorial_instruction.dm @@ -0,0 +1,53 @@ +/atom/movable/screen/tutorial_instruction + icon = 'icons/effects/alphacolors.dmi' + icon_state = "white" + color = COLOR_NEARLY_ALL_BLACK + alpha = 0 + screen_loc = "TOP-2,CENTER" + layer = TUTORIAL_INSTRUCTIONS_LAYER + mouse_opacity = MOUSE_OPACITY_TRANSPARENT + + var/client/client + var/atom/movable/screen/tutorial_instruction_text/instruction_text + +/atom/movable/screen/tutorial_instruction/Initialize(mapload, message, client/client) + . = ..() + + transform = transform.Scale(36, 2.5) + + src.client = client + animate(src, alpha = 245, time = 0.8 SECONDS, easing = SINE_EASING) + + instruction_text = new(src, message, client) + vis_contents += instruction_text + +/atom/movable/screen/tutorial_instruction/Destroy() + client = null + QDEL_NULL(instruction_text) + + return ..() + +/atom/movable/screen/tutorial_instruction/proc/change_message(message) + instruction_text.change_message(message) + +/atom/movable/screen/tutorial_instruction_text + maptext_height = 480 + maptext_y = -2 + mouse_opacity = MOUSE_OPACITY_TRANSPARENT + layer = TUTORIAL_INSTRUCTIONS_LAYER + +/atom/movable/screen/tutorial_instruction_text/Initialize(mapload, message, client/client) + . = ..() + + var/view = client?.view_size.getView() + maptext_width = view ? view_to_pixels(view)[1] : 480 + pixel_x = (maptext_width - world.icon_size) * -0.5 + + change_message(message) + +/atom/movable/screen/tutorial_instruction_text/proc/change_message(message) + // We don't use MAPTEXT macro here because it doesn't handle big text + message = "[message]" + + animate(src, alpha = 0, time = (maptext ? 0.5 SECONDS : 0), easing = SINE_EASING) + animate(alpha = 255, time = 0.5 SECONDS, maptext = message) diff --git a/code/modules/tutorials/tutorials/drop.dm b/code/modules/tutorials/tutorials/drop.dm new file mode 100644 index 00000000000..de692edab43 --- /dev/null +++ b/code/modules/tutorials/tutorials/drop.dm @@ -0,0 +1,109 @@ +#define TIME_TO_START_MOVING_DROP_ICON (0.5 SECONDS) + +#define STAGE_DROP_ITEM "STAGE_DROP_ITEM" +#define STAGE_PICK_SOMETHING_UP "STAGE_PICK_SOMETHING_UP" + +/// Tutorial for showing how to drop items. +/// Fired when clicking on an item with another item with a filled inactive hand. +/datum/tutorial/drop + grandfather_date = "2023-01-07" + + var/stage = STAGE_DROP_ITEM + var/atom/movable/screen/drop_preview + var/obj/last_held_item + +/datum/tutorial/drop/Destroy(force, ...) + last_held_item = null + user.client?.screen -= drop_preview + QDEL_NULL(drop_preview) + return ..() + +/datum/tutorial/drop/perform(list/params) + create_drop_preview(params[SCREEN_LOC]) + addtimer(CALLBACK(src, PROC_REF(show_instructions)), TIME_TO_START_MOVING_DROP_ICON) + + RegisterSignal(user, COMSIG_MOB_DROPPING_ITEM, PROC_REF(on_dropped_item)) + RegisterSignal(user, COMSIG_MOB_SWAP_HANDS, PROC_REF(on_swap_hands)) + RegisterSignal(user, COMSIG_LIVING_PICKED_UP_ITEM, PROC_REF(on_pick_up_item)) + + update_held_item() + +/datum/tutorial/drop/perform_completion_effects_with_delay() + UnregisterSignal(user, list(COMSIG_MOB_DROPPING_ITEM, COMSIG_MOB_SWAP_HANDS, COMSIG_LIVING_PICKED_UP_ITEM)) + if (!isnull(last_held_item)) + UnregisterSignal(last_held_item, COMSIG_MOVABLE_MOVED) + + return 0 + +/datum/tutorial/drop/proc/create_drop_preview(initial_screen_loc) + drop_preview = animate_ui_element( + "act_drop", + initial_screen_loc, + ui_drop_throw, + TIME_TO_START_MOVING_DROP_ICON, + ) + +/datum/tutorial/drop/proc/show_instructions() + if (QDELETED(src)) + return + + switch (stage) + if (STAGE_DROP_ITEM) + show_instruction(keybinding_message( + /datum/keybinding/mob/drop_item, + "Press '%KEY%' to drop your current item", + "Click 'DROP' to drop your current item", + )) + if (STAGE_PICK_SOMETHING_UP) + show_instruction("Pick something up!") + +/datum/tutorial/drop/proc/on_swap_hands() + SIGNAL_HANDLER + + if (isnull(user.get_active_held_item())) + if (stage != STAGE_PICK_SOMETHING_UP) + stage = STAGE_PICK_SOMETHING_UP + show_instructions() + else if (stage == STAGE_PICK_SOMETHING_UP) + stage = STAGE_DROP_ITEM + show_instructions() + + update_held_item() + +/datum/tutorial/drop/proc/on_dropped_item() + SIGNAL_HANDLER + + stage = STAGE_PICK_SOMETHING_UP + show_instructions() + +/datum/tutorial/drop/proc/on_pick_up_item() + SIGNAL_HANDLER + + if (stage != STAGE_PICK_SOMETHING_UP) + dismiss() + return + + complete() + +// Exists so that if we, say, place the item on a table, we don't count that as completion +/datum/tutorial/drop/proc/update_held_item() + if (!isnull(last_held_item)) + UnregisterSignal(last_held_item, COMSIG_MOVABLE_MOVED) + + last_held_item = user.get_active_held_item() + if (isnull(last_held_item)) + return + + RegisterSignal(last_held_item, COMSIG_MOVABLE_MOVED, PROC_REF(on_held_item_moved)) + +/datum/tutorial/drop/proc/on_held_item_moved() + SIGNAL_HANDLER + + if (stage == STAGE_PICK_SOMETHING_UP) + return + + dismiss() + +#undef STAGE_DROP_ITEM +#undef STAGE_PICK_SOMETHING_UP +#undef TIME_TO_START_MOVING_DROP_ICON diff --git a/code/modules/tutorials/tutorials/switch_hands.dm b/code/modules/tutorials/tutorials/switch_hands.dm new file mode 100644 index 00000000000..bf27a9e9d83 --- /dev/null +++ b/code/modules/tutorials/tutorials/switch_hands.dm @@ -0,0 +1,86 @@ +#define TIME_TO_START_MOVING_HAND_ICON (0.5 SECONDS) + +#define STAGE_SHOULD_SWAP_HAND "STAGE_SHOULD_SWAP_HAND" +#define STAGE_PICK_UP_ITEM "STAGE_PICK_UP_ITEM" + +/// Tutorial for showing how to switch hands. +/// Fired when clicking on an item with another item with an empty inactive hand. +/datum/tutorial/switch_hands + grandfather_date = "2023-01-07" + + var/stage = STAGE_SHOULD_SWAP_HAND + var/atom/movable/screen/hand_preview + + // So that they don't just drop the item + var/hand_to_watch + +/datum/tutorial/switch_hands/New(mob/user) + . = ..() + + hand_to_watch = (user.active_hand_index % user.held_items.len) + 1 + +/datum/tutorial/switch_hands/Destroy(force, ...) + user.client?.screen -= hand_preview + QDEL_NULL(hand_preview) + + return ..() + +/datum/tutorial/switch_hands/perform(list/params) + create_hand_preview(params[SCREEN_LOC]) + addtimer(CALLBACK(src, PROC_REF(show_instructions)), TIME_TO_START_MOVING_HAND_ICON) + + RegisterSignal(user, COMSIG_MOB_SWAP_HANDS, PROC_REF(on_swap_hands)) + RegisterSignal(user, COMSIG_LIVING_PICKED_UP_ITEM, PROC_REF(on_pick_up_item)) + +/datum/tutorial/switch_hands/perform_completion_effects_with_delay() + UnregisterSignal(user, list(COMSIG_MOB_SWAP_HANDS, COMSIG_LIVING_PICKED_UP_ITEM)) + return 0 + +/datum/tutorial/switch_hands/proc/create_hand_preview(initial_screen_loc) + hand_preview = animate_ui_element( + "hand_[hand_to_watch % 2 == 0 ? "r" : "l"]", + initial_screen_loc, + ui_hand_position(hand_to_watch), + TIME_TO_START_MOVING_HAND_ICON, + ) + +/datum/tutorial/switch_hands/proc/show_instructions() + if (QDELETED(src)) + return + + switch (stage) + if (STAGE_SHOULD_SWAP_HAND) + var/hand_name = hand_to_watch % 2 == 0 ? "right" : "left" + show_instruction(keybinding_message( + /datum/keybinding/mob/swap_hands, + "Press '%KEY%' to use your [hand_name] hand", + "Click 'SWAP' to use your [hand_name] hand", + )) + if (STAGE_PICK_UP_ITEM) + show_instruction("Pick something up!") + +/datum/tutorial/switch_hands/proc/on_swap_hands() + SIGNAL_HANDLER + + if (isnull(user.get_active_held_item())) + stage = STAGE_PICK_UP_ITEM + show_instructions() + else if (isnull(user.get_inactive_held_item())) + stage = STAGE_SHOULD_SWAP_HAND + show_instructions() + else + // You somehow got an item in both hands during the tutorial without switching hands. + // Good job I guess? + complete() + +/datum/tutorial/switch_hands/proc/on_pick_up_item() + SIGNAL_HANDLER + + if (user.active_hand_index != hand_to_watch) + return + + complete() + +#undef STAGE_PICK_UP_ITEM +#undef STAGE_SHOULD_SWAP_HAND +#undef TIME_TO_START_MOVING_HAND_ICON diff --git a/code/modules/unit_tests/_unit_tests.dm b/code/modules/unit_tests/_unit_tests.dm index c9e9b8e7459..5760a886e4a 100644 --- a/code/modules/unit_tests/_unit_tests.dm +++ b/code/modules/unit_tests/_unit_tests.dm @@ -208,6 +208,7 @@ #include "tgui_create_message.dm" #include "timer_sanity.dm" #include "traitor.dm" +#include "tutorial_sanity.dm" #include "unit_test.dm" #include "verify_config_tags.dm" #include "verify_emoji_names.dm" diff --git a/code/modules/unit_tests/tutorial_sanity.dm b/code/modules/unit_tests/tutorial_sanity.dm new file mode 100644 index 00000000000..3c4ae37c9c0 --- /dev/null +++ b/code/modules/unit_tests/tutorial_sanity.dm @@ -0,0 +1,19 @@ +/// Verifies that every tutorial has properly set variables +/datum/unit_test/tutorial_sanity + +/datum/unit_test/tutorial_sanity/Run() + var/regex/regex_valid_date = regex(@"\d{4}-\d{2}-\d{2}") + var/list/keys = list() + + for (var/datum/tutorial/tutorial_type as anything in SStutorials.tutorial_managers) + var/datum/tutorial_manager/tutorial_manager = SStutorials.tutorial_managers[tutorial_type] + + var/grandfather_date = initial(tutorial_type.grandfather_date) + if (!isnull(grandfather_date)) + TEST_ASSERT(regex_valid_date.Find(grandfather_date), "[tutorial_type] has an invalid grandfather_date ([grandfather_date])") + + var/key = tutorial_manager.get_key() + TEST_ASSERT(!(key in keys), "[key] shows up twice") + TEST_ASSERT(length(key) < 64, "[key] is more than 64 characters, it won't fit in the SQL table.") + + TEST_ASSERT_EQUAL(SStutorials.tutorial_managers.len, length(subtypesof(/datum/tutorial)), "Expected tutorial_managers to have one of every tutorial") diff --git a/config/game_options.txt b/config/game_options.txt index fa59a2100b0..3cf2af6c919 100644 --- a/config/game_options.txt +++ b/config/game_options.txt @@ -556,3 +556,8 @@ MAXFINE 2000 ## Comment if you wish to enable title music playing at the lobby screen. This flag is disabled by default to facilitate better code testing on local machines. ## Do keep in mind that this flag will not affect individual player's preferences: if they opt-out on your server, it will never play for them. DISALLOW_TITLE_MUSIC + +## If enabled, then when the database is disabled, all players will get tutorials. +## This is primarily useful for developing tutorials. If you have a proper DB setup, you +## don't need (or want) this. +#GIVE_TUTORIALS_WITHOUT_DB diff --git a/interface/VCR_OSD_Mono.ttf b/interface/VCR_OSD_Mono.ttf new file mode 100644 index 0000000000000000000000000000000000000000..dcca687a434d5c7b6a3027e65e0b7d8728b25c71 GIT binary patch literal 75864 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 literal 0 HcmV?d00001 diff --git a/interface/fonts.dm b/interface/fonts.dm new file mode 100644 index 00000000000..0bfc9c728c7 --- /dev/null +++ b/interface/fonts.dm @@ -0,0 +1,10 @@ +/// A font datum, it exists to define a custom font to use in a span style later. +/datum/font + /// Font name, just so people know what to put in their span style. + var/name + /// The font file we link to. + var/font_family + +/datum/font/vcr_osd_mono + name = "VCR OSD Mono" + font_family = 'interface/VCR_OSD_Mono.ttf' diff --git a/interface/license.txt b/interface/license.txt new file mode 100644 index 00000000000..5f74403c50a --- /dev/null +++ b/interface/license.txt @@ -0,0 +1,2 @@ +VCR OSD Mono created by Riciery Leal/mrmanet. Website indicates 100% free, author confirms it's free for all to use. +(https://www.dafont.com/font-comment.php?file=vcr_osd_mono) diff --git a/tgstation.dme b/tgstation.dme index 4f9415f70c9..660223dc6a5 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -664,6 +664,7 @@ #include "code\controllers\subsystem\timer.dm" #include "code\controllers\subsystem\title.dm" #include "code\controllers\subsystem\traitor.dm" +#include "code\controllers\subsystem\tutorials.dm" #include "code\controllers\subsystem\verb_manager.dm" #include "code\controllers\subsystem\vis_overlays.dm" #include "code\controllers\subsystem\vote.dm" @@ -4792,6 +4793,10 @@ #include "code\modules\tgui_panel\telemetry.dm" #include "code\modules\tgui_panel\tgui_panel.dm" #include "code\modules\tooltip\tooltip.dm" +#include "code\modules\tutorials\_tutorial.dm" +#include "code\modules\tutorials\tutorial_instruction.dm" +#include "code\modules\tutorials\tutorials\drop.dm" +#include "code\modules\tutorials\tutorials\switch_hands.dm" #include "code\modules\unit_tests\_unit_tests.dm" #include "code\modules\uplink\uplink_devices.dm" #include "code\modules\uplink\uplink_items.dm" @@ -5022,6 +5027,7 @@ #include "code\modules\wiremod\shell\shell_items.dm" #include "code\modules\zombie\items.dm" #include "code\modules\zombie\organs.dm" +#include "interface\fonts.dm" #include "interface\interface.dm" #include "interface\menu.dm" #include "interface\stylesheet.dm"