New clothing - Carnival

code/datums/greyscale/json_configs/bandastation/mask_carnival_colored.json

@@ -0,0 +1,16 @@
+{
+	"colored": [
+		{
+			"type": "icon_state",
+			"icon_state": "colored_r",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
+		},
+		{
+			"type": "icon_state",
+			"icon_state": "colored_l",
+			"blend_mode": "overlay",
+			"color_ids": [ 2 ]
+		}
+	]
+}

code/datums/greyscale/json_configs/bandastation/mask_carnival_feather.json

@@ -0,0 +1,22 @@
+{
+	"feather": [
+		{
+			"type": "icon_state",
+			"icon_state": "feather_f",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
+		},
+		{
+			"type": "icon_state",
+			"icon_state": "feather_m",
+			"blend_mode": "overlay",
+			"color_ids": [ 2 ]
+		},
+		{
+			"type": "icon_state",
+			"icon_state": "feather_eyes",
+			"blend_mode": "overlay",
+			"color_ids": [ 3 ]
+		}
+	]
+}

code/datums/greyscale/json_configs/bandastation/mask_carnival_half.json

@@ -0,0 +1,16 @@
+{
+	"half": [
+		{
+			"type": "icon_state",
+			"icon_state": "half_m",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
+		},
+		{
+			"type": "icon_state",
+			"icon_state": "half_eyes",
+			"blend_mode": "overlay",
+			"color_ids": [ 2 ]
+		}
+	]
+}

code/datums/greyscale/json_configs/bandastation/mask_carnival_triangles.json

@@ -0,0 +1,22 @@
+{
+	"triangles": [
+		{
+			"type": "icon_state",
+			"icon_state": "triangles_m",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
+		},
+		{
+			"type": "icon_state",
+			"icon_state": "triangles_eyes",
+			"blend_mode": "overlay",
+			"color_ids": [ 2 ]
+		},
+		{
+			"type": "icon_state",
+			"icon_state": "triangles_tr",
+			"blend_mode": "overlay",
+			"color_ids": [ 3 ]
+		}
+	]
+}

code/datums/greyscale/json_configs/bandastation/under_carnival_dress_corset.json

@@ -0,0 +1,16 @@
+{
+	"dress_corset": [
+		{
+			"type": "icon_state",
+			"icon_state": "dress_corset_bottom",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
+		},
+		{
+			"type": "icon_state",
+			"icon_state": "dress_corset_top",
+			"blend_mode": "overlay",
+			"color_ids": [ 2 ]
+		}
+	]
+}

code/datums/greyscale/json_configs/bandastation/under_carnival_dress_fancy.json

@@ -0,0 +1,22 @@
+{
+	"dress_fancy": [
+		{
+			"type": "icon_state",
+			"icon_state": "dress_fancy_general",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
+		},
+		{
+			"type": "icon_state",
+			"icon_state": "dress_fancy_sides",
+			"blend_mode": "overlay",
+			"color_ids": [ 2 ]
+		},
+		{
+			"type": "icon_state",
+			"icon_state": "dress_fancy_blouse",
+			"blend_mode": "overlay",
+			"color_ids": [ 3 ]
+		}
+	]
+}

code/datums/greyscale/json_configs/bandastation/under_carnival_formal.json

@@ -0,0 +1,16 @@
+{
+	"formal": [
+		{
+			"type": "icon_state",
+			"icon_state": "formal_bottom",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
+		},
+		{
+			"type": "icon_state",
+			"icon_state": "formal_top",
+			"blend_mode": "overlay",
+			"color_ids": [ 2 ]
+		}
+	]
+}

code/datums/greyscale/json_configs/bandastation/under_carnival_jacket.json

@@ -0,0 +1,21 @@
+{
+	"jacket": [
+		{
+			"type": "icon_state",
+			"icon_state": "jacket_general",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
+		},
+		{
+			"type": "icon_state",
+			"icon_state": "jacket_shirt",
+			"blend_mode": "overlay",
+			"color_ids": [ 2 ]
+		},
+		{
+			"type": "icon_state",
+			"icon_state": "jacket_accent",
+			"blend_mode": "overlay"
+		}
+	]
+}

modular_bandastation/objects/_objects.dm

@@ -2,3 +2,26 @@
 	name = "Объекты"
 	desc = "В основном включает в себя портированные объекты и всякие мелочи, которым не нужен отдельный модпак."
 	author = "dj-34, Chorden"
