Merge pull request #16043 from SandPoot/stacks

Make stacks show how much there are in inventory

code/modules/power/cable.dm

@@ -515,7 +515,7 @@ By design, d1 is the smallest direction and d2 is the highest
 	used_skills = list(/datum/skill/level/job/wiring)
 
 /obj/item/stack/cable_coil/cyborg
-	is_cyborg = 1
+	is_cyborg = TRUE
 	custom_materials = null
 	cost = 1
 
@@ -572,7 +572,7 @@ By design, d1 is the smallest direction and d2 is the highest
 		return ..()
 
 
-/obj/item/stack/cable_coil/update_icon()
+/obj/item/stack/cable_coil/update_icon_state()
 	icon_state = "[initial(item_state)][amount < 3 ? amount : ""]"
 	name = "cable [amount < 3 ? "piece" : "coil"]"
 

code/modules/research/xenobiology/crossbreeding/_status_effects.dm

@@ -554,7 +554,7 @@
 
 		if(sheets.len > 0)
 			var/obj/item/stack/sheet/S = pick(sheets)
-			S.amount++
+			S.add(1) // Dare var edit directly again and i'll strangle you.
 			to_chat(owner, "<span class='notice'>[linked_extract] adds a layer of slime to [S], which metamorphosizes into another sheet of material!</span>")
 	return ..()
 

code/modules/unit_tests/merge_type.dm

@@ -9,7 +9,9 @@
 
 	var/list/paths = subtypesof(/obj/item/stack) - blacklist
 
-	for(var/stackpath in paths)
+	for(var/obj/item/stack/stackpath as anything in paths)
+		if(initial(stackpath.is_cyborg))
+			continue
 		var/obj/item/stack/stack = new stackpath
 		if(!stack.merge_type)
 			Fail("([stack]) lacks set merge_type variable!")