Merge pull request #471 from MrCat15352/new_ficha

Add: add logo. Fix: floor painter

code/game/objects/items/decal_painter.dm

@@ -17,15 +17,29 @@
 
 	var/list/allowed_directions = list("south")
 
+	// [CELADON-EDIT] - CELADON_STRUCTURES
+	// var/static/list/allowed_states = list(
+	// 	"steel", "dark", "white", "freezer", "tile_full", "cargo_one_full",
+	// 	"kafel_full", "monotile", "grid", "ridged", "stairs",
+	// 	"stairs-l", "stairs-m", "stairs-r", "stairs-old", "stairs-t", "stairs-b"
+	// ) // CELADON-EDIT - ORIGINAL
 	var/static/list/allowed_states = list(
-		"steel", "dark", "white", "freezer", "tile_full", "cargo_one_full",
-		"kafel_full", "monotile", "grid", "ridged", "stairs",
-		"stairs-l", "stairs-m", "stairs-r", "stairs-old", "stairs-t", "stairs-b"
+		"tiled_gray", "tiled_dark", "tiled_light", "freezerfloor", "tile_full",
+		"cult", "cargo_one_full", "kafel_full", "monotile_gray", "monotile_dark",
+		"monotile_light", "grid", "techmaint", "techfloor", "techfloor_grid",
+		"ridged", "stairs", "stairs-l", "stairs-m", "stairs-r", "stairs-old",
+		"stairs-t", "stairs-b", "vault", "hydrofloor", "showroomfloor",
+		"elevatorshaft", "sandstonevault", "alienvault", "concrete", "hexacrete",
+		"hexacrete_dark", "plaque", "tcomms", "titanium", "titanium_blue",
+		"titanium_yellow", "titanium_white", "plastitanium", "plastitanium_red",
+		"titanium_tiled", "titanium_tiled_blue", "titanium_tiled_yellow",
+		"titanium_tiled_white", "titanium_tiled_purple"
 	)
+	// [/CELADON-EDIT]
 
 	var/static/list/floor_four_dirs = list(
 		"stairs","stairs-l", "stairs-m", "stairs-r",
-		"stairs-old", "stairs-t", "stairs-b"
+		"stairs-old", "stairs-t", "stairs-b", "vault"
 	)
 
 /obj/item/floor_painter/afterattack(atom/A, mob/user, proximity, params)
@@ -51,7 +65,10 @@
 
 /obj/item/floor_painter/interact(mob/user as mob) //TODO: Make TGUI for this because ouch
 	if(!floor_icon)
