diff --git a/modular_skyrat/modules/opposing_force/code/opposing_force_datum.dm b/modular_skyrat/modules/opposing_force/code/opposing_force_datum.dm index 2c115a54aca..2643948f86e 100644 --- a/modular_skyrat/modules/opposing_force/code/opposing_force_datum.dm +++ b/modular_skyrat/modules/opposing_force/code/opposing_force_datum.dm @@ -184,22 +184,6 @@ data["equipment_issued"] = equipment_issued - data["equipment_list"] = list() - for(var/equipment_category in SSopposing_force.equipment_list) - var/category_items = list() - for(var/datum/opposing_force_equipment/opfor_equipment as anything in SSopposing_force.equipment_list[equipment_category]) - category_items += list(list( - "ref" = REF(opfor_equipment), - "name" = opfor_equipment.name, - "description" = opfor_equipment.description, - "equipment_category" = opfor_equipment.category, - "admin_note" = opfor_equipment.admin_note, - )) - data["equipment_list"] += list(list( - "category" = equipment_category, - "items" = category_items, - )) - data["selected_equipment"] = list() for(var/datum/opposing_force_selected_equipment/equipment as anything in selected_equipment) var/list/equipment_data = list( @@ -218,6 +202,25 @@ return data +/datum/opposing_force/ui_static_data(mob/user) + . = ..() + .["equipment_list"] = list() + + for(var/equipment_category in SSopposing_force.equipment_list) + var/category_items = list() + for(var/datum/opposing_force_equipment/opfor_equipment as anything in SSopposing_force.equipment_list[equipment_category]) + category_items += list(list( + "ref" = REF(opfor_equipment), + "name" = opfor_equipment.name, + "description" = opfor_equipment.description, + "equipment_category" = opfor_equipment.category, + "admin_note" = opfor_equipment.admin_note, + )) + .["equipment_list"] += list(list( + "category" = equipment_category, + "items" = category_items, + )) + /datum/opposing_force/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) . = ..() if(.) @@ -964,7 +967,7 @@ ) for(var/datum/opposing_force_selected_equipment/iterating_equipment as anything in selected_equipment) - exported_data["selected_equipment"]["[objectives.Find(iterating_equipment)]"] = list( + exported_data["selected_equipment"]["[selected_equipment.Find(iterating_equipment)]"] = list( "equipment_name" = iterating_equipment.opposing_force_equipment.name, "equipment_parent_category" = iterating_equipment.opposing_force_equipment.category, "equipment_parent_type" = iterating_equipment.opposing_force_equipment.type, @@ -986,22 +989,6 @@ fdel(to_write_file) - -/datum/action/opfor - name = "Open Opposing Force Panel" - button_icon_state = "round_end" - -/datum/action/opfor/Trigger(trigger_flags) - . = ..() - if(!.) - return - owner.opposing_force() - -/datum/action/opfor/IsAvailable(feedback = FALSE) - if(!target) - return FALSE - return ..() - /obj/effect/statclick/opfor_specific var/datum/opposing_force/opfor diff --git a/modular_skyrat/modules/opposing_force/code/opposing_force_subsystem.dm b/modular_skyrat/modules/opposing_force/code/opposing_force_subsystem.dm index 2e4eece0d38..5c474a831b6 100644 --- a/modular_skyrat/modules/opposing_force/code/opposing_force_subsystem.dm +++ b/modular_skyrat/modules/opposing_force/code/opposing_force_subsystem.dm @@ -195,9 +195,3 @@ SUBSYSTEM_DEF(opposing_force) returned_html += " - [opposing_force.build_html_panel_entry()]" return returned_html.Join("
") - -/// Gives a mind the opfor action button, which calls the opfor verb when pressed -/datum/controller/subsystem/opposing_force/proc/give_opfor_button(mob/living/carbon/human/player) - var/datum/action/opfor/info_button - info_button = new(src) - info_button.Grant(player) diff --git a/modular_zubbers/master_files/skyrat/modules/opposing_force/code/opposing_force_subsystem.dm b/modular_zubbers/master_files/skyrat/modules/opposing_force/code/opposing_force_subsystem.dm deleted file mode 100644 index ce6451d0524..00000000000 --- a/modular_zubbers/master_files/skyrat/modules/opposing_force/code/opposing_force_subsystem.dm +++ /dev/null @@ -1,3 +0,0 @@ -// Removes the opfor button from appearing on screen. There's a verb in the OOC tab -/datum/controller/subsystem/opposing_force/give_opfor_button(mob/living/carbon/human/player) - return diff --git a/tgstation.dme b/tgstation.dme index 0a39eaf76fe..2ab84bddd03 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -9722,7 +9722,6 @@ #include "modular_zubbers\master_files\skyrat\modules\blueshield\code\blueshield.dm" #include "modular_zubbers\master_files\skyrat\modules\company_imports\code\armament_datums\deforest_medical.dm" #include "modular_zubbers\master_files\skyrat\modules\deforest_medical_items\code\cargo_packs.dm" -#include "modular_zubbers\master_files\skyrat\modules\opposing_force\code\opposing_force_subsystem.dm" #include "modular_zubbers\master_files\skyrat\modules\verbs\code\subtle.dm" #include "modular_zubbers\modules\lewd_clothing\latex_halfcatsuit.dm" #include "modular_zubbers\modules\plexagon_selfserve\code\off_duty_component.dm" diff --git a/tgui/packages/tgui/interfaces/OpposingForcePanel.jsx b/tgui/packages/tgui/interfaces/OpposingForcePanel.jsx index e2e8068ee0a..3db9d748748 100644 --- a/tgui/packages/tgui/interfaces/OpposingForcePanel.jsx +++ b/tgui/packages/tgui/interfaces/OpposingForcePanel.jsx @@ -27,7 +27,7 @@ export const OpposingForcePanel = (props) => { @@ -203,11 +203,12 @@ export const OpposingForceTab = (props) => {