Circuits, Flatpacker, & Mail sorter cherrypicking (#741)

Author: Wallemations

code/__DEFINES/construction/material.dm

@@ -15,8 +15,8 @@
 #define MAXCOIL 30
 
 //Category of materials
-/// Is the material from an ore? currently unused but exists atm for categorizations sake
-#define MAT_CATEGORY_ORE "ore capable"
+/// Can this material be stored in the ore silo
+#define MAT_CATEGORY_SILO "silo capable"
 /// Hard materials, such as iron or silver
 #define MAT_CATEGORY_RIGID "rigid material"
 /// Materials that can be used to craft items

code/__DEFINES/dcs/signals/signals_circuit.dm

@@ -22,6 +22,9 @@
 /// Sent when a circuit is removed from its shell
 #define COMSIG_CIRCUIT_SHELL_REMOVED "circuit_shell_removed"
 
+/// Send to [/obj/item/circuit_component] when it is added to a circuit. (/obj/item/integrated_circuit)
+#define COMSIG_CIRCUIT_COMPONENT_ADDED "circuit_component_added"
+
 /// Sent to [/obj/item/circuit_component] when it is removed from a circuit. (/obj/item/integrated_circuit)
 #define COMSIG_CIRCUIT_COMPONENT_REMOVED "circuit_component_removed"
 

code/__DEFINES/dcs/signals/signals_object.dm

@@ -515,3 +515,51 @@
 #define COMSIG_ITEM_WEIGHT_CLASS_CHANGED "item_weight_class_changed"
 /// Sent from /obj/item/update_weight_class(), to it's loc. (obj/item/changed_item, old_w_class, new_w_class)
 #define COMSIG_ATOM_CONTENTS_WEIGHT_CLASS_CHANGED "atom_contents_weight_class_changed"
+
+///Sent from /obj/item/skillchip/on_implant()
+#define COMSIG_SKILLCHIP_IMPLANTED "skillchip_implanted"
+
+///Sent from /obj/item/skillchip/on_remove()
+#define COMSIG_SKILLCHIP_REMOVED "skillchip_removed"
+
+/// from /obj/machinery/computer/camera_advanced/shuttle_docker/gatherNavComputerOverlays() : (list/images_out)
+#define COMSIG_SHUTTLE_NAV_COMPUTER_IMAGE_REQUESTED "shuttle_nav_computer_image_requested"
+
+/// Sent from /obj/item/organ/wings/functional/proc/open_wings(): (mob/living/carbon/owner)
+#define COMSIG_WINGS_OPENED "wings_opened"
+/// Sent from /obj/item/organ/wings/functional/proc/close_wings(): (mob/living/carbon/owner)
+#define COMSIG_WINGS_CLOSED "wings_closed"
+
+/// Sent from /obj/item/assembly/on_attach(): (atom/holder)
+#define COMSIG_ASSEMBLY_ATTACHED "assembly_attached"
+
+/// Sent from /obj/item/assembly/on_detach(): (atom/holder)
+#define COMSIG_ASSEMBLY_DETACHED "assembly_detached"
+
+/*
+ * The following four signals are separate from the above two because buttons and pressure plates don't set the holder of the inserted assembly.
+ * This causes subtle behavioral differences that future handlers for these signals may need to account for,
+ * even if none of the currently implemented handlers do.
+ */
+
+/// Sent when an assembly is added to a button : (obj/machinery/button/button, mob/user)
+#define COMSIG_ASSEMBLY_ADDED_TO_BUTTON "assembly_added_to_button"
+
+/// Sent when an assembly is removed from a button : (obj/machinery/button/button, mob/user)
+#define COMSIG_ASSEMBLY_REMOVED_FROM_BUTTON "assembly_removed_from_button"
+
+/// Sent when an assembly is added to a pressure plate : (obj/item/pressureplate/pressure_plate, mob/user)
+#define COMSIG_ASSEMBLY_ADDED_TO_PRESSURE_PLATE "assembly_added_to_pressure_plate"
+
+/// Sent when an assembly is removed from a pressure plate : (obj/item/pressureplate/pressure_plate, mob/user)
+#define COMSIG_ASSEMBLY_REMOVED_FROM_PRESSURE_PLATE "assembly_removed_from_pressure_playe"
+
+/// Sent from /datum/powernet/add_cable()
+#define COMSIG_CABLE_ADDED_TO_POWERNET "cable_added_to_powernet"
+
+/// Sent from /datum/powernet/remove_cable()
+#define COMSIG_CABLE_REMOVED_FROM_POWERNET "cable_removed_from_powernet"
+
+/// Sent from /datum/wires/attach_assembly() : (atom/holder)
+#define COMSIG_ASSEMBLY_PRE_ATTACH "assembly_pre_attach"
+	#define COMPONENT_CANCEL_ATTACH (1<<0)

code/__DEFINES/dcs/signals/signals_powernet.dm

@@ -0,0 +1,4 @@
+// Powernet signals
+
+/// Sent when a wirenet circuit component sends a signal (list/data)
+#define COMSIG_POWERNET_CIRCUIT_TRANSMISSION "powernet_circuit_transmision"

code/__DEFINES/traits/declarations.dm

@@ -1093,4 +1093,7 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
  */
 #define TRAIT_COMBAT_MODE_SKIP_INTERACTION "combat_mode_skip_interaction"
 
+/// Trait applied when the wire bundle component is added to an [/obj/item/integrated_circuit]
+#define TRAIT_COMPONENT_WIRE_BUNDLE "component_wire_bundle"
+
 // END TRAIT DEFINES

code/__DEFINES/wires.dm

@@ -2,6 +2,30 @@
 #define COMSIG_CUT_WIRE(wire) "cut_wire [wire]"
 #define COMSIG_MEND_WIRE(wire) "mend_wire [wire]"
 
+/// from base of /datum/wires/proc/on_pulse : (wire, mob/user)
+#define COMSIG_PULSE_WIRE "pulse_wire"
+
+// Directionality of wire pulses
+
+/// The wires interact with their holder when pulsed
+#define WIRES_INPUT (1<<0)
+/// The wires have a reason to toggle whether attached assemblies are armed
+#define WIRES_TOGGLE_ARMED (1<<1)
+/// The wires only want to activate assemblies that do something other than (dis)arming themselves
+#define WIRES_FUNCTIONAL_OUTPUT (1<<2)
+/// The holder can both pulse its wires and be affected by its wires getting pulsed
+#define WIRES_ALL (WIRES_INPUT | WIRES_TOGGLE_ARMED | WIRES_FUNCTIONAL_OUTPUT)
+
+/// The assembly can pulse a wire it is attached to
+#define ASSEMBLY_INPUT (1<<0)
+/// The assembly toggles whether it will pulse the attached wire when it is pulsed by the attached wire
+#define ASSEMBLY_TOGGLE_ARMED (1<<1)
+/// The assembly does something other than just (dis)arming itself when it is pulsed by the wire it is attached to
+#define ASSEMBLY_FUNCTIONAL_OUTPUT (1<<2)
+/// The assembly can both pulse the wire it is attached to, and (dis)arms itself when pulsed by the wire
+#define ASSEMBLY_TOGGLEABLE_INPUT (ASSEMBLY_INPUT | ASSEMBLY_TOGGLE_ARMED)
+#define ASSEMBLY_ALL (ASSEMBLY_TOGGLEABLE_INPUT | ASSEMBLY_FUNCTIONAL_OUTPUT)
+
 //retvals for attempt_wires_interaction
 #define WIRE_INTERACTION_FAIL 0
 #define WIRE_INTERACTION_SUCCESSFUL 1
@@ -72,3 +96,5 @@
 #define AI_WIRE_DISABLED 1
 #define AI_WIRE_HACKED 2
 #define AI_WIRE_DISABLED_HACKED -1
+
+#define MAX_WIRE_COUNT 17

code/_globalvars/lists/objects.dm

@@ -31,8 +31,7 @@ GLOBAL_LIST_EMPTY(deliverybeacontags)
 /// List of all singularity components that exist
 GLOBAL_LIST_EMPTY_TYPED(singularities, /datum/component/singularity)
 
-/// list of all /datum/tech datums indexed by id.
-GLOBAL_LIST_EMPTY(tech_list)
+GLOBAL_LIST_EMPTY(item_to_design_list)
 /// list of all surgeries by name, associated with their path.
 GLOBAL_LIST_INIT(surgeries_list, init_surgeries())
 

code/_globalvars/traits/_traits.dm

@@ -545,6 +545,7 @@ GLOBAL_LIST_INIT(traits_by_type, list(
 		"TRAIT_CIRCUIT_UI_OPEN" = TRAIT_CIRCUIT_UI_OPEN,
 		"TRAIT_CIRCUIT_UNDUPABLE" = TRAIT_CIRCUIT_UNDUPABLE,
 		"TRAIT_COMPONENT_MMI" = TRAIT_COMPONENT_MMI,
+		"TRAIT_COMPONENT_WIRE_BUNDLE" = TRAIT_COMPONENT_WIRE_BUNDLE,
 	),
 	/obj/item/modular_computer = list(
 		"TRAIT_MODPC_HALVED_DOWNLOAD_SPEED" = TRAIT_MODPC_HALVED_DOWNLOAD_SPEED,

code/controllers/subsystem/research.dm

@@ -7,6 +7,7 @@ SUBSYSTEM_DEF(research)
 	//TECHWEB STATIC
 	var/list/techweb_nodes = list() //associative id = node datum
 	var/list/techweb_designs = list() //associative id = node datum
+	var/list/datum/design/item_to_design = list() //typepath = list of design datums
 
 	///List of all techwebs, generating points or not.
 	///Autolathes, Mechfabs, and others all have shared techwebs, for example.
@@ -168,6 +169,7 @@ SUBSYSTEM_DEF(research)
 
 /datum/controller/subsystem/research/proc/initialize_all_techweb_designs(clearall = FALSE)
 	if(islist(techweb_designs) && clearall)
+		item_to_design = null
 		QDEL_LIST(techweb_designs)
 	var/list/returned = list()
 	for(var/path in subtypesof(/datum/design))
@@ -182,6 +184,11 @@ SUBSYSTEM_DEF(research)
 			stack_trace("WARNING: Design ID clash with ID [initial(DN.id)] detected! Path: [path]")
 			errored_datums[DN] = initial(DN.id)
 			continue
+		var/build_path = initial(DN.build_path)
+		if(!isnull(build_path))
+			if(!(build_path in item_to_design))
+				item_to_design[build_path] = list()
+			item_to_design[build_path] += DN
 		DN.InitializeMaterials() //Initialize the materials in the design
 		returned[initial(DN.id)] = DN
 	techweb_designs = returned

code/datums/components/crafting/furniture.dm

@@ -59,3 +59,15 @@
 	tool_behaviors = list(TOOL_SCREWDRIVER)
 	category = CAT_FURNITURE
 	time = 7 SECONDS
+
+/datum/crafting_recipe/flatpack_cart
+	name = "Flatpack Cart"
+	reqs = list(
+		/obj/item/stack/sheet/iron = 4,
+		/obj/item/stack/sheet/plasteel = 1,
+		/obj/item/stack/rods = 8
+	)
+	result = /obj/structure/flatpack_cart
+	tool_behaviors = list(TOOL_SCREWDRIVER)
+	category = CAT_FURNITURE
+	time = 10 SECONDS