From 65fc980b202f50913b17a6d6f0d1880c13ee230a Mon Sep 17 00:00:00 2001
From: PsiOmegaDelta <git@psiomega.se>
Date: Thu, 4 Jun 2015 13:24:12 +0200
Subject: [PATCH 1/2] Stack splitting and cable merging fixes.

Split stacks will now keep the same colors.
Can now only join cables of the same color together, unless you are a borg.
---
 code/game/objects/items/stacks/stack.dm |  1 +
 code/modules/power/cable.dm             | 11 +++++++++++
 2 files changed, 12 insertions(+)

diff --git a/code/game/objects/items/stacks/stack.dm b/code/game/objects/items/stacks/stack.dm
index ab1f767a429..798b93955e5 100644
--- a/code/game/objects/items/stacks/stack.dm
+++ b/code/game/objects/items/stacks/stack.dm
@@ -252,6 +252,7 @@
 	var/orig_amount = src.amount
 	if (transfer && src.use(transfer))
 		var/obj/item/stack/newstack = new src.type(loc, transfer)
+		newstack.color = color
 		if (prob(transfer/orig_amount * 100))
 			transfer_fingerprints_to(newstack)
 			if(blood_DNA)
diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm
index d73d60926e5..3058dc0696a 100644
--- a/code/modules/power/cable.dm
+++ b/code/modules/power/cable.dm
@@ -613,6 +613,12 @@ obj/structure/cable/proc/cableColor(var/colorC)
 // Items usable on a cable coil :
 //   - Wirecutters : cut them duh !
 //   - Cable coil : merge cables
+/obj/item/stack/cable_coil/proc/can_merge(var/obj/item/stack/cable_coil/C)
+	return color == C.color
+
+/obj/item/stack/cable_coil/cyborg/can_merge()
+	return 1
+
 /obj/item/stack/cable_coil/attackby(obj/item/weapon/W, mob/user)
 	..()
 	if( istype(W, /obj/item/weapon/wirecutters) && src.get_amount() > 1)
@@ -623,6 +629,11 @@ obj/structure/cable/proc/cableColor(var/colorC)
 		return
 	else if(istype(W, /obj/item/stack/cable_coil))
 		var/obj/item/stack/cable_coil/C = W
+
+		if(!can_merge(C))
+			user << "These coils do not go together."
+			return
+
 		if(C.get_amount() >= get_max_amount())
 			user << "The coil is too long, you cannot add any more cable to it."
 			return

From 6aaacd6063ac70e51de66cec0997963f78bac2fb Mon Sep 17 00:00:00 2001
From: PsiOmegaDelta <git@psiomega.se>
Date: Thu, 4 Jun 2015 13:27:44 +0200
Subject: [PATCH 2/2] Changelog entry.

---
 html/changelogs/PsiOmegaDelta-StackFixes.yml | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 html/changelogs/PsiOmegaDelta-StackFixes.yml

diff --git a/html/changelogs/PsiOmegaDelta-StackFixes.yml b/html/changelogs/PsiOmegaDelta-StackFixes.yml
new file mode 100644
index 00000000000..a21e4c610bf
--- /dev/null
+++ b/html/changelogs/PsiOmegaDelta-StackFixes.yml
@@ -0,0 +1,6 @@
+author: PsiOmegaDelta
+delete-after: True
+
+changes: 
+  - bugfix: "Split stacks no longer lose their coloring."
+  - tweak: "Can no longer merge cables of different colors."