From bff9fe01cc8823ee9761914e58bd9386ccc6232b Mon Sep 17 00:00:00 2001 From: Waterpig <49160555+Majkl-J@users.noreply.github.com> Date: Tue, 16 Jul 2024 21:24:55 +0200 Subject: [PATCH] Bitrunning loadout and name fixes (#1790) ## About The Pull Request Loadouts load again, gamer names have been replaced by character names. ## Why It's Good For The Game This is intended by what I created with the original bitrunning prefs ## Changelog :cl: fix: Loadouts in bitrunning work again fix: Names in bitrunning work again /:cl: --- code/modules/bitrunning/components/avatar_connection.dm | 3 ++- code/modules/bitrunning/server/obj_generation.dm | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/code/modules/bitrunning/components/avatar_connection.dm b/code/modules/bitrunning/components/avatar_connection.dm index 4274893e998..66493f22198 100644 --- a/code/modules/bitrunning/components/avatar_connection.dm +++ b/code/modules/bitrunning/components/avatar_connection.dm @@ -61,7 +61,8 @@ action.Grant(avatar) var/client/our_client = avatar.client - var/alias = our_client?.prefs?.read_preference(/datum/preference/name/hacker_alias) || pick(GLOB.hacker_aliases) + var/alias = null// BUBBER EDIT - removes random aliases - original: var/alias = our_client?.prefs?.read_preference(/datum/preference/name/hacker_alias) || pick(GLOB.hacker_aliases) + if(alias && avatar.real_name != alias) avatar.fully_replace_character_name(avatar.real_name, alias) diff --git a/code/modules/bitrunning/server/obj_generation.dm b/code/modules/bitrunning/server/obj_generation.dm index 4f54f739e4e..d34305f3dc6 100644 --- a/code/modules/bitrunning/server/obj_generation.dm +++ b/code/modules/bitrunning/server/obj_generation.dm @@ -38,7 +38,7 @@ /// Generates a new avatar for the bitrunner. -/obj/machinery/quantum_server/proc/generate_avatar(turf/destination, datum/outfit/netsuit, datum/preferences/prefs, load_loadout = FALSE) // BUBBER EDIT - Prefs argument +/obj/machinery/quantum_server/proc/generate_avatar(turf/destination, datum/outfit/netsuit, datum/preferences/prefs, load_loadout = FALSE) // BUBBER EDIT - Prefs and loadout argument var/mob/living/carbon/human/avatar = new(destination) // BUBBER EDIT BEGIN - PREFS! @@ -82,6 +82,9 @@ new /obj/item/flashlight, ) + if(load_loadout) + avatar.equip_outfit_and_loadout(new /datum/outfit(), prefs) // BUBBER EDIT - LOADOUTS + var/obj/item/card/id/outfit_id = avatar.wear_id if(outfit_id) outfit_id.registered_account = new()