+
+/datum/modpack/objects/initialize()
+	. = ..()
+	GLOB.autodrobe_fancy_items += list(
+		/obj/item/clothing/under/carnival/formal = 2,
+		/obj/item/clothing/under/carnival/jacket = 2,
+		/obj/item/clothing/under/carnival/dress_fancy = 2,
+		/obj/item/clothing/under/carnival/dress_corset = 2,
+		/obj/item/clothing/mask/carnival/feather = 2,
+		/obj/item/clothing/mask/carnival/half = 2,
+		/obj/item/clothing/mask/carnival/triangles = 2,
+		/obj/item/clothing/mask/carnival/colored = 2,
+	)
+	GLOB.autodrobe_other_items += list(
+		/obj/item/clothing/suit/ny_sweater = 5,
+		/obj/item/clothing/suit/garland = 5,
+		/obj/item/clothing/neck/cloak/ny_cloak = 5,
+		/obj/item/clothing/neck/garland = 5,
+	)
+	GLOB.all_autodrobe_items |= (
+		GLOB.autodrobe_fancy_items \
+		+ GLOB.autodrobe_other_items
+	)

modular_bandastation/objects/_objects.dme

@@ -4,6 +4,8 @@
 
 #include "code/effects/turf_decal.dm"
 
+#include "code/greyscale/config_types/greyscale_clothes.dm"
+
 #include "code/items/banners.dm"
 #include "code/items/cards_ids.dm"
 #include "code/items/hampters.dm"
@@ -15,15 +17,20 @@
 #include "code/items/clothing/head/hat.dm"
 #include "code/items/clothing/head/jobs.dm"
 #include "code/items/clothing/head/soft_caps.dm"
+#include "code/items/clothing/masks/carnival.dm"
 #include "code/items/clothing/mod/modules/monitor_module.dm"
 #include "code/items/clothing/mod/types/praetorian/mod_theme.dm"
 #include "code/items/clothing/mod/types/praetorian/mod_types.dm"
+#include "code/items/clothing/neck/holiday.dm"
 #include "code/items/clothing/shoes/shoes.dm"
 #include "code/items/clothing/spacesuits/plasmaman.dm"
 #include "code/items/clothing/suits/armor.dm"
+#include "code/items/clothing/suits/carnival.dm"
 #include "code/items/clothing/suits/cloaks.dm"
+#include "code/items/clothing/suits/holiday.dm"
 #include "code/items/clothing/suits/jobs.dm"
 #include "code/items/clothing/suits/wintercoats.dm"
+#include "code/items/clothing/under/carnival.dm"
 #include "code/items/clothing/under/jobs/blueshield.dm"
 #include "code/items/clothing/under/jobs/centcom.dm"
 #include "code/items/clothing/under/jobs/magistrate.dm"

modular_bandastation/objects/code/greyscale/config_types/greyscale_clothes.dm

