diff --git a/code/modules/organs/subtypes/machine.dm b/code/modules/organs/subtypes/machine.dm
index 416e03caf1c..43cfe6a6d27 100644
--- a/code/modules/organs/subtypes/machine.dm
+++ b/code/modules/organs/subtypes/machine.dm
@@ -7,7 +7,7 @@
 	vital = 1 //because it is now hosting the posibrain
 	max_damage = 50 //made same as arm, since it is not vital
 	min_broken_damage = 30
-	encased = null
+	encased = "support frame"
 
 /obj/item/organ/external/head/ipc/New()
 	robotize("Hephaestus Integrated Limb")
@@ -15,31 +15,35 @@
 
 /obj/item/organ/external/chest/ipc
 	dislocated = -1
-	encased = null
+	encased = "support frame"
 /obj/item/organ/external/chest/ipc/New()
 	robotize("Hephaestus Integrated Limb")
 	..()
 
 /obj/item/organ/external/groin/ipc
 	dislocated = -1
+	encased = "support frame"
 /obj/item/organ/external/groin/ipc/New()
 	robotize("Hephaestus Integrated Limb")
 	..()
 
 /obj/item/organ/external/arm/ipc
 	dislocated = -1
+	encased = "support frame"
 /obj/item/organ/external/arm/ipc/New()
 	robotize("Hephaestus Integrated Limb")
 	..()
 
 /obj/item/organ/external/arm/right/ipc
 	dislocated = -1
+	encased = "support frame"
 /obj/item/organ/external/arm/right/ipc/New()
 	robotize("Hephaestus Integrated Limb")
 	..()
 
 /obj/item/organ/external/leg/ipc
 	dislocated = -1
+	encased = "support frame"
 /obj/item/organ/external/leg/ipc/New()
 	robotize("Hephaestus Integrated Limb")
 	..()
@@ -52,24 +56,28 @@
 
 /obj/item/organ/external/foot/ipc
 	dislocated = -1
+	encased = "support frame"
 /obj/item/organ/external/foot/ipc/New()
 	robotize("Hephaestus Integrated Limb")
 	..()
 
 /obj/item/organ/external/foot/right/ipc
 	dislocated = -1
+	encased = "support frame"
 /obj/item/organ/external/foot/right/ipc/New()
 	robotize("Hephaestus Integrated Limb")
 	..()
 
 /obj/item/organ/external/hand/ipc
 	dislocated = -1
+	encased = "support frame"
 /obj/item/organ/external/hand/ipc/New()
 	robotize("Hephaestus Integrated Limb")
 	..()
 
 /obj/item/organ/external/hand/right/ipc
 	dislocated = -1
+	encased = "support frame"
 /obj/item/organ/external/hand/right/ipc/New()
 	robotize("Hephaestus Integrated Limb")
 	..()
@@ -214,7 +222,7 @@
 	vital = 0
 	max_damage = 50 //made same as arm, since it is not vital
 	min_broken_damage = 30
-	encased = null
+	encased = "reinforced support frame"
 	emp_coeff = 0.5
 
 /obj/item/organ/eyes/optical_sensor/terminator
@@ -226,7 +234,7 @@
 
 /obj/item/organ/external/chest/terminator
 	dislocated = -1
-	encased = null
+	encased = "reinforced support frame"
 	emp_coeff = 0.5
 
 /obj/item/organ/external/chest/terminator/New()
@@ -235,6 +243,7 @@
 
 /obj/item/organ/external/groin/terminator
 	dislocated = -1
+	encased = "reinforced support frame"
 	emp_coeff = 0.5
 
 /obj/item/organ/external/groin/terminator/New()
@@ -243,6 +252,7 @@
 
 /obj/item/organ/external/arm/terminator
 	dislocated = -1
+	encased = "reinforced support frame"
 	emp_coeff = 0.5
 
 /obj/item/organ/external/arm/terminator/New()
@@ -251,6 +261,7 @@
 
 /obj/item/organ/external/arm/right/terminator
 	dislocated = -1
+	encased = "reinforced support frame"
 	emp_coeff = 0.5
 
 /obj/item/organ/external/arm/right/terminator/New()
@@ -259,6 +270,7 @@
 
 /obj/item/organ/external/leg/terminator
 	dislocated = -1
+	encased = "reinforced support frame"
 	emp_coeff = 0.5
 
 /obj/item/organ/external/leg/terminator/New()
@@ -267,6 +279,7 @@
 
 /obj/item/organ/external/leg/right/terminator
 	dislocated = -1
+	encased = "reinforced support frame"
 	emp_coeff = 0.5
 
 /obj/item/organ/external/leg/right/terminator/New()
@@ -275,6 +288,7 @@
 
 /obj/item/organ/external/foot/terminator
 	dislocated = -1
+	encased = "reinforced support frame"
 	emp_coeff = 0.5
 
 /obj/item/organ/external/foot/terminator/New()
@@ -283,6 +297,7 @@
 
 /obj/item/organ/external/foot/right/terminator
 	dislocated = -1
+	encased = "reinforced support frame"
 	emp_coeff = 0.5
 
 /obj/item/organ/external/foot/right/terminator/New()
@@ -291,6 +306,7 @@
 
 /obj/item/organ/external/hand/terminator
 	dislocated = -1
+	encased = "reinforced support frame"
 	emp_coeff = 0.5
 
 /obj/item/organ/external/hand/terminator/New()
@@ -299,6 +315,7 @@
 
 /obj/item/organ/external/hand/right/terminator
 	dislocated = -1
+	encased = "reinforced support frame"
 	emp_coeff = 0.5
 
 /obj/item/organ/external/hand/right/terminator/New()
@@ -315,7 +332,7 @@
 	vital = 0
 	max_damage = 50 //made same as arm, since it is not vital
 	min_broken_damage = 30
