Случайно сделал stash, а не stage в прошлом коммите

ss220club · Jan 29, 2024 · b7d6f5f · b7d6f5f
1 parent b848eab
commit b7d6f5f
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 4 deletions.
diff --git a/modular_ss220/objects/_objects.dm b/modular_ss220/objects/_objects.dm
@@ -1,7 +1,7 @@
 /datum/modpack/objects
 	name = "Объекты"
 	desc = "В основном включает в себя портированные объекты и всякие мелочи, которым не нужен отдельный модпак."
-	author = "dj-34"
+	author = "dj-34, The-main-answer-42"
 
 // Maybe it would be better, if i didn't make it modular, because i can't change order in the recipe list :catDespair:
 /datum/modpack/objects/initialize()

diff --git a/modular_ss220/objects/_objects.dme b/modular_ss220/objects/_objects.dme
@@ -24,3 +24,10 @@
 #include "code/musician.dm"
 #include "code/flag.dm"
 #include "code/wallets.dm"
+
+// Tress
+#include "code/trees.dm"
+
+// Effects
+#include "code/effects/blossom.dm"
+#include "code/effects/sakura_leaves.dm"
diff --git a/modular_ss220/flora/code/effects/blossom.dm → ...lar_ss220/objects/code/effects/blossom.dm b/modular_ss220/flora/code/effects/blossom.dm → ...lar_ss220/objects/code/effects/blossom.dm
@@ -1,7 +1,7 @@
 /obj/effect/blossom
 	name = "Цветение сакуры"
 	desc = "Метель из лепестков сакуры"
-	icon = 'modular_ss220/flora/icons/sakura.dmi'
+	icon = 'modular_ss220/objects/icons/sakura.dmi'
 	icon_state = "blossom_less"
 	pixel_y = 10
 	layer = 9.1

diff --git a/...ss220/flora/code/effects/sakura_leaves.dm → ...220/objects/code/effects/sakura_leaves.dm b/...ss220/flora/code/effects/sakura_leaves.dm → ...220/objects/code/effects/sakura_leaves.dm
@@ -3,7 +3,7 @@
 	desc = "Опавшие листья сакуры"
 	density = FALSE
 	layer = TURF_DECAL_LAYER
-	icon = 'modular_ss220/flora/icons/sakura.dmi'
+	icon = 'modular_ss220/objects/icons/sakura.dmi'
 	icon_state = "leaves_on_ground"
 
 // нужен метод, который позволяет поджечь листвую => декаль должен исчезнуть. Это он?

diff --git a/modular_ss220/flora/code/trees.dm → modular_ss220/objects/code/trees.dm b/modular_ss220/flora/code/trees.dm → modular_ss220/objects/code/trees.dm
@@ -1,7 +1,7 @@
 /obj/structure/flora/tree/sakura
 	name = "Сакура"
 	desc = "Зимняя вишня в цвету. Красота!"
-	icon = 'modular_ss220/flora/icons/sakura.dmi'
+	icon = 'modular_ss220/objects/icons/sakura.dmi'
 	icon_state = "cherry_blossom_1"
 	pixel_y = 10
 

diff --git a/modular_ss220/flora/icons/sakura.dmi → modular_ss220/objects/icons/sakura.dmi b/modular_ss220/flora/icons/sakura.dmi → modular_ss220/objects/icons/sakura.dmi