diff --git a/code/datums/supplypacks.dm b/code/datums/supplypacks.dm index 5aeb241d26a..68a31f59238 100644 --- a/code/datums/supplypacks.dm +++ b/code/datums/supplypacks.dm @@ -1456,6 +1456,12 @@ GLOBAL_LIST_INIT(all_supply_groups, list(SUPPLY_EMERGENCY,SUPPLY_SECURITY,SUPPLY containertype = /obj/structure/closet/crate/secure containername = "shaft miner starter kit" +/datum/supply_packs/misc/carpet + name = "Carpet Crate" + cost = 20 + contains = list(/obj/item/stack/tile/carpet/twenty) + containername = "carpet crate" + ///////////// Paper Work diff --git a/code/game/objects/items/stacks/tiles/tile_types.dm b/code/game/objects/items/stacks/tiles/tile_types.dm index 720b164e7d6..e0c9f4ee18c 100644 --- a/code/game/objects/items/stacks/tiles/tile_types.dm +++ b/code/game/objects/items/stacks/tiles/tile_types.dm @@ -88,6 +88,70 @@ /obj/item/stack/tile/carpet/black/twenty amount = 20 +/obj/item/stack/tile/carpet/blue + name = "blue carpet" + icon_state = "tile-carpet-blue" + turf_type = /turf/simulated/floor/carpet/blue + +/obj/item/stack/tile/carpet/blue/twenty + amount = 20 + +/obj/item/stack/tile/carpet/cyan + name = "cyan carpet" + icon_state = "tile-carpet-cyan" + turf_type = /turf/simulated/floor/carpet/cyan + +/obj/item/stack/tile/carpet/cyan/twenty + amount = 20 + +/obj/item/stack/tile/carpet/green + name = "green carpet" + icon_state = "tile-carpet-green" + turf_type = /turf/simulated/floor/carpet/green + +/obj/item/stack/tile/carpet/green/twenty + amount = 20 + +/obj/item/stack/tile/carpet/orange + name = "orange carpet" + icon_state = "tile-carpet-orange" + turf_type = /turf/simulated/floor/carpet/orange + +/obj/item/stack/tile/carpet/orange/twenty + amount = 20 + +/obj/item/stack/tile/carpet/purple + name = "purple carpet" + icon_state = "tile-carpet-purple" + turf_type = /turf/simulated/floor/carpet/purple + +/obj/item/stack/tile/carpet/purple/twenty + amount = 20 + +/obj/item/stack/tile/carpet/red + name = "red carpet" + icon_state = "tile-carpet-red" + turf_type = /turf/simulated/floor/carpet/red + +/obj/item/stack/tile/carpet/red/twenty + amount = 20 + +/obj/item/stack/tile/carpet/royalblack + name = "royal black carpet" + icon_state = "tile-carpet-royalblack" + turf_type = /turf/simulated/floor/carpet/royalblack + +/obj/item/stack/tile/carpet/royalblack/twenty + amount = 20 + +/obj/item/stack/tile/carpet/royalblue + name = "royal blue carpet" + icon_state = "tile-carpet-royalblue" + turf_type = /turf/simulated/floor/carpet/royalblue + +/obj/item/stack/tile/carpet/royalblue/twenty + amount = 20 + //Plasteel /obj/item/stack/tile/plasteel name = "floor tiles" diff --git a/code/game/turfs/simulated/floor/fancy_floor.dm b/code/game/turfs/simulated/floor/fancy_floor.dm index 0b8938fc204..86a1e119dad 100644 --- a/code/game/turfs/simulated/floor/fancy_floor.dm +++ b/code/game/turfs/simulated/floor/fancy_floor.dm @@ -68,6 +68,9 @@ playsound(src, 'sound/effects/shovel_dig.ogg', 50, 1) make_plating() + +//Carpets + /turf/simulated/floor/carpet name = "carpet" icon = 'icons/turf/floors/carpet.dmi' @@ -112,6 +115,48 @@ floor_tile = /obj/item/stack/tile/carpet/black canSmoothWith = list(/turf/simulated/floor/carpet/black) +/turf/simulated/floor/carpet/blue + icon = 'icons/turf/floors/carpet_blue.dmi' + floor_tile = /obj/item/stack/tile/carpet/blue + canSmoothWith = list(/turf/simulated/floor/carpet/blue) + +/turf/simulated/floor/carpet/cyan + icon = 'icons/turf/floors/carpet_cyan.dmi' + floor_tile = /obj/item/stack/tile/carpet/cyan + canSmoothWith = list(/turf/simulated/floor/carpet/cyan) + +/turf/simulated/floor/carpet/green + icon = 'icons/turf/floors/carpet_green.dmi' + floor_tile = /obj/item/stack/tile/carpet/green + canSmoothWith = list(/turf/simulated/floor/carpet/green) + +/turf/simulated/floor/carpet/orange + icon = 'icons/turf/floors/carpet_orange.dmi' + floor_tile = /obj/item/stack/tile/carpet/orange + canSmoothWith = list(/turf/simulated/floor/carpet/orange) + +/turf/simulated/floor/carpet/purple + icon = 'icons/turf/floors/carpet_purple.dmi' + floor_tile = /obj/item/stack/tile/carpet/purple + canSmoothWith = list(/turf/simulated/floor/carpet/purple) + +/turf/simulated/floor/carpet/red + icon = 'icons/turf/floors/carpet_red.dmi' + floor_tile = /obj/item/stack/tile/carpet/red + canSmoothWith = list(/turf/simulated/floor/carpet/red) + +/turf/simulated/floor/carpet/royalblack + icon = 'icons/turf/floors/carpet_royalblack.dmi' + floor_tile = /obj/item/stack/tile/carpet/royalblack + canSmoothWith = list(/turf/simulated/floor/carpet/royalblack) + +/turf/simulated/floor/carpet/royalblue + icon = 'icons/turf/floors/carpet_royalblue.dmi' + floor_tile = /obj/item/stack/tile/carpet/royalblue + canSmoothWith = list(/turf/simulated/floor/carpet/royalblue) + +//End of carpets + /turf/simulated/floor/fakespace icon = 'icons/turf/space.dmi' icon_state = "0" diff --git a/code/modules/crafting/recipes.dm b/code/modules/crafting/recipes.dm index 25ac77e90f8..e63e785edbb 100644 --- a/code/modules/crafting/recipes.dm +++ b/code/modules/crafting/recipes.dm @@ -373,7 +373,71 @@ result = list(/obj/item/stack/tile/carpet/black) time = 20 reqs = list(/obj/item/stack/tile/carpet = 1) - pathtools = list(/obj/item/toy/crayon) + pathtools = list(/obj/item/toy/crayon/black) + category = CAT_MISC + +/datum/crafting_recipe/bluecarpet + name = "Black Carpet" + result = list(/obj/item/stack/tile/carpet/blue) + time = 20 + reqs = list(/obj/item/stack/tile/carpet = 1) + pathtools = list(/obj/item/toy/crayon/blue) + category = CAT_MISC + +/datum/crafting_recipe/cyancarpet + name = "Cyan Carpet" + result = list(/obj/item/stack/tile/carpet/blue) + time = 20 + reqs = list(/obj/item/stack/tile/carpet = 1) + pathtools = list(/obj/item/toy/crayon/blue, /obj/item/toy/crayon/green) + category = CAT_MISC + +/datum/crafting_recipe/greencarpet + name = "Green Carpet" + result = list(/obj/item/stack/tile/carpet/green) + time = 20 + reqs = list(/obj/item/stack/tile/carpet = 1) + pathtools = list(/obj/item/toy/crayon/green) + category = CAT_MISC + +/datum/crafting_recipe/orangecarpet + name = "Orange Carpet" + result = list(/obj/item/stack/tile/carpet/orange) + time = 20 + reqs = list(/obj/item/stack/tile/carpet = 1) + pathtools = list(/obj/item/toy/crayon/yellow, /obj/item/toy/crayon/red) + category = CAT_MISC + +/datum/crafting_recipe/purplecarpet + name = "Purple Carpet" + result = list(/obj/item/stack/tile/carpet/purple) + time = 20 + reqs = list(/obj/item/stack/tile/carpet = 1) + pathtools = list(/obj/item/toy/crayon/red, /obj/item/toy/crayon/blue) + category = CAT_MISC + +/datum/crafting_recipe/redcarpet + name = "Red Carpet" + result = list(/obj/item/stack/tile/carpet/purple) + time = 20 + reqs = list(/obj/item/stack/tile/carpet = 1) + pathtools = list(/obj/item/toy/crayon/red) + category = CAT_MISC + +/datum/crafting_recipe/royalblackcarpet + name = "Royal Black Carpet" + result = list(/obj/item/stack/tile/carpet/royalblack = 10) + time = 20 + reqs = list(/obj/item/stack/tile/carpet/black = 10, + /obj/item/stack/sheet/mineral/gold = 2) + category = CAT_MISC + +/datum/crafting_recipe/royalbluecarpet + name = "Royal Blue Carpet" + result = list(/obj/item/stack/tile/carpet/royalblue = 10) + time = 20 + reqs = list(/obj/item/stack/tile/carpet/blue = 10, + /obj/item/stack/sheet/mineral/gold = 2) category = CAT_MISC /datum/crafting_recipe/showercurtain diff --git a/icons/obj/tiles.dmi b/icons/obj/tiles.dmi index 027f074a790..d7712e6ccb9 100644 Binary files a/icons/obj/tiles.dmi and b/icons/obj/tiles.dmi differ diff --git a/icons/turf/floors/carpet_blue.dmi b/icons/turf/floors/carpet_blue.dmi new file mode 100644 index 00000000000..cd3e7f01aa8 Binary files /dev/null and b/icons/turf/floors/carpet_blue.dmi differ diff --git a/icons/turf/floors/carpet_cyan.dmi b/icons/turf/floors/carpet_cyan.dmi new file mode 100644 index 00000000000..a1fbb6f9487 Binary files /dev/null and b/icons/turf/floors/carpet_cyan.dmi differ diff --git a/icons/turf/floors/carpet_green.dmi b/icons/turf/floors/carpet_green.dmi new file mode 100644 index 00000000000..bd945c45e17 Binary files /dev/null and b/icons/turf/floors/carpet_green.dmi differ diff --git a/icons/turf/floors/carpet_orange.dmi b/icons/turf/floors/carpet_orange.dmi new file mode 100644 index 00000000000..316dd135e22 Binary files /dev/null and b/icons/turf/floors/carpet_orange.dmi differ diff --git a/icons/turf/floors/carpet_purple.dmi b/icons/turf/floors/carpet_purple.dmi new file mode 100644 index 00000000000..8cc886139cc Binary files /dev/null and b/icons/turf/floors/carpet_purple.dmi differ diff --git a/icons/turf/floors/carpet_red.dmi b/icons/turf/floors/carpet_red.dmi new file mode 100644 index 00000000000..2327b49a017 Binary files /dev/null and b/icons/turf/floors/carpet_red.dmi differ diff --git a/icons/turf/floors/carpet_royalblack.dmi b/icons/turf/floors/carpet_royalblack.dmi new file mode 100644 index 00000000000..77418dc06f8 Binary files /dev/null and b/icons/turf/floors/carpet_royalblack.dmi differ diff --git a/icons/turf/floors/carpet_royalblue.dmi b/icons/turf/floors/carpet_royalblue.dmi new file mode 100644 index 00000000000..bc2014c9ac6 Binary files /dev/null and b/icons/turf/floors/carpet_royalblue.dmi differ