From 7b151850d4fafbf2ca7db85df9907663420c3f90 Mon Sep 17 00:00:00 2001 From: DGamerL <108773801+DGamerL@users.noreply.github.com> Date: Tue, 6 Aug 2024 22:40:40 +0200 Subject: [PATCH] Makes surpluses spawn items again (#26411) --- code/datums/uplink_items/uplink_general.dm | 2 +- code/datums/uplink_items/uplink_traitor.dm | 4 ++-- code/game/objects/structures/crates_lockers/crates.dm | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/code/datums/uplink_items/uplink_general.dm b/code/datums/uplink_items/uplink_general.dm index d2b52139511..508a8290279 100644 --- a/code/datums/uplink_items/uplink_general.dm +++ b/code/datums/uplink_items/uplink_general.dm @@ -138,7 +138,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) return - var/obj/I = spawn_item(get_turf(user), U) + var/obj/I = spawn_item(get_turf(user), U, user) if(!I || I == UPLINK_SPECIAL_SPAWNING) return // Failed to spawn, or we handled it with special spawning diff --git a/code/datums/uplink_items/uplink_traitor.dm b/code/datums/uplink_items/uplink_traitor.dm index fc3fe6b2665..561c68b15e7 100644 --- a/code/datums/uplink_items/uplink_traitor.dm +++ b/code/datums/uplink_items/uplink_traitor.dm @@ -661,11 +661,11 @@ var/crate_value = 250 uses_special_spawn = TRUE -/datum/uplink_item/bundles_TC/surplus_crate/spawn_item(turf/loc, obj/item/uplink/U) +/datum/uplink_item/bundles_TC/surplus_crate/spawn_item(turf/loc, obj/item/uplink/U, mob/user) if(..() != UPLINK_SPECIAL_SPAWNING) return FALSE - new /obj/structure/closet/crate/surplus(loc, U, crate_value, cost) + new /obj/structure/closet/crate/surplus(loc, U, crate_value, cost, user) // ----------------------------------- // PRICES OVERRIDEN FOR NUCLEAR AGENTS diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm index 733cb21fbd6..71dc7aa0f6e 100644 --- a/code/game/objects/structures/crates_lockers/crates.dm +++ b/code/game/objects/structures/crates_lockers/crates.dm @@ -597,9 +597,9 @@ /obj/structure/closet/crate/surplus -/obj/structure/closet/crate/surplus/Initialize(mapload, obj/item/uplink/U, crate_value, cost) +/obj/structure/closet/crate/surplus/Initialize(mapload, obj/item/uplink/U, crate_value, cost, mob/user) . = ..() - var/list/temp_uplink_list = get_uplink_items(U) + var/list/temp_uplink_list = get_uplink_items(U, user) var/list/buyable_items = list() for(var/category in temp_uplink_list) buyable_items += temp_uplink_list[category]