From 9313fd65cfd5a3cbdb64253ad98ab792bf365a7d Mon Sep 17 00:00:00 2001
From: JStheguy <LOLCAT22@YAHOO.COM>
Date: Wed, 13 Dec 2017 21:09:55 -0600
Subject: [PATCH] Adds Additional Electronic_Assembly Designs (#33466)

* bloats electronic_setups.dmi

* new assembly naming scheme, redone legacy sprites
---
 .../subsystem/processing/circuit.dm           |  18 ++++--
 .../integrated_electronics/core/assemblies.dm |  60 ++++++++++++++++++
 icons/obj/assemblies/electronic_setups.dmi    | Bin 3757 -> 7411 bytes
 3 files changed, 74 insertions(+), 4 deletions(-)

diff --git a/code/controllers/subsystem/processing/circuit.dm b/code/controllers/subsystem/processing/circuit.dm
index 461a793a45..a9abacd934 100644
--- a/code/controllers/subsystem/processing/circuit.dm
+++ b/code/controllers/subsystem/processing/circuit.dm
@@ -44,10 +44,20 @@ PROCESSING_SUBSYSTEM_DEF(circuit)
 
 
 	circuit_fabricator_recipe_list["Assemblies"] = list(
-		/obj/item/device/electronic_assembly,
-		/obj/item/device/electronic_assembly/medium,
-		/obj/item/device/electronic_assembly/large,
-		/obj/item/device/electronic_assembly/drone
+		/obj/item/device/electronic_assembly/default,
+		/obj/item/device/electronic_assembly/calc,
+		/obj/item/device/electronic_assembly/clam,
+		/obj/item/device/electronic_assembly/simple,
+		/obj/item/device/electronic_assembly/medium/default,
+		/obj/item/device/electronic_assembly/medium/box,
+		/obj/item/device/electronic_assembly/medium/clam,
+		/obj/item/device/electronic_assembly/medium/medical,
+		/obj/item/device/electronic_assembly/large/default,
+		/obj/item/device/electronic_assembly/large/scope,
+		/obj/item/device/electronic_assembly/large/terminal,
+		/obj/item/device/electronic_assembly/large/arm,
+		/obj/item/device/electronic_assembly/drone/default,
+		/obj/item/device/electronic_assembly/drone/arms
 		///obj/item/weapon/implant/integrated_circuit
 		)
 
diff --git a/code/modules/integrated_electronics/core/assemblies.dm b/code/modules/integrated_electronics/core/assemblies.dm
index 135461a12f..805cf787f7 100644
--- a/code/modules/integrated_electronics/core/assemblies.dm
+++ b/code/modules/integrated_electronics/core/assemblies.dm
@@ -403,7 +403,23 @@
 
 	return acting_object.drop_location()
 
+/obj/item/device/electronic_assembly/default //The /default electronic_assemblys are to allow the introduction of the new naming scheme without breaking old saves.
+	name = "type-a electronic assembly"
 
+/obj/item/device/electronic_assembly/calc
+	name = "type-b electronic assembly"
+	icon_state = "setup_small_calc"
+	desc = "It's a case, for building small electronics with. This one resembles a pocket calculator."
+
+/obj/item/device/electronic_assembly/clam
+	name = "type-c electronic assembly"
+	icon_state = "setup_small_clam"
+	desc = "It's a case, for building small electronics with. This one has a clamshell design."
+
+/obj/item/device/electronic_assembly/simple
+	name = "type-d electronic assembly"
+	icon_state = "setup_small_simple"
+	desc = "It's a case, for building small electronics with. This one has a simple design."
 
 /obj/item/device/electronic_assembly/medium
 	name = "electronic mechanism"
@@ -413,6 +429,24 @@
 	max_components = IC_MAX_SIZE_BASE * 2
 	max_complexity = IC_COMPLEXITY_BASE * 2
 
+/obj/item/device/electronic_assembly/medium/default
+	name = "type-a electronic mechanism"
+
+/obj/item/device/electronic_assembly/medium/box
+	name = "type-b electronic mechanism"
+	icon_state = "setup_medium_box"
+	desc = "It's a case, for building medium-sized electronics with. This one has a boxy design."
+
+/obj/item/device/electronic_assembly/medium/clam
+	name = "type-c electronic mechanism"
+	icon_state = "setup_medium_clam"
+	desc = "It's a case, for building medium-sized electronics with. This one has a clamshell design."
+
+/obj/item/device/electronic_assembly/medium/medical
+	name = "type-d electronic mechanism"
+	icon_state = "setup_medium_med"
+	desc = "It's a case, for building medium-sized electronics with. This one resembles some type of medical apparatus."
+
 /obj/item/device/electronic_assembly/large
 	name = "electronic machine"
 	icon_state = "setup_large"
@@ -438,6 +472,24 @@
 		return
 	..()
 
+/obj/item/device/electronic_assembly/large/default
+	name = "type-a electronic machine"
+
+/obj/item/device/electronic_assembly/large/scope
+	name = "type-b electronic machine"
+	icon_state = "setup_large_scope"
+	desc = "It's a case, for building large electronics with. This one resembles an oscilloscope."
+
+/obj/item/device/electronic_assembly/large/terminal
+	name = "type-c electronic machine"
+	icon_state = "setup_large_terminal"
+	desc = "It's a case, for building large electronics with. This one resembles a computer terminal."
+
+/obj/item/device/electronic_assembly/large/arm
+	name = "type-d electronic machine"
+	icon_state = "setup_large_arm"
+	desc = "It's a case, for building large electronics with. This one resembles a robotic arm."
+
 /obj/item/device/electronic_assembly/drone
 	name = "electronic drone"
 	icon_state = "setup_drone"
@@ -448,3 +500,11 @@
 
 /obj/item/device/electronic_assembly/drone/can_move()
 	return TRUE
+
+/obj/item/device/electronic_assembly/drone/default
+	name = "type-a electronic drone"
+
+/obj/item/device/electronic_assembly/drone/arms
+	name = "type-b electronic drone"
+	icon_state = "setup_drone_arms"
+	desc = "It's a case, for building mobile electronics with. This one is armed and dangerous."
\ No newline at end of file
diff --git a/icons/obj/assemblies/electronic_setups.dmi b/icons/obj/assemblies/electronic_setups.dmi
index 7074d08328cc106e8c66d0e3e70187f9433dd21f..643d652be1ac011b5f69192da307db10c09d605c 100644
GIT binary patch
literal 7411
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

literal 3757
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