Merge pull request #843 from lukevale/Carpet

Adds in the other carpet types as a buyable crate.

README.md

@@ -95,4 +95,4 @@ For a basic setup, simply copy every file from config/example to config.
 
 ### SQL Setup
 
-The SQL backend for the library and stats tracking requires a MySQL server.  Your server details go in /config/dbconfig.txt, and the SQL schema is in /SQL/tgstation_schema.sql.  More detailed setup instructions arecoming soon, for now ask in our Discord.
+The SQL backend for the library and stats tracking requires a MySQL server.  Your server details go in /config/dbconfig.txt, and the SQL schema is in /SQL/tgstation_schema.sql.  More detailed setup instructions arecoming soon, for now ask in our Discord.

code/datums/supplypacks/materials_yw.dm

@@ -0,0 +1,14 @@
+/datum/supply_pack/materials/carpet_fancy
+	name = "Fancy Imported carpet"
+	containertype = /obj/structure/closet/crate
+	containername = "Fancy Imported carpet crate"
+	cost = 50
+	contains = list(
+					/obj/fiftyspawner/bcarpet,
+					/obj/fiftyspawner/blucarpet,
+					/obj/fiftyspawner/turcarpet,
+					/obj/fiftyspawner/sblucarpet,
+					/obj/fiftyspawner/gaycarpet,
+					/obj/fiftyspawner/purcarpet,
+					/obj/fiftyspawner/oracarpet
+					) //REEE

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

@@ -0,0 +1,27 @@
+/obj/fiftyspawner/bcarpet
+	name = "stack of black carpet"
+	type_to_spawn = /obj/item/stack/tile/carpet/bcarpet
+
+/obj/fiftyspawner/blucarpet
+	name = "stack of blue carpet"
+	type_to_spawn = /obj/item/stack/tile/carpet/blucarpet
+
+/obj/fiftyspawner/turcarpet
+	name = "stack of tue carpet"
+	type_to_spawn = /obj/item/stack/tile/carpet/turcarpet
+
+/obj/fiftyspawner/sblucarpet
+	name = "stack of silver blue carpet"
+	type_to_spawn = /obj/item/stack/tile/carpet/sblucarpet
+
+/obj/fiftyspawner/gaycarpet
+	name = "stack of clown carpet"
+	type_to_spawn = /obj/item/stack/tile/carpet/gaycarpet
+
+/obj/fiftyspawner/purcarpet
+	name = "stack of purple carpet"
+	type_to_spawn = /obj/item/stack/tile/carpet/purcarpet
+
+/obj/fiftyspawner/oracarpet
+	name = "stack of orange carpet"
+	type_to_spawn = /obj/item/stack/tile/carpet/oracarpet

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

@@ -92,7 +92,8 @@
 	icon_state = "tile-tealcarpet"
 	no_variants = FALSE
 
-/obj/item/stack/tile/carpet/bcarpet
+/*/obj/item/stack/tile/carpet/bcarpet //YW EDIT: Commented out to help with upstream merging. Get on this you fucking virgo bois. -yw
+
 	icon_state = "tile-carpet"
 /obj/item/stack/tile/carpet/blucarpet
 	icon_state = "tile-carpet"
@@ -105,7 +106,7 @@
 /obj/item/stack/tile/carpet/purcarpet
 	icon_state = "tile-carpet"
 /obj/item/stack/tile/carpet/oracarpet
-	icon_state = "tile-carpet"
+	icon_state = "tile-carpet"*/
 
 /obj/item/stack/tile/floor
 	name = "floor tile"
@@ -238,4 +239,4 @@
 	uses_charge = 1
 	charge_costs = list(250)
 	stacktype = /obj/item/stack/tile/roofing
-	build_type = /obj/item/stack/tile/roofing
+	build_type = /obj/item/stack/tile/roofing

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

@@ -0,0 +1,21 @@
+/obj/item/stack/tile/carpet/bcarpet
+	name = "black carpet"
+	icon_state = "tile-carpet"
+/obj/item/stack/tile/carpet/blucarpet
+	name = "blue carpet"
+	icon_state = "tile-carpet"
+/obj/item/stack/tile/carpet/turcarpet
+	name = "tur carpet"
+	icon_state = "tile-carpet"
+/obj/item/stack/tile/carpet/sblucarpet
+	name = "silver blue carpet"
+	icon_state = "tile-carpet"
+/obj/item/stack/tile/carpet/gaycarpet
+	name = "Clown Carpet"
+	icon_state = "tile-carpet"
+/obj/item/stack/tile/carpet/purcarpet
+	name = "purple carpet"
+	icon_state = "tile-carpet"
+/obj/item/stack/tile/carpet/oracarpet
+	name = "orange carpet"
+	icon_state = "tile-carpet"

vorestation.dme

@@ -416,6 +416,7 @@
 #include "code\datums\supplypacks\hydroponics.dm"
 #include "code\datums\supplypacks\hydroponics_vr.dm"
 #include "code\datums\supplypacks\materials.dm"
+#include "code\datums\supplypacks\materials_yw.dm"
 #include "code\datums\supplypacks\medical.dm"
 #include "code\datums\supplypacks\medical_vr.dm"
 #include "code\datums\supplypacks\misc.dm"
@@ -1201,7 +1202,9 @@
 #include "code\game\objects\items\stacks\telecrystal.dm"
 #include "code\game\objects\items\stacks\sheets\leather.dm"
 #include "code\game\objects\items\stacks\tiles\fifty_spawner_tiles.dm"
+#include "code\game\objects\items\stacks\tiles\fifty_spawner_tiles_yw.dm"
 #include "code\game\objects\items\stacks\tiles\tile_types.dm"
+#include "code\game\objects\items\stacks\tiles\tile_types_yw.dm"
 #include "code\game\objects\items\weapons\AI_modules.dm"
 #include "code\game\objects\items\weapons\autopsy.dm"
 #include "code\game\objects\items\weapons\bones.dm"