Adds Happy carpet

code/datums/supplypacks/materials.dm

@@ -72,8 +72,15 @@
 	containername = "Retro carpets crate"
 	cost = 15
 	contains = list(
+<<<<<<< HEAD
 					/obj/fiftyspawner/decocarpet,
 					/obj/fiftyspawner/retrocarpet
+=======
+					/obj/fiftyspawner/geocarpet,
+					/obj/fiftyspawner/retrocarpet,
+					/obj/fiftyspawner/retrocarpet_red,
+					/obj/fiftyspawner/happycarpet
+>>>>>>> e0ef010384... Merge pull request #13114 from Heroman3003/happycarpet
 					)
 
 /datum/supply_pack/misc/linoleum

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

@@ -36,6 +36,17 @@
 	name = "stack of retro carpet"
 	type_to_spawn = /obj/item/stack/tile/carpet/retro
 
+<<<<<<< HEAD
+=======
+/obj/fiftyspawner/retrocarpet_red
+	name = "stack of red retro carpet"
+	type_to_spawn = /obj/item/stack/tile/carpet/retro_red
+
+/obj/fiftyspawner/happycarpet
+	name = "stack of happy carpet"
+	type_to_spawn = /obj/item/stack/tile/carpet/happy
+
+>>>>>>> e0ef010384... Merge pull request #13114 from Heroman3003/happycarpet
 /obj/fiftyspawner/floor
 	name = "stack of floor tiles"
 	type_to_spawn = /obj/item/stack/tile/floor

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

@@ -119,6 +119,19 @@
 
 /obj/item/stack/tile/carpet/bcarpet //YW EDIT: Commented out to help with upstream merging. Get on this you fucking virgo bois. -yw //CHOMP Comment: Yawn commented out this block, but CHOMP already commented out this stuff so I just removed theirs.
 
+<<<<<<< HEAD
+=======
+/obj/item/stack/tile/carpet/retro_red
+	icon_state = "tile-carpet-retro-red"
+	desc = "A piece of carpet with red-ical space patterns. It is the same size as a normal floor tile!"
+
+/obj/item/stack/tile/carpet/happy
+	icon_state = "tile-carpet-happy"
+	desc = "A piece of carpet with happy patterns. It is the same size as a normal floor tile!"
+
+// TODO - Add descriptions to these
+/obj/item/stack/tile/carpet/bcarpet
+>>>>>>> e0ef010384... Merge pull request #13114 from Heroman3003/happycarpet
 	icon_state = "tile-carpet"
 /obj/item/stack/tile/carpet/blucarpet
 	icon_state = "tile-carpet"

code/game/turfs/flooring/flooring.dm

@@ -344,6 +344,21 @@ var/list/flooring_types
 	build_type = /obj/item/stack/tile/carpet/retro
 	flags = TURF_REMOVE_CROWBAR | TURF_CAN_BURN
 
+<<<<<<< HEAD
+=======
+/decl/flooring/carpet/retro_red
+	name = "red retro carpet"
+	icon_base = "retrocarpet_red"
+	build_type = /obj/item/stack/tile/carpet/retro_red
+	flags = TURF_REMOVE_CROWBAR | TURF_CAN_BURN
+
+/decl/flooring/carpet/happy
+	name = "happy carpet"
+	icon_base = "happycarpet"
+	build_type = /obj/item/stack/tile/carpet/happy
+	flags = TURF_REMOVE_CROWBAR | TURF_CAN_BURN
+
+>>>>>>> e0ef010384... Merge pull request #13114 from Heroman3003/happycarpet
 /decl/flooring/tiling
 	name = "floor"
 	desc = "Scuffed from the passage of countless greyshirts."

code/game/turfs/flooring/flooring_premade.dm

@@ -22,8 +22,13 @@
 /turf/simulated/floor/carpet/deco
 	name = "deco carpet"
 	icon_state = "decocarpet"
+<<<<<<< HEAD
 	initial_flooring = /decl/flooring/carpet/deco
 	
+=======
+	initial_flooring = /decl/flooring/carpet/geo
+
+>>>>>>> e0ef010384... Merge pull request #13114 from Heroman3003/happycarpet
 /turf/simulated/floor/carpet/retro
 	name = "retro carpet"
 	icon_state = "retrocarpet"
@@ -60,6 +65,29 @@
 	icon_state = "oracarpet"
 	initial_flooring = /decl/flooring/carpet/oracarpet
 
+<<<<<<< HEAD
+=======
+/turf/simulated/floor/carpet/geo
+	name = "geometric carpet"
+	icon_state = "geocarpet"
+	initial_flooring = /decl/flooring/carpet/geo
+
+/turf/simulated/floor/carpet/retro
+	name = "blue retro carpet"
+	icon_state = "retrocarpet"
+	initial_flooring = /decl/flooring/carpet/retro
+
+/turf/simulated/floor/carpet/retro_red
+	name = "red retro carpet"
+	icon_state = "retrocarpet_red"
+	initial_flooring = /decl/flooring/carpet/retro_red
+
+/turf/simulated/floor/carpet/happy
+	name = "happy carpet"
+	icon_state = "happycarpet"
+	initial_flooring = /decl/flooring/carpet/happy
+
+>>>>>>> e0ef010384... Merge pull request #13114 from Heroman3003/happycarpet
 /turf/simulated/floor/bluegrid
 	name = "mainframe floor"
 	icon = 'icons/turf/flooring/circuit.dmi'