Merge pull request #4616 from MistakeNot4892/feature/rug

Adding a small circular rug.
NebulaSS13 · Dec 9, 2024 · bc40151 · bc40151
2 parents 95774f3 + dc46237
commit bc40151
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 5 deletions.
diff --git a/code/game/objects/structures/rug.dm b/code/game/objects/structures/rug.dm
@@ -0,0 +1,12 @@
+/obj/structure/rug
+	name        = "rug"
+	desc        = "A small, circular floor covering."
+	icon        = 'icons/obj/structures/rug.dmi'
+	material    = /decl/material/solid/organic/cloth/wool
+	icon_state  = ICON_STATE_WORLD
+	paint_color = COLOR_GRAY20
+	color       = COLOR_GRAY20
+
+/obj/structure/rug/crafted
+	paint_color = null
+	color       = null
diff --git a/code/modules/crafting/stack_recipes/recipes_grass.dm b/code/modules/crafting/stack_recipes/recipes_grass.dm
@@ -8,6 +8,12 @@
 		return FALSE
 	return ..()
 
+/decl/stack_recipe/woven/rug
+	result_type                = /obj/structure/rug/crafted
+	one_per_turf               = TRUE
+	on_floor                   = TRUE
+	category                   = "furniture"
+
 /decl/stack_recipe/woven/basket
 	result_type       = /obj/item/basket
 

diff --git a/code/modules/crafting/stack_recipes/recipes_textiles.dm b/code/modules/crafting/stack_recipes/recipes_textiles.dm
@@ -7,9 +7,15 @@
 	crafting_extra_cost_factor = 1.5 // measure twice, cut once; material is lost. todo: produce scraps?
 	abstract_type              = /decl/stack_recipe/textiles
 
+/decl/stack_recipe/textiles/rug
+	result_type                = /obj/structure/rug/crafted
+	one_per_turf               = TRUE
+	on_floor                   = TRUE
+	category                   = "furniture"
+
 /decl/stack_recipe/textiles/cloak
-	result_type           = /obj/item/clothing/suit/cloak/hide
-	category              = "clothing"
+	result_type                = /obj/item/clothing/suit/cloak/hide
+	category                   = "clothing"
 
 /decl/stack_recipe/textiles/banner
 	name                       = "banner"
@@ -60,9 +66,9 @@
 	category              = "clothing"
 
 /decl/stack_recipe/textiles/leather/bedroll
-	result_type = /obj/item/bedroll
-	difficulty  = MAT_VALUE_NORMAL_DIY // Slightly easier than making clothing.
-	category    = "bedding"
+	result_type           = /obj/item/bedroll
+	difficulty            = MAT_VALUE_NORMAL_DIY // Slightly easier than making clothing.
+	category              = "bedding"
 
 /decl/stack_recipe/textiles/leather/shoes
 	result_type           = /obj/item/clothing/shoes/craftable

diff --git a/icons/obj/structures/rug.dmi b/icons/obj/structures/rug.dmi
diff --git a/nebula.dme b/nebula.dme
@@ -1480,6 +1480,7 @@
 #include "code\game\objects\structures\racks.dm"
 #include "code\game\objects\structures\railing.dm"
 #include "code\game\objects\structures\rubble.dm"
+#include "code\game\objects\structures\rug.dm"
 #include "code\game\objects\structures\safe.dm"
 #include "code\game\objects\structures\seaweed.dm"
 #include "code\game\objects\structures\showcase.dm"