-		floor_icon = icon('icons/turf/floors/tiles.dmi', floor_state, floor_dir)
+		// [CELADON-EDIT] - CELADON_STRUCTURES
+		// floor_icon = icon('icons/turf/floors/tiles.dmi', floor_state, floor_dir) // CELADON-EDIT - ORIGINAL
+		floor_icon = icon('mod_celadon/structures/icons/tiles.dmi', floor_state, floor_dir)
+		// [/CELADON-EDIT]
 	user << browse_rsc(floor_icon, "floor.png")
 	var/dat = {"
 		<center>
@@ -115,7 +132,10 @@
 		floor_state = allowed_states[index]
 		check_directional_tile()
 
-	floor_icon = icon('icons/turf/floors/tiles.dmi', floor_state, floor_dir)
+	// [CELADON-EDIT] - CELADON_STRUCTURES
+	// floor_icon = icon('icons/turf/floors/tiles.dmi', floor_state, floor_dir) // CELADON-EDIT - ORIGINAL
+	floor_icon = icon('mod_celadon/structures/icons/tiles.dmi', floor_state, floor_dir)
+	// [/CELADON-EDIT]
 	if(usr)
 		attack_self(usr)
 

code/game/turfs/open/floor/plasteel_floor.dm

@@ -1,5 +1,8 @@
 /turf/open/floor/plasteel
-	icon = 'icons/turf/floors/tiles.dmi'
+	// [CELADON-EDIT] - CELADON_STRUCTURES
+	// icon = 'icons/turf/floors/tiles.dmi' // CELADON-EDIT - ORIGINAL
+	icon = 'mod_celadon/structures/icons/tiles.dmi'
+	// [/CELADON-EDIT]
 	base_icon_state = "tiled_gray"
 	icon_state = "tiled_gray"
 	floor_tile = /obj/item/stack/tile/plasteel

mod_celadon/structures/README.md

@@ -22,6 +22,7 @@ ID мода: CELADON_STRUCTURES
 
 Этот мод добавляет новые объекты для карт, а именно: 
 Сам объект статуи Копо -> `code\game\objects\structures\statues.dm` и его иконка "masson_kills" в файле `statue.dmi`
+Логотипы Целадон и Элизиум как turf -> `mod_celadon\structures\code\logo.dm`
 
 <!--
   Что он делает, что добавляет: что, куда, зачем и почему - всё здесь.
@@ -30,7 +31,8 @@ ID мода: CELADON_STRUCTURES
 
 ### Изменения *кор кода*
 
-- Отсутствуют
+- EDIT: `code\game\objects\items\decal_painter.dm`: `/obj/item/floor_painter`, `/obj/item/floor_painter/interact`
+- EDIT: `code\game\turfs\open\floor\plasteel_floor.dm`: `/turf/open/floor/plasteel`: `icon`
 <!--
   Если вы редактировали какие-либо процедуры или переменные в кор коде,
   они должны быть указаны здесь.
@@ -72,7 +74,7 @@ ID мода: CELADON_STRUCTURES
 
 ### Авторы:
 
-Maybe-Anton
+Maybe-Anton, MrCat15352
 <!--
   Здесь находится твой никнейм
   Если работал совместно - никнеймы тех, кто помогал.

mod_celadon/structures/_structures.dm

@@ -1,4 +1,4 @@
 /datum/modpack/structures
 	name = "Structures (Структуры)"
-	desc = "Добавляет статую Копо (находится на зимнем Аванпосту)."
-	author = "Maybe-Anton"
+	desc = "Добавляет статую Копо (находится на зимнем Аванпосту), логотип Элизиума и Целадон."
+	author = "Maybe-Anton, MrCat15352"

mod_celadon/structures/_structures.dme

@@ -4,5 +4,6 @@
 #include "_structures.dm"
 
 #include "code/structures.dm"
+#include "code/logo.dm"
 
 #endif

mod_celadon/structures/code/logo.dm

@@ -0,0 +1,64 @@
+/obj/effect/turf_decal/elysium_logo
+	icon = 'mod_celadon/structures/icons/elysium_logo.dmi'
+	name = "elysium logo"
+	icon_state = "22"
+
+/obj/effect/turf_decal/elysium_logo/one_one
+	icon_state = "11"
+
+/obj/effect/turf_decal/elysium_logo/one_two
+	icon_state = "12"
+
+/obj/effect/turf_decal/elysium_logo/one_three
+	icon_state = "13"
+
+/obj/effect/turf_decal/elysium_logo/two_one
+	icon_state = "21"
+
+/obj/effect/turf_decal/elysium_logo/two_two
+	icon_state = "22"
+
+/obj/effect/turf_decal/elysium_logo/two_three
+	icon_state = "23"
+
+/obj/effect/turf_decal/elysium_logo/three_one
+	icon_state = "31"
+
+/obj/effect/turf_decal/elysium_logo/three_two
+	icon_state = "32"
+
+/obj/effect/turf_decal/elysium_logo/three_three
+	icon_state = "33"
+
+//Logo Celadon
+/obj/effect/turf_decal/celadon_logo
+	icon = 'mod_celadon/structures/icons/celadon_logo.dmi'
+	name = "celadon logo"
+	icon_state = "22"
+
+/obj/effect/turf_decal/celadon_logo/one_one
+	icon_state = "11"
+
+/obj/effect/turf_decal/celadon_logo/one_two
+	icon_state = "12"
+
+/obj/effect/turf_decal/celadon_logo/one_three
+	icon_state = "13"
+
+/obj/effect/turf_decal/celadon_logo/two_one
+	icon_state = "21"
+
+/obj/effect/turf_decal/celadon_logo/two_two
+	icon_state = "22"
+
+/obj/effect/turf_decal/celadon_logo/two_three
+	icon_state = "23"
+
+/obj/effect/turf_decal/celadon_logo/three_one
+	icon_state = "31"
+
+/obj/effect/turf_decal/celadon_logo/three_two
+	icon_state = "32"
+
+/obj/effect/turf_decal/celadon_logo/three_three
+	icon_state = "33"

mod_celadon/structures/code/structures.dm

@@ -1,5 +1,5 @@
 /obj/structure/statue/bronze/masson_kills		// Origin -> code\game\objects\structures\statues.dm
 	name = "Masson Kill's"
 	desc = "Статуя самого лучшего администратора что вы можете встретить в новогоднюю ночь. Его мешок полон подарков. Надеюсь, ты вел себя хорошо?"
-	icon = 'mod_celadon/structures/icon/statue.dmi'
+	icon = 'mod_celadon/structures/icons/statue.dmi'
 	icon_state = "masson_kills"