-	encased = null
+	encased = "support frame"
 
 /obj/item/organ/external/head/industrial/New()
 	robotize("Hephaestus Industrial Limb")
@@ -323,61 +340,80 @@
 
 /obj/item/organ/external/chest/industrial
 	dislocated = -1
-	encased = null
+	encased = "support frame"
+
 /obj/item/organ/external/chest/industrial/New()
 	robotize("Hephaestus Industrial Limb")
 	..()
 
 /obj/item/organ/external/groin/industrial
 	dislocated = -1
+	encased = "support frame"
+
 /obj/item/organ/external/groin/industrial/New()
 	robotize("Hephaestus Industrial Limb")
 	..()
 
 /obj/item/organ/external/arm/industrial
 	dislocated = -1
+	encased = "support frame"
+
 /obj/item/organ/external/arm/industrial/New()
 	robotize("Hephaestus Industrial Limb")
 	..()
 
 /obj/item/organ/external/arm/right/industrial
 	dislocated = -1
+	encased = "support frame"
+
 /obj/item/organ/external/arm/right/industrial/New()
 	robotize("Hephaestus Industrial Limb")
 	..()
 
 /obj/item/organ/external/leg/industrial
 	dislocated = -1
+	encased = "support frame"
+
 /obj/item/organ/external/leg/industrial/New()
 	robotize("Hephaestus Industrial Limb")
 	..()
 
 /obj/item/organ/external/leg/right/industrial
 	dislocated = -1
+	encased = "support frame"
+
 /obj/item/organ/external/leg/right/industrial/New()
 	robotize("Hephaestus Industrial Limb")
 	..()
 
 /obj/item/organ/external/foot/industrial
 	dislocated = -1
+	encased = "support frame"
+
 /obj/item/organ/external/foot/industrial/New()
 	robotize("Hephaestus Industrial Limb")
 	..()
 
 /obj/item/organ/external/foot/right/industrial
 	dislocated = -1
+	encased = "support frame"
+
 /obj/item/organ/external/foot/right/industrial/New()
 	robotize("Hephaestus Industrial Limb")
 	..()
 
 /obj/item/organ/external/hand/industrial
 	dislocated = -1
+	encased = "support frame"
+
 /obj/item/organ/external/hand/industrial/New()
 	robotize("Hephaestus Industrial Limb")
 	..()
 
 /obj/item/organ/external/hand/right/industrial
 	dislocated = -1
+	encased = "support frame"
+
 /obj/item/organ/external/hand/right/industrial/New()
 	robotize("Hephaestus Industrial Limb")
 	..()
@@ -392,7 +428,7 @@
 	vital = 0
 	max_damage = 50 //made same as arm, since it is not vital
 	min_broken_damage = 30
-	encased = null
+	encased = "support frame"
 	force_skintone = TRUE
 
 /obj/item/organ/external/head/shell/New()
@@ -401,7 +437,7 @@
 
 /obj/item/organ/external/chest/shell
 	dislocated = -1
-	encased = null
+	encased = "support frame"
 	force_skintone = TRUE
 
 
@@ -411,6 +447,7 @@
 
 /obj/item/organ/external/groin/shell
 	dislocated = -1
+	encased = "support frame"
 	force_skintone = TRUE
 
 /obj/item/organ/external/groin/shell/New()
@@ -419,6 +456,7 @@
 
 /obj/item/organ/external/arm/shell
 	dislocated = -1
+	encased = "support frame"
 	force_skintone = TRUE
 
 /obj/item/organ/external/arm/shell/New()
@@ -427,6 +465,7 @@
 
 /obj/item/organ/external/arm/right/shell
 	dislocated = -1
+	encased = "support frame"
 	force_skintone = TRUE
 
 /obj/item/organ/external/arm/right/shell/New()
@@ -435,6 +474,7 @@
 
 /obj/item/organ/external/leg/shell
 	dislocated = -1
+	encased = "support frame"
 	force_skintone = TRUE
 
 /obj/item/organ/external/leg/shell/New()
@@ -443,6 +483,7 @@
 
 /obj/item/organ/external/leg/right/shell
 	dislocated = -1
+	encased = "support frame"
 	force_skintone = TRUE
 
 /obj/item/organ/external/leg/right/shell/New()
@@ -451,6 +492,7 @@
 
 /obj/item/organ/external/foot/shell
 	dislocated = -1
+	encased = "support frame"
 	force_skintone = TRUE
 
 /obj/item/organ/external/foot/shell/New()
@@ -459,6 +501,7 @@
 
 /obj/item/organ/external/foot/right/shell
 	dislocated = -1
+	encased = "support frame"
 	force_skintone = TRUE
 
 /obj/item/organ/external/foot/right/shell/New()
@@ -467,6 +510,7 @@
 
 /obj/item/organ/external/hand/shell
 	dislocated = -1
+	encased = "support frame"
 	force_skintone = TRUE
 
 /obj/item/organ/external/hand/shell/New()
@@ -475,6 +519,7 @@
 
 /obj/item/organ/external/hand/right/shell
 	dislocated = -1
+	encased = "support frame"
 	force_skintone = TRUE
 
 /obj/item/organ/external/hand/right/shell/New()
diff --git a/html/changelogs/Moondancer-PR-2076.yml b/html/changelogs/Moondancer-PR-2076.yml
new file mode 100644
index 00000000000..20ce03e6f79
--- /dev/null
+++ b/html/changelogs/Moondancer-PR-2076.yml
@@ -0,0 +1,5 @@
+author: MoondancerPony
+delete-after: True
+changes: 
+  - bugfix: "Taught roboticists how to properly remove IPC organs."
+  - tweak: "IPC organs are now encased."