@@ -0,0 +1,72 @@
+/datum/greyscale_config/carnival_mask_feather
+	name = "Feather mask"
+	icon_file = 'modular_bandastation/objects/icons/obj/clothing/mask/carnival.dmi'
+	json_config = 'code/datums/greyscale/json_configs/bandastation/mask_carnival_feather.json'
+
+/datum/greyscale_config/carnival_mask_feather/worn
+	name = "Feather mask (worn)"
+	icon_file = 'modular_bandastation/objects/icons/mob/clothing/mask/carnival.dmi'
+
+/datum/greyscale_config/carnival_mask_half
+	name = "Half mask"
+	icon_file = 'modular_bandastation/objects/icons/obj/clothing/mask/carnival.dmi'
+	json_config = 'code/datums/greyscale/json_configs/bandastation/mask_carnival_half.json'
+
+/datum/greyscale_config/carnival_mask_half/worn
+	name = "Half mask (worn)"
+	icon_file = 'modular_bandastation/objects/icons/mob/clothing/mask/carnival.dmi'
+
+/datum/greyscale_config/carnival_mask_triangles
+	name = "Triangles mask"
+	icon_file = 'modular_bandastation/objects/icons/obj/clothing/mask/carnival.dmi'
+	json_config = 'code/datums/greyscale/json_configs/bandastation/mask_carnival_triangles.json'
+
+/datum/greyscale_config/carnival_mask_triangles/worn
+	name = "Triangles mask (worn)"
+	icon_file = 'modular_bandastation/objects/icons/mob/clothing/mask/carnival.dmi'
+
+/datum/greyscale_config/carnival_mask_colored
+	name = "Colored mask"
+	icon_file = 'modular_bandastation/objects/icons/obj/clothing/mask/carnival.dmi'
+	json_config = 'code/datums/greyscale/json_configs/bandastation/mask_carnival_colored.json'
+
+/datum/greyscale_config/carnival_mask_colored/worn
+	name = "Colored mask (worn)"
+	icon_file = 'modular_bandastation/objects/icons/mob/clothing/mask/carnival.dmi'
+
+/datum/greyscale_config/carnival_formal
+	name = "Formal suit"
+	icon_file = 'modular_bandastation/objects/icons/obj/clothing/under/carnival.dmi'
+	json_config = 'code/datums/greyscale/json_configs/bandastation/under_carnival_formal.json'
+
+/datum/greyscale_config/carnival_formal/worn
+	name = "Formal suit (worn)"
+	icon_file = 'modular_bandastation/objects/icons/mob/clothing/under/carnival.dmi'
+
+/datum/greyscale_config/carnival_jacket
+	name = "Jacket suit"
+	icon_file = 'modular_bandastation/objects/icons/obj/clothing/under/carnival.dmi'
+	json_config = 'code/datums/greyscale/json_configs/bandastation/under_carnival_jacket.json'
+
+/datum/greyscale_config/carnival_jacket/worn
+	name = "Jacket suit (worn)"
+	icon_file = 'modular_bandastation/objects/icons/mob/clothing/under/carnival.dmi'
+
+/datum/greyscale_config/carnival_dress_fancy
+	name = "Fancy dress"
+	icon_file = 'modular_bandastation/objects/icons/obj/clothing/under/carnival.dmi'
+	json_config = 'code/datums/greyscale/json_configs/bandastation/under_carnival_dress_fancy.json'
+
+/datum/greyscale_config/carnival_dress_fancy/worn
+	name = "Fancy dress (worn)"
+	icon_file = 'modular_bandastation/objects/icons/mob/clothing/under/carnival.dmi'
+
+/datum/greyscale_config/carnival_dress_corset
+	name = "Corset dress"
+	icon_file = 'modular_bandastation/objects/icons/obj/clothing/under/carnival.dmi'
+	json_config = 'code/datums/greyscale/json_configs/bandastation/under_carnival_dress_corset.json'
+
+/datum/greyscale_config/carnival_dress_corset/worn
+	name = "Corset dress (worn)"
+	icon_file = 'modular_bandastation/objects/icons/mob/clothing/under/carnival.dmi'
+

modular_bandastation/objects/code/items/clothing/masks/carnival.dm

@@ -0,0 +1,56 @@
+#define _COLOR_WHITE "#dddddd"
+#define _COLOR_RUBY "#981724"
+#define _COLOR_GOLD "#ffd700"
+
+#define COLORS_2(x, y) x + y
+#define COLORS_3(x, y, z) x + y + z
+
+/obj/item/clothing/mask/carnival
+	name = "carnival mask"
+	icon = 'modular_bandastation/objects/icons/obj/clothing/mask/carnival.dmi'
+	worn_icon = 'modular_bandastation/objects/icons/mob/clothing/mask/carnival.dmi'
+	flags_inv = HIDEFACE
+
+/obj/item/clothing/mask/carnival/feather
+	name = "Jester mask"
+	desc = "Изысканная маска с перьями для карнавалов и маскарадов. Неотъемлемый спутник королей."
+	icon_state = "feather"
+	greyscale_config = /datum/greyscale_config/carnival_mask_feather
+	greyscale_config_worn = /datum/greyscale_config/carnival_mask_feather/worn
+	greyscale_colors = COLORS_3(_COLOR_RUBY, _COLOR_WHITE, _COLOR_GOLD)
+	flags_1 = IS_PLAYER_COLORABLE_1
+	flags_cover = MASKCOVERSMOUTH
+
+/obj/item/clothing/mask/carnival/half
+	name = "Colombina mask"
+	desc = "Изысканная полумаска для карнавалов и маскарадов. Для тех, кто не склонен прятать красоту лица."
+	icon_state = "half"
+	greyscale_config = /datum/greyscale_config/carnival_mask_half
+	greyscale_config_worn = /datum/greyscale_config/carnival_mask_half/worn
+	greyscale_colors = COLORS_2(_COLOR_WHITE, _COLOR_GOLD)
+	flags_1 = IS_PLAYER_COLORABLE_1
+
+/obj/item/clothing/mask/carnival/triangles
+	name = "Harlequin mask"
+	desc = "Изысканная маска с конусами и колокольчиками для карнавалов и маскарадов. Воплощение поединка с собой и со всем миром."
+	icon_state = "triangles"
+	greyscale_config = /datum/greyscale_config/carnival_mask_triangles
+	greyscale_config_worn = /datum/greyscale_config/carnival_mask_triangles/worn
+	greyscale_colors = COLORS_3(_COLOR_WHITE, _COLOR_GOLD, _COLOR_RUBY)
+	flags_1 = IS_PLAYER_COLORABLE_1
+
+/obj/item/clothing/mask/carnival/colored
+	name = "Volto mask"
+	desc = "Изысканная маска для карнавалов и маскарадов, покрывающая все лицо. Дуализм души и тела."
+	icon_state = "colored"
+	greyscale_config = /datum/greyscale_config/carnival_mask_colored
+	greyscale_config_worn = /datum/greyscale_config/carnival_mask_colored/worn
+	greyscale_colors = COLORS_2(_COLOR_GOLD, _COLOR_WHITE)
+	flags_1 = IS_PLAYER_COLORABLE_1
+
+#undef _COLOR_WHITE
+#undef _COLOR_RUBY
+#undef _COLOR_GOLD
+
+#undef COLORS_2
+#undef COLORS_3

