From eafb3e4d4e778cbf8e03088e8178336e74a18c83 Mon Sep 17 00:00:00 2001
From: Geeves <ggrobler447@gmail.com>
Date: Tue, 20 Dec 2022 19:35:15 +0200
Subject: [PATCH] Wearable IC Fixes (#15386)

---
 code/modules/integrated_electronics/core/assemblies.dm   | 4 +++-
 .../integrated_electronics/core/assemblies/clothing.dm   | 9 +++++++++
 html/changelogs/geeves-ic_goggles_attack_self.yml        | 7 +++++++
 3 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 html/changelogs/geeves-ic_goggles_attack_self.yml

diff --git a/code/modules/integrated_electronics/core/assemblies.dm b/code/modules/integrated_electronics/core/assemblies.dm
index 64bf7470ff4..53b23cb4e35 100644
--- a/code/modules/integrated_electronics/core/assemblies.dm
+++ b/code/modules/integrated_electronics/core/assemblies.dm
@@ -155,12 +155,14 @@
 
 	var/mob/M = usr
 	if(!check_interactivity(M))
-		return
+		return null
 
 	var/input = sanitizeSafe(input("What do you want to name this?", "Rename", src.name) as null|text, MAX_NAME_LEN)
 	if(src && input)
 		to_chat(M, "<span class='notice'>The machine now has a label reading '[input]'.</span>")
 		name = input
+		return input
+	return null
 
 /obj/item/device/electronic_assembly/proc/can_move()
 	return FALSE
diff --git a/code/modules/integrated_electronics/core/assemblies/clothing.dm b/code/modules/integrated_electronics/core/assemblies/clothing.dm
index 977f205c0c0..58c4ff47d90 100644
--- a/code/modules/integrated_electronics/core/assemblies/clothing.dm
+++ b/code/modules/integrated_electronics/core/assemblies/clothing.dm
@@ -38,6 +38,10 @@
 	max_complexity = IC_COMPLEXITY_BASE * 2
 	w_class = ITEMSIZE_NORMAL
 
+/obj/item/device/electronic_assembly/clothing/rename()
+	var/input_name = ..()
+	if(input_name)
+		clothing.name = input_name
 
 // This is defined higher up, in /clothing to avoid lots of copypasta.
 /obj/item/clothing
@@ -134,6 +138,11 @@
 	setup_integrated_circuit(/obj/item/device/electronic_assembly/clothing/small)
 	return ..()
 
+/obj/item/clothing/glasses/circuitry/attack_self(mob/user)
+	if(IC)
+		return IC.attack_self(user)
+	return ..()
+
 /obj/item/clothing/glasses/circuitry/Look(var/atom/A, mob/user, var/proximity)
 	if(!A)
 		return 0
diff --git a/html/changelogs/geeves-ic_goggles_attack_self.yml b/html/changelogs/geeves-ic_goggles_attack_self.yml
new file mode 100644
index 00000000000..48a5ae9cd83
--- /dev/null
+++ b/html/changelogs/geeves-ic_goggles_attack_self.yml
@@ -0,0 +1,7 @@
+author: Geeves
+
+delete-after: True
+
+changes:
+  - bugfix: "Button- and colorpad-like inputs on the integrated circuit goggles now work as expected."
+  - bugfix: "Renaming wearable integrated circuit clothing now works correctly."