innitial commit (#1872)

code/game/objects/items/stacks/tiles/tile_types.dm

@@ -1030,6 +1030,13 @@
 	inhand_icon_state = "tile-bcircuit"
 	turf_type = /turf/open/floor/circuit
 	merge_type = /obj/item/stack/tile/circuit
+	// Monkestation Addition Start: They stack, this is better imo than adding a new subtype and leaving this base as unused
+	tile_reskin_types = list(
+		/obj/item/stack/tile/circuit,
+		/obj/item/stack/tile/circuit/green,
+		/obj/item/stack/tile/circuit/red,
+	)
+	// End Monkestation Addition
 
 /obj/item/stack/tile/circuit/green
 	name = "green circuit tile"
@@ -1038,7 +1045,7 @@
 	icon_state = "tile_gcircuit"
 	inhand_icon_state = "tile-gcircuit"
 	turf_type = /turf/open/floor/circuit/green
-	merge_type = /obj/item/stack/tile/circuit/green
+	//merge_type = /obj/item/stack/tile/circuit/green Monkestation Edit: merges with all circuit floors
 
 /obj/item/stack/tile/circuit/green/anim
 	turf_type = /turf/open/floor/circuit/green/anim
@@ -1051,7 +1058,7 @@
 	icon_state = "tile_rcircuit"
 	inhand_icon_state = "tile-rcircuit"
 	turf_type = /turf/open/floor/circuit/red
-	merge_type = /obj/item/stack/tile/circuit/red
+	//merge_type = /obj/item/stack/tile/circuit/red Monkestation Edit: merges with all circuit floors
 
 /obj/item/stack/tile/circuit/red/anim
 	turf_type = /turf/open/floor/circuit/red/anim

monkestation/code/game/turfs/open/floor/misc_floor.dm

@@ -1,3 +1,11 @@
+/turf/open/floor/circuit/green/anim/update_icon_state()
+	icon = on ? 'icons/turf/floors.dmi' : 'monkestation/icons/turf/floors.dmi'
+	return ..()
+
+/turf/open/floor/circuit/red/anim/update_icon_state()
+	icon = on ? 'icons/turf/floors.dmi' : 'monkestation/icons/turf/floors.dmi'
+	return ..()
+
 /obj/item/stack/tile/sandy_dirt
 	name = "sandy dirt tiles"
 	singular_name = "sandy dirt tile"