Merge pull request #4383 from CHOMPStation2/upstream-merge-13114

[MIRROR] Adds Happy carpet

code/datums/supplypacks/materials.dm

@@ -74,7 +74,8 @@
 	contains = list(
 					/obj/fiftyspawner/geocarpet,
 					/obj/fiftyspawner/retrocarpet,
-					/obj/fiftyspawner/retrocarpet_red
+					/obj/fiftyspawner/retrocarpet_red,
+					/obj/fiftyspawner/happycarpet
 					)
 
 /datum/supply_pack/materials/linoleum

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

@@ -40,6 +40,10 @@
 	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
+
 /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

@@ -149,6 +149,10 @@
 	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!"
+
 /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.
 	icon_state = "tile-carpet"
 /obj/item/stack/tile/carpet/blucarpet

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

@@ -114,3 +114,7 @@
 /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!"

code/game/turfs/flooring/flooring.dm

@@ -350,6 +350,12 @@ var/list/flooring_types
 	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
+
 /decl/flooring/tiling
 	name = "floor"
 	desc = "Scuffed from the passage of countless greyshirts."

code/game/turfs/flooring/flooring_premade.dm

@@ -23,7 +23,7 @@
 	name = "deco carpet"
 	icon_state = "decocarpet"
 	initial_flooring = /decl/flooring/carpet/geo
-	
+
 /turf/simulated/floor/carpet/retro
 	name = "retro carpet"
 	icon_state = "retrocarpet"
@@ -75,6 +75,11 @@
 	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
+
 /turf/simulated/floor/bluegrid
 	name = "mainframe floor"
 	icon = 'icons/turf/flooring/circuit.dmi'