modular_bandastation/objects/code/items/clothing/neck/holiday.dm

@@ -0,0 +1,18 @@
+/obj/item/clothing/neck/cloak/ny_cloak
+	name = "New Year cloak"
+	desc = "Плащ с голограммой, выполненной в виде снежинки."
+	icon = 'modular_bandastation/objects/icons/obj/clothing/neck.dmi'
+	worn_icon = 'modular_bandastation/objects/icons/mob/clothing/neck.dmi'
+	icon_state = "ny_cloak"
+
+/obj/item/clothing/neck/garland
+	name = "garland"
+	desc = "Новогодняя гирлянда. Оберните вокруг шеи, и вы сами превратитесь в ёлку."
+	icon = 'modular_bandastation/objects/icons/obj/clothing/neck.dmi'
+	worn_icon = 'modular_bandastation/objects/icons/mob/clothing/neck.dmi'
+	icon_state = "garland"
+	w_class = WEIGHT_CLASS_SMALL
+	light_range = 2
+	light_power = 0.3
+	light_system = OVERLAY_LIGHT
+	color = LIGHT_COLOR_DIM_YELLOW

modular_bandastation/objects/code/items/clothing/suits/carnival.dm

@@ -0,0 +1,14 @@
+/obj/item/clothing/suit/carnival
+	name = "carnival suit"
+	icon = 'modular_bandastation/objects/icons/obj/clothing/suits/carnival.dmi'
+	worn_icon = 'modular_bandastation/objects/icons/mob/clothing/suits/carnival.dmi'
+
+/obj/item/clothing/suit/carnival/coat_silco
+	name = "Industrialist's coat"
+	desc = "Пальто, вышитое золотом. На бирке виднеется надпись - \"чтобы править - вселяй страх\"."
+	icon_state = "coat_silco"
+
+/obj/item/clothing/suit/carnival/jacket_kim
+	name = "Kitsuragi's jacket"
+	desc = "Явно одежда какого-то полицейского..."
+	icon_state = "jacket_kim"

modular_bandastation/objects/code/items/clothing/suits/holiday.dm

@@ -0,0 +1,18 @@
+/obj/item/clothing/suit/ny_sweater
+	name = "New Year sweater"
+	desc = "Новогодний свитер, который многие получают в подарок от родственников."
+	icon = 'modular_bandastation/objects/icons/obj/clothing/suits/holiday.dmi'
+	worn_icon = 'modular_bandastation/objects/icons/mob/clothing/suits/holiday.dmi'
+	icon_state = "sweater"
+
+/obj/item/clothing/suit/garland
+	name = "garland"
+	desc = "Новогодняя гирлянда. Только наденьте, и вы сами превратитесь в ёлку."
+	icon = 'modular_bandastation/objects/icons/obj/clothing/suits/holiday.dmi'
+	worn_icon = 'modular_bandastation/objects/icons/mob/clothing/suits/holiday.dmi'
+	icon_state = "garland"
+	w_class = WEIGHT_CLASS_SMALL
+	light_range = 2
+	light_power = 0.3
+	light_system = OVERLAY_LIGHT
+	color = LIGHT_COLOR_DIM_YELLOW