upstream-24-07b

This commit is contained in:
Waterpig
2024-07-08 19:05:52 +02:00
parent 7cb3b3f472
commit d39ded55d5
38 changed files with 3786 additions and 3797 deletions
@@ -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) // 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 argument
var/mob/living/carbon/human/avatar = new(destination)
// BUBBER EDIT BEGIN - PREFS!
+9 -2
View File
@@ -154,8 +154,15 @@
var/atom/entry_atom = get_avatar_destination()
if(isnull(entry_atom))
return
var/mob/living/carbon/new_avatar = generate_avatar(get_turf(entry_atom), netsuit)
// BUBBER EDIT BEGIN - PREFS!
var/datum/preferences/pref
var/load_loadout = FALSE
var/obj/item/bitrunning_disk/prefs/prefdisk = locate() in neo.get_contents()
if(prefdisk)
load_loadout = prefdisk.include_loadout
pref = prefdisk.loaded_preference
var/mob/living/carbon/new_avatar = generate_avatar(get_turf(entry_atom), netsuit, prefs = pref, load_loadout = load_loadout) // Added the prefs argument
// BUBBER EDIT END
stock_gear(new_avatar, neo, generated_domain)
// Cleanup for domains with one time use custom spawns