Add: More desert-themed objects and turfs, craftable carpets & fur cl…

…othing

modular_ss220/crafting/_crafting.dm

@@ -0,0 +1,4 @@
+/datum/modpack/crafting
+	name = "Crafting"
+	desc = "Дополняет/изменяет крафт имеющихся вещей из различных материалов."
+	author = "dj-34"

modular_ss220/crafting/_crafting.dme

@@ -0,0 +1,3 @@
+#include "_crafting.dm"
+
+#include "code/crafting.dm"

modular_ss220/crafting/code/crafting.dm

@@ -0,0 +1,25 @@
+// Fur recipes
+/obj/item/stack/sheet/fur/New(loc, amount=null)
+	recipes = GLOB.fur_recipes
+	..()
+
+GLOBAL_LIST_INIT(fur_recipes, list(
+	new /datum/stack_recipe_list("fur clothings", list(
+		new /datum/stack_recipe("fur cap", /obj/item/clothing/head/furcap, 2),
+		new /datum/stack_recipe("fur cape", /obj/item/clothing/suit/furcape, 3),
+		new /datum/stack_recipe("fur coat", /obj/item/clothing/suit/furcoat, 3),
+		new /datum/stack_recipe("fur gloves", /obj/item/clothing/gloves/furgloves, 3),
+		new /datum/stack_recipe("fur boots", /obj/item/clothing/shoes/furboots, 2),
+	)),
+	null,
+	new /datum/stack_recipe_list("fur carpets", list(
+		new /datum/stack_recipe("red carpet", /obj/structure/fluff/carpet, 4),
+		new /datum/stack_recipe("blue carpet", /obj/structure/fluff/carpet/blue, 4),
+		new /datum/stack_recipe("yellow carpet", /obj/structure/fluff/carpet/yellow, 4),
+		new /datum/stack_recipe("green carpet", /obj/structure/fluff/carpet/green, 4),
+		null,
+		new /datum/stack_recipe("small red carpet", /obj/structure/fluff/carpet/small, 3),
+		new /datum/stack_recipe("small yellow carpet", /obj/structure/fluff/carpet/small/yellow, 3),
+		new /datum/stack_recipe("small white carpet", /obj/structure/fluff/carpet/small/white, 3),
+	)),
+))

modular_ss220/maps220/code/RandomRuins/gateway/gateway_turfs.dm

@@ -168,7 +168,7 @@
 /turf/simulated/floor/beach/away/sand_alternative/Initialize(mapload)
 	. = ..()
 	if(prob(15))
-		icon_state = "sand[rand(1,4)]"
+		icon_state = initial(icon_state) + "[rand(1, 4)]"
 
 /turf/simulated/floor/beach/away/sand_alternative/remove_plating(mob/user)
 	return
@@ -179,6 +179,11 @@
 /turf/simulated/floor/beach/away/sand_alternative/try_replace_tile(obj/item/stack/tile/T, mob/user, params)
 	return
 
+/turf/simulated/floor/beach/away/sand_alternative/dark
+	icon_state = "darksand"
+	base_icon_state = "darksand"
+	baseturf = /turf/simulated/floor/beach/away/sand_alternative/dark
+
 /turf/simulated/floor/beach/away/coastline/alternative
 	icon = 'modular_ss220/maps220/icons/floors.dmi'
 	icon_state = "beach"
@@ -284,6 +289,12 @@
 	base_icon_state = "water"
 	water_overlay_image = null
 
+/turf/simulated/floor/beach/away/water/deep/muddy
+	icon = 'modular_ss220/maps220/icons/floors.dmi'
+	icon_state = "water_muddy"
+	base_icon_state = "water_muddy"
+	water_overlay_image = null
+
 /turf/simulated/floor/plating/xen
 	name = "strange weeds"
 	icon = 'modular_ss220/maps220/icons/floors.dmi'
@@ -311,3 +322,39 @@
 	light_color = null
 	light_power = 0
 	light_range = 0 // removing faint glow
