Merge branch 'master' of https://github.com/tgstation/tgstation into pulls-tg-to-fix-shit

code/modules/wiremod/components/abstract/module.dm

@@ -237,7 +237,11 @@
 
 #define WITHIN_RANGE(id, table) (id >= 1 && id <= length(table))
 
+<<<<<<< HEAD
 /obj/item/circuit_component/module/ui_act(action, list/params)
+=======
+/obj/item/circuit_component/module/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
+>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3
 	. = ..()
 	if(.)
 		return

code/modules/wiremod/components/admin/proccall.dm

@@ -114,7 +114,11 @@
 		arguments += add_input_port(data["name"], data["datatype"])
 	return ..()
 
+<<<<<<< HEAD
 /obj/item/circuit_component/proccall/ui_act(action, list/params)
+=======
+/obj/item/circuit_component/proccall/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
+>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3
 	. = ..()
 	if(.)
 		return

code/modules/wiremod/components/bci/reagent_injector.dm

@@ -9,10 +9,13 @@
 	display_name = "Reagent Injector"
 	desc = "A component that can inject reagents from a BCI's reagent storage."
 	category = "BCI"
+<<<<<<< HEAD
 	//SKYRAT EDIT CHANGE BEGIN - Add container type flag - This is required since we have two reagent components, and the BCI only allows one active
 	//circuit_flags = CIRCUIT_NO_DUPLICATES - SKYRAT EDIT - ORIGINAL
 	circuit_flags = CIRCUIT_NO_DUPLICATES|CIRCUIT_REAGENT_CONTAINER_TYPE
 	//SKYRAT EDIT CHANGE END
+=======
+>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3
 	circuit_flags = CIRCUIT_NO_DUPLICATES
 
 	required_shells = list(/obj/item/organ/internal/cyberimp/bci)

code/modules/wiremod/components/id/access_checker.dm

@@ -87,7 +87,11 @@
 	data["oneAccess"] = check_any.value
 	return data
 
+<<<<<<< HEAD
 /obj/item/circuit_component/compare/access/ui_act(action, params)
+=======
+/obj/item/circuit_component/compare/access/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
+>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3
 	. = ..()
 	if(.)
 		return

code/modules/wiremod/core/component_printer.dm

@@ -117,7 +117,11 @@
 	materials.use_materials(design.materials, efficiency_coeff, 1, "printed", "[design.name]")
 	return new design.build_path(drop_location())
 
+<<<<<<< HEAD
 /obj/machinery/component_printer/ui_act(action, list/params)
+=======
+/obj/machinery/component_printer/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
+>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3
 	. = ..()
 	if (.)
 		return
@@ -276,7 +280,11 @@
 		get_asset_datum(/datum/asset/spritesheet/research_designs)
 	)
 
+<<<<<<< HEAD
 /obj/machinery/debug_component_printer/ui_act(action, list/params)
+=======
+/obj/machinery/debug_component_printer/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
+>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3
 	. = ..()
 	if (.)
 		return
@@ -364,7 +372,11 @@
 
 	update_static_data_for_all_viewers()
 
+<<<<<<< HEAD
 /obj/machinery/module_duplicator/ui_act(action, list/params)
+=======
+/obj/machinery/module_duplicator/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
+>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3
 	. = ..()
 	if (.)
 		return

code/modules/wiremod/core/integrated_circuit.dm

@@ -264,6 +264,7 @@ GLOBAL_LIST_EMPTY_TYPED(integrated_circuits, /obj/item/integrated_circuit)
 			to_chat(user, span_danger("You can't insert multiple instances of this component into the same circuit!"))
 			return FALSE
 
+<<<<<<< HEAD
 	// SKYRAT ADDITION BEGIN - This is required since we have two reagent components, and the BCI only allows one active
 	if(to_add.circuit_flags & CIRCUIT_REAGENT_CONTAINER_TYPE)
 		if(shell && shell.reagents)
@@ -271,6 +272,8 @@ GLOBAL_LIST_EMPTY_TYPED(integrated_circuits, /obj/item/integrated_circuit)
 			return FALSE
 	// SKYRAT ADDITION END
 
+=======
+>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3
 	var/success = FALSE
 	if(user)
 		success = user.transferItemToLoc(to_add, src)

code/modules/wiremod/shell/brain_computer_interface.dm

@@ -3,7 +3,10 @@
 	desc = "An implant that can be placed in a user's head to control circuits using their brain."
 	icon = 'icons/obj/science/circuits.dmi'
 	icon_state = "bci"
+<<<<<<< HEAD
 	visual = FALSE
+=======
+>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3
 	zone = BODY_ZONE_HEAD
 	w_class = WEIGHT_CLASS_TINY