+
+// MARK: Miscellaneous
+
+// Withered grounds
+/turf/simulated/floor/plating/asteroid/wasteland
+	name = "dead soil"
+	icon = 'modular_ss220/maps220/icons/floors.dmi'
+	icon_state = "wasteland"
+	environment_type = "wasteland"
+	turf_type = /turf/simulated/floor/plating/asteroid/wasteland
+
+/turf/simulated/floor/plating/asteroid/caverock
+	name = "withered ground"
+	icon = 'modular_ss220/maps220/icons/floors.dmi'
+	icon_state = "caverock0"
+	environment_type = "caverock"
+	turf_type = /turf/simulated/floor/plating/asteroid/caverock
+
+/turf/simulated/floor/plating/asteroid/caverock/Initialize(mapload)
+	. = ..()
+	icon_state = "[environment_type][rand(0, 10)]"
+
+/turf/simulated/floor/plating/asteroid/caverock/alt
+	icon_state = "caverockdeep0"
+	environment_type = "caverockdeep"
+	turf_type = /turf/simulated/floor/plating/asteroid/caverock/alt
+
+// Lava
+/turf/simulated/floor/lava/caverock
+	icon = 'modular_ss220/maps220/icons/lava.dmi'
+	baseturf = /turf/simulated/floor/lava/caverock
+
+// Chasm
+/turf/simulated/floor/chasm/straight_down/caverock
+	icon = 'modular_ss220/maps220/icons/chasm.dmi'
+	baseturf = /turf/simulated/floor/chasm/straight_down/caverock

modular_ss220/modular_ss220.dme

@@ -36,6 +36,7 @@
 #include "silicons/_silicons.dme"
 #include "windows_airbag/_windows_airbag.dme"
 #include "clumsy_table/_clumsy_table.dme"
+#include "crafting/_crafting.dme"
 #include "pt_monitor/_pt_monitor.dme"
 
 // --- MISC --- //

modular_ss220/objects/_objects.dme

@@ -1,6 +1,7 @@
 #include "_objects.dm"
 
 // Flora
+#include "code/flora/desert.dm"
 #include "code/flora/sakura.dm"
 
 // ID Skins
@@ -32,6 +33,7 @@
 #include "code/closets.dm"
 #include "code/coffin.dm"
 #include "code/computer.dm"
+#include "code/decorations.dm"
 #include "code/mattress.dm"
 #include "code/miscellaneous.dm"
 #include "code/officetoys.dm"

modular_ss220/objects/code/decorations.dm

@@ -0,0 +1,78 @@
+// Columns
+/obj/structure/fluff/column
+	name = "column"
+	desc = "Очень старая, массивная колонна."
+	icon = 'modular_ss220/objects/icons/columns.dmi'
+	icon_state = "column1"
+	layer = ABOVE_ALL_MOB_LAYER
+	deconstructible = FALSE
+	density = TRUE
+
+/obj/structure/fluff/column/Initialize(mapload)
+	. = ..()
+	AddComponent(/datum/component/largetransparency)
+
+// Large remains
+/obj/structure/fluff/remains_large
+	name = "large remains"
+	desc = "Белеющие на солнце кости местной фауны."
+	icon = 'modular_ss220/objects/icons/remains_large.dmi'
+	icon_state = "rib"
+	layer = ABOVE_ALL_MOB_LAYER
+	deconstructible = FALSE
+	density = TRUE
+
+/obj/structure/fluff/remains_large/Initialize(mapload)
+	. = ..()
+	AddComponent(/datum/component/largetransparency)
+
+// Carpets
+/obj/structure/fluff/carpet
+	name = "red carpet"
+	desc = "Шерстяной ковер, украшенный различными узорами."
+	icon = 'modular_ss220/objects/icons/carpets.dmi'
+	icon_state = "carpet1"
+	max_integrity = 50
+	layer = LOW_OBJ_LAYER
+	anchored = FALSE
+	deconstructible = FALSE
+
+/obj/structure/fluff/carpet/AltClick(mob/user)
+	. = ..()
+	if(user.incapacitated())
+		to_chat(user, span_warning("You can't do that right now!"))
+		return
+	if(!Adjacent(user))
+		return
+	if(anchored)
+		to_chat(user, span_warning("[src] is anchored to the floor!"))
+		return
+	user.changeNext_move(CLICK_CD_MELEE)
+	setDir(turn(dir, 90))
+
+/obj/structure/fluff/carpet/blue
+	name = "blue carpet"
+	icon_state = "carpet2"
+
+/obj/structure/fluff/carpet/yellow
+	name = "yellow carpet"
+	icon_state = "carpet3"
+
+/obj/structure/fluff/carpet/green
+	name = "green carpet"
+	icon_state = "carpet4"
+
+// Carpets small
+/obj/structure/fluff/carpet/small
+	name = "small red carpet"
+	desc = "Небольшой ковер, украшенный различными узорами."
+	icon = 'modular_ss220/objects/icons/carpets_small.dmi'
+	icon_state = "carpet_small1"
+
+/obj/structure/fluff/carpet/small/yellow
+	name = "small yellow carpet"
+	icon_state = "carpet_small2"
+
+/obj/structure/fluff/carpet/small/white
+	name = "small white carpet"
+	icon_state = "carpet_small3"

modular_ss220/objects/code/flora/desert.dm

@@ -0,0 +1,75 @@
+// MARK: Trees
+/obj/structure/flora/tree/desert/joshua
+	name = "yucca palm"
+	icon = 'modular_ss220/objects/icons/flora/desert_tree.dmi'
+	icon_state = "joshua1"
+
+/obj/structure/flora/tree/desert/joshua/Initialize(mapload)
+	. = ..()
+	icon_state = "joshua[rand(1, 8)]"
+
+/obj/structure/flora/tree/desert/dead
+	name = "dead tree"
+	icon = 'modular_ss220/objects/icons/flora/desert_tree.dmi'
+	icon_state = "dead1"
+
+/obj/structure/flora/tree/desert/dead/Initialize(mapload)
+	. = ..()
+	icon_state = "dead[rand(1, 6)]"
+
+/obj/structure/flora/tree/desert/big
+	name = "long dead tree"
+	icon = 'modular_ss220/objects/icons/flora/desert_tree_big.dmi'
+	icon_state = "dead_tree1"
+
+/obj/structure/flora/tree/desert/big/Initialize(mapload)
+	. = ..()
+	icon_state = "dead_tree[rand(1, 4)]"
+
+/obj/structure/flora/tree/desert/medpine
+	icon = 'modular_ss220/objects/icons/flora/desert_tree.dmi'
+	icon_state = "medpine"
+
+/obj/structure/flora/tree/desert/african
+	icon = 'modular_ss220/objects/icons/flora/desert_tree.dmi'
+	icon_state = "african"
+
+// MARK: Cactuses
+/obj/structure/flora/tree/cactus
+	name = "cactus"
+	icon = 'modular_ss220/objects/icons/flora/cactus.dmi'
+	icon_state = "cactus1"
+	pixel_x = 0
+
+/obj/structure/flora/tree/cactus/Initialize(mapload)
+	. = ..()
+	icon_state = "cactus[rand(1, 2)]"
+	pixel_x = rand(-5, 5)
+	pixel_y = rand(-5, 5)
+
+/obj/structure/flora/tree/cactus/little
+	icon_state = "little_cactus1"
+	density = FALSE
+	layer = BELOW_OBJ_LAYER
+
+/obj/structure/flora/tree/cactus/little/Initialize(mapload)
+	. = ..()
+	icon_state = "little_cactus[rand(1, 6)]"
+
+/obj/structure/flora/tree/cactus/circle
+	icon_state = "circle_cactus1"
+	density = FALSE
+	layer = BELOW_OBJ_LAYER
+
+/obj/structure/flora/tree/cactus/circle/Initialize(mapload)
+	. = ..()
+	icon_state = "circle_cactus[rand(1, 6)]"
+
+/obj/structure/flora/tree/cactus/flat
+	icon_state = "flat_cactus1"
+	density = FALSE
+	layer = BELOW_OBJ_LAYER
+
+/obj/structure/flora/tree/cactus/flat/Initialize(mapload)
+	. = ..()
+	icon_state = "flat_cactus[rand(1, 3)]"

modular_ss220/objects/code/miscellaneous.dm

@@ -2,6 +2,15 @@
 * Use that for creating non-varedited objects,
 * or that you don't want to specify because they're insignificant for personal DM file
 */
+// Mine
+/obj/effect/mine/explosive/desert
+	icon = 'modular_ss220/objects/icons/mine.dmi'
+	icon_state = "desertminearmed"
+	range_heavy = 1
+	range_light = 3
+	range_flash = 4
+	layer = LOW_OBJ_LAYER
+
 // Fountain
 /obj/structure/statue/fountain
 	name = "фонтан"