Подготовка к мерджу (остались инструменты музыкальные)

ss220club · msw7007 · Jul 14, 2024 · Jul 14, 2024 · Jul 14, 2024 · Jul 15, 2024
commit 57d861428bc03bd4d2ce10db50a2f609dc72c447
diff --git a/modular_bandastation/loadout/_loadout.dme b/modular_bandastation/loadout/_loadout.dme
@@ -6,12 +6,12 @@
 #include "code/loadout_preference.dm"
 #include "code/categories/accessories.dm"
 #include "code/categories/pocket.dm"
-#include "code/category_cardstickers.dm"
-#include "code/category_hands.dm"
-#include "code/category_masks.dm"
-#include "code/category_shoes.dm"
-#include "code/category_wallets.dm"
-#include "code/category_backpack.dm"
-#include "code/category_heads.dm"
-#include "code/category_suits.dm"
-#include "code/category_uniform.dm"
+#include "code/categories/cardstickers.dm"
+#include "code/categories/hands.dm"
+#include "code/categories/masks.dm"
+#include "code/categories/shoes.dm"
+#include "code/categories/wallets.dm"
+#include "code/categories/backpack.dm"
+#include "code/categories/heads.dm"
+#include "code/categories/suits.dm"
+#include "code/categories/uniform.dm"
diff --git a/...station/loadout/code/category_backpack.dm → ...ation/loadout/code/categories/backpack.dm b/...station/loadout/code/category_backpack.dm → ...ation/loadout/code/categories/backpack.dm
@@ -1,39 +1,32 @@
 ///Т0
 /datum/loadout_item/pocket_items/soundhand_bass_guitar
 	name = "Бас гитара"
 	item_path = /obj/item/instrument/soundhand_bass_guitar
 
-///Т0
 /datum/loadout_item/pocket_items/soundhand_rock_guitar
 	name = "Рок гитара"
 	item_path = /obj/item/instrument/soundhand_rock_guitar
 
-///Т0
 /datum/loadout_item/pocket_items/firefirstaid
 	name = "Набор первой медицинской"
 	item_path = /obj/item/storage/medkit/regular
 
-///Т0
 /datum/loadout_item/pocket_items/airtank
 	name = "Спаренный балон от премиальной страховки"
 	item_path = /obj/item/tank/internals/emergency_oxygen/double
 
-///Т0
 /datum/loadout_item/pocket_items/toolbelt
 	name = "Дедушкин пояс с инструментами"
 	item_path = /obj/item/storage/belt/utility/full
 
-///Т0
 /datum/loadout_item/pocket_items/bruise_pack
 	name = "Медицинские бинты"
 	item_path = /obj/item/stack/medical/bruise_pack
 
-///Т0
 /datum/loadout_item/pocket_items/ointment
 	name = "Мазь от ожогов"
 	item_path = /obj/item/stack/medical/ointment
 
-///Т0
 /datum/loadout_item/pocket_items/healthanalyzer
 	name = "Медицинский анализатор"
 	item_path = /obj/item/healthanalyzer
@@ -41,5 +34,5 @@
 ///Т5
 /datum/loadout_item/pocket_items/soundhand_metal_guitar
 	name = "Электро-гитара Арии"
 	item_path = /obj/item/instrument/soundhand_metal_guitar

diff --git a/...ion/loadout/code/category_cardstickers.dm → ...n/loadout/code/categories/cardstickers.dm b/...ion/loadout/code/category_cardstickers.dm → ...n/loadout/code/categories/cardstickers.dm
@@ -13,125 +13,101 @@
 /*
 // ID Skins
 ///Т0
+
 /datum/loadout_item/cardstickers/id_decal_colored
 	name = "Наклейка на карту (Голографическая)"
 	item_path = /obj/item/id_skin/colored
 
-///Т0
 /datum/loadout_item/cardstickers/id_decal_donut
 	name = "Пончиковая наклейка на карту"
 	item_path = /obj/item/id_skin/donut
 
-///Т0
 /datum/loadout_item/cardstickers/id_decal_business
 	name = "Бизнесменская наклейка на карту"
 	item_path = /obj/item/id_skin/business
 
-///Т0
 /datum/loadout_item/cardstickers/id_decal_ussp
 	name = "Коммунистическая наклейка на карту"
 	item_path = /obj/item/id_skin/ussp
-*/
 
-/*
 ///Т3
 /datum/loadout_item/cardstickers/id_decal_silver_colored
 	name = "Серебрянная наклейка на карту (Голографическая)"
 	item_path = /obj/item/id_skin/colored/silver
 
-///Т3
 /datum/loadout_item/cardstickers/id_decal_silver
 	name = "Серебрянная наклейка на карту"
 	item_path = /obj/item/id_skin/silver
 
-///Т3
 /datum/loadout_item/cardstickers/id_decal_gold_skin
 	name = "Золотая наклейка на карту"
 	item_path = /obj/item/id_skin/gold
 
-///Т3
 /datum/loadout_item/cardstickers/id_decal_lifetime
 	name = "Стильная наклейка на карту"
 	item_path = /obj/item/id_skin/lifetime
 
-///Т3
 /datum/loadout_item/cardstickers/id_decal_clown
 	name = "Клоунская наклейка на карту"
 	item_path = /obj/item/id_skin/clown
 
-///Т3
 /datum/loadout_item/cardstickers/id_decal_neon
 	name = "Неоновая наклейка на карту"
 	item_path = /obj/item/id_skin/neon
 
-///Т3
 /datum/loadout_item/cardstickers/id_decal_neon_colored
 	name = "Неоновая наклейка на карту (Голографическая)"
 	item_path = /obj/item/id_skin/colored/neon
 
-///Т3
 /datum/loadout_item/cardstickers/id_decal_missing
 	name = "Чёрно-розовая наклейка на карту"
 	item_path = /obj/item/id_skin/missing
 
-///Т3
 /datum/loadout_item/cardstickers/id_decal_paradise
 	name = "Paradise наклейка на карту"
 	item_path = /obj/item/id_skin/paradise
 
-///Т3
 /datum/loadout_item/cardstickers/id_decal_ouija
 	name = "Уиджи наклейка на карту"
 	item_path = /obj/item/id_skin/ouija
 
-///Т3
 /datum/loadout_item/cardstickers/id_decal_kitty
 	name = "Кото-клейка на карту"
 	item_path = /obj/item/id_skin/kitty
 
-///Т3
 /datum/loadout_item/cardstickers/id_decal_kitty_colored
 	name = "Кото-клейка на карту (Голографическая)"
 	item_path = /obj/item/id_skin/colored/kitty
 
-///Т3
 /datum/loadout_item/cardstickers/id_decal_anime
 	name = "Анимешная наклейка на карту"
 	item_path = /obj/item/id_skin/cursedmiku
 
-///Т3
 /datum/loadout_item/cardstickers/id_decal_jokerge
 	name = "Джокерге наклейка на карту"
 	item_path = /obj/item/id_skin/jokerge
-*/
 
-/*
 ///Т4
 /datum/loadout_item/cardstickers/id_decal_rainbow
 	name = "Радужная наклейка на карту"
 	item_path = /obj/item/id_skin/rainbow
 
-///Т4
 /datum/loadout_item/cardstickers/id_decal_space
 	name = "КОСМИЧЕСКАЯ наклейка на карту"
 	item_path = /obj/item/id_skin/space
 
-///Т4
 /datum/loadout_item/cardstickers/id_decal_snake
 	name = "Бегущая наклейка на карту"
 	item_path = /obj/item/id_skin/colored/snake
 
-///Т4
 /datum/loadout_item/cardstickers/id_decal_magic
 	name = "Магическая наклейка на карту"
 	item_path = /obj/item/id_skin/magic
 
-///Т4
 /datum/loadout_item/cardstickers/id_decal_terminal
 	name = "Наклейка на карту в виде терминала"
 	item_path = /obj/item/id_skin/terminal
 
-///Т4
 /datum/loadout_item/cardstickers/id_decal_boykisser
 	name = "BoyKisser наклейка на карту"
 	item_path = /obj/item/id_skin/boykisser

diff --git a/...ndastation/loadout/code/category_hands.dm → ...astation/loadout/code/categories/hands.dm b/...ndastation/loadout/code/category_hands.dm → ...astation/loadout/code/categories/hands.dm
diff --git a/...ndastation/loadout/code/category_heads.dm → ...astation/loadout/code/categories/heads.dm b/...ndastation/loadout/code/category_heads.dm → ...astation/loadout/code/categories/heads.dm
@@ -5,6 +5,6 @@
 
 
 ///Т2
-/datum/loadout_item/head/bike_helmet
+/datum/loadout_item/head/biker_helmet
 	name = "Байкерский шлем"
-	item_path = /obj/item/clothing/head/helmet/bike_helmet/replica
+	item_path = /obj/item/clothing/head/helmet/biker_helmet/replica
diff --git a/...ndastation/loadout/code/category_masks.dm → ...astation/loadout/code/categories/masks.dm b/...ndastation/loadout/code/category_masks.dm → ...astation/loadout/code/categories/masks.dm
@@ -17,17 +17,14 @@
 	name = "Маска свиньи"
 	item_path = /obj/item/clothing/mask/animal/pig
 
-///Т0
 /datum/loadout_item/masks/horsehead
 	name = "Маска лошади"
 	item_path = /obj/item/clothing/mask/animal/horsehead
 
-///Т0
 /datum/loadout_item/masks/raven
 	name = "Маска ворона"
 	item_path = /obj/item/clothing/mask/animal/small/raven
 
-///Т0
 /datum/loadout_item/masks/breathscarf
 	name = "Шарф с системой дыхания"
 	item_path = /obj/item/clothing/mask/breath/breathscarf

diff --git a/...ndastation/loadout/code/category_shoes.dm → ...astation/loadout/code/categories/shoes.dm b/...ndastation/loadout/code/category_shoes.dm → ...astation/loadout/code/categories/shoes.dm
@@ -17,57 +17,42 @@
 	name = "Кросовки"
 	item_path = /obj/item/clothing/shoes/sneakers
 
-///Т0
 /datum/loadout_item/shoes/russian
 	name = "Русские ботинки"
 	item_path = /obj/item/clothing/shoes/russian
 
-///Т0
 /datum/loadout_item/shoes/discoshoes
 	name = "Дискоботы"
 	item_path = /obj/item/clothing/shoes/discoshoes
 
-///Т0
 /datum/loadout_item/shoes/roman
 	name = "Римские сандалии"
 	item_path = /obj/item/clothing/shoes/roman
 
-///Т0
 /datum/loadout_item/shoes/ducky_shoes
 	name = "Утинные тапки"
 	item_path = /obj/item/clothing/shoes/ducky_shoes
 
-///Т0
 /datum/loadout_item/shoes/laceup
 	name = "Туфли"
 	item_path = /obj/item/clothing/shoes/laceup
 
-///Т0
 /datum/loadout_item/shoes/sandal
 	name = "Сандалии"
 	item_path = /obj/item/clothing/shoes/sandal
 
-///Т0
 /datum/loadout_item/shoes/cowboy
 	name = "Ковбойские сапоги"
 	item_path = /obj/item/clothing/shoes/cowboy
 
-///Т0
 /datum/loadout_item/shoes/jackboots
 	name = "Берцы"
 	item_path = /obj/item/clothing/shoes/jackboots
 
-///Т0
 /datum/loadout_item/shoes/shark_shoes
 	name = "Акульи тапочки"
 	item_path = /obj/item/clothing/shoes/shark
 
-///Т0
 /datum/loadout_item/shoes/shark_light_shoes
 	name = "Акульи тапочки (светло-голубые)"
 	item_path = /obj/item/clothing/shoes/shark/light
-
-///Т1
-/datum/loadout_item/shoes/neon_shoes
-	name = "Неоновые кросовки"
-	item_path = /obj/item/clothing/shoes/black/neon
diff --git a/...ndastation/loadout/code/category_suits.dm → ...astation/loadout/code/categories/suits.dm b/...ndastation/loadout/code/category_suits.dm → ...astation/loadout/code/categories/suits.dm
@@ -16,62 +16,56 @@
 	name = "Зимняя куртка"
 	item_path = /obj/item/clothing/suit/hooded/wintercoat
 
-///Т0
 /datum/loadout_item/suits/jacket_letterman
 	name = "Куртка курьера"
 	item_path = /obj/item/clothing/suit/jacket/letterman
 
-///Т0
 /datum/loadout_item/suits/miljacket
 	name = "Военная куртка"
 	item_path = /obj/item/clothing/suit/jacket/miljacket
 
-///Т0
 /datum/loadout_item/suits/leather
 	name = "Кожаная куртка"
 	item_path = /obj/item/clothing/suit/jacket/leather
 
-///Т0
 /datum/loadout_item/suits/leather_biker
 	name = "Куртка байкера"
 	item_path = /obj/item/clothing/suit/jacket/leather/biker
 
-///Т0
 /datum/loadout_item/suits/bomber
 	name = "Куртка-бомбер"
 	item_path = /obj/item/clothing/suit/jacket/bomber
 
-///Т0
 /datum/loadout_item/suits/oversized
 	name = "куртка на вырост"
 	item_path = /obj/item/clothing/suit/jacket/oversized
 
-///Т0
 /datum/loadout_item/suits/sweater
 	name = "Свитер"
 	item_path = /obj/item/clothing/suit/toggle/jacket/sweater
 
 ///Т1
 /datum/loadout_item/suits/soundhand_black_jacket
 	name = "Черная куртка с тэгом группы Саундхэнд"
-	item_path = /obj/item/clothing/suit/storage/soundhand_black_jacket/tag
+	item_path = /obj/item/clothing/suit/soundhand_black_jacket/tag
 
-///Т1
 /datum/loadout_item/suits/soundhand_olive_jacket
 	name = "Оливковая куртка с тэгом группы Саундхэнд"
-	item_path = /obj/item/clothing/suit/storage/soundhand_olive_jacket/tag
+	item_path = /obj/item/clothing/suit/soundhand_olive_jacket/tag
 
-///Т1
 /datum/loadout_item/suits/soundhand_brown_jacket
 	name = "Коричневая куртка с тэгом группы Саундхэнд"
-	item_path = /obj/item/clothing/suit/storage/soundhand_brown_jacket/tag
+	item_path = /obj/item/clothing/suit/soundhand_brown_jacket/tag
+
+///Т3
+/datum/loadout_item/suits/soundhand_white_jacket
+	name = "Черная куртка с тэгом группы Саундхэнд"
+	item_path = /obj/item/clothing/suit/soundhand_white_jacket
 
-///Т1
 /datum/loadout_item/suits/shark_suit
 	name = "Костюм акулы"
 	item_path = /obj/item/clothing/suit/hooded/shark_costume
 
-///Т1
 /datum/loadout_item/suits/shark_light_suit
 	name = "Костюм акулы (светло-голубой)"
 	item_path = /obj/item/clothing/suit/hooded/shark_costume/light
@@ -81,12 +75,10 @@
 	name = "Куртка V"
 	item_path = /obj/item/clothing/suit/v_jacket
 
-///Т3
 /datum/loadout_item/suits/takemura_jacket
 	name = "Куртка Такэмуры"
 	item_path = /obj/item/clothing/suit/takemura_jacket
 
-///Т3
 /datum/loadout_item/suits/v_jacket
 	name = "Куртка Вай"
 	item_path = /obj/item/clothing/suit/hooded/vi_arcane
@@ -96,13 +88,12 @@
 	name = "Куртка Катарины"
 	item_path = /obj/item/clothing/suit/katarina_jacket
 
-///Т4
 /datum/loadout_item/suits/katarina_cyberjacket
 	name = "Кибер-куртка Катарины"
 	item_path = /obj/item/clothing/suit/katarina_cyberjacket
 
 ///Т5
 /datum/loadout_item/suits/soundhand_white_jacket
 	name = "Серебристая куртка Арии"
-	item_path = /obj/item/clothing/suit/storage/soundhand_white_jacket/tag
+	item_path = /obj/item/clothing/suit/soundhand_white_jacket/tag
 
diff --git a/...astation/loadout/code/category_uniform.dm → ...tation/loadout/code/categories/uniform.dm b/...astation/loadout/code/category_uniform.dm → ...tation/loadout/code/categories/uniform.dm
diff --git a/...astation/loadout/code/category_wallets.dm → ...tation/loadout/code/categories/wallets.dm b/...astation/loadout/code/category_wallets.dm → ...tation/loadout/code/categories/wallets.dm
@@ -15,19 +15,19 @@
 /datum/loadout_item/wallets/wallet
 	name = "Бумажник"
 	item_path = /obj/item/storage/wallet
-/*
-///Т0
-/datum/loadout_item/wallets/Wallet_NT
+
+/datum/loadout_item/wallets/wallet_nt
 	name = "Бумажник NT"
-	item_path = /obj/item/storage/wallet/wallet_NT
+	item_path = /obj/item/storage/wallet/nt
 
-///Т0
-/datum/loadout_item/wallets/Wallet_USSP
+/datum/loadout_item/wallets/wallet_ussp_1
 	name = "Бумажник СССП"
-	item_path = /obj/item/storage/wallet/wallet_USSP_2
+	item_path = /obj/item/storage/wallet/ussp_1
 
-///Т0
-/datum/loadout_item/wallets/Wallet_WYCI
+/datum/loadout_item/wallets/wallet_ussp_2
+	name = "Бумажник СССП"
+	item_path = /obj/item/storage/wallet/ussp_2
+
+/datum/loadout_item/wallets/wallet_wyci
 	name = "Бумажник W.Y.C.I."
-	item_path = /obj/item/storage/wallet/wallet_wyci
-*/
+	item_path = /obj/item/storage/wallet/wyci
diff --git a/code/modules/mob/living/carbon/human/human_update_icons.dm b/code/modules/mob/living/carbon/human/human_update_icons.dm
 		var/mutant_override = FALSE

 		var/obj/item/bodypart/head/bodypart_head = src.get_bodypart(BODY_ZONE_HEAD)
 		if(worn_item.worn_icon_species && worn_item.worn_icon_species[bodypart_head.species_bodytype])
 			icon_file = worn_item.worn_icon_species[bodypart_head.species_bodytype]
 			mutant_override = TRUE
 		else if(bodypart_head.species_bodytype in icon_files_species)
 			icon_file = icon_files_species[bodypart_head.species_bodytype]
 		var/mutant_override = FALSE

 		var/obj/item/bodypart/chest/bodypart_chest = src.get_bodypart(BODY_ZONE_CHEST)
 		if(worn_item.worn_icon_species && worn_item.worn_icon_species[bodypart_chest.species_bodytype])
 			icon_file = worn_item.worn_icon_species[bodypart_chest.species_bodytype]
 			mutant_override = TRUE
 		else if(bodypart_chest.species_bodytype in icon_files_species)
 			icon_file = icon_files_species[bodypart_chest.species_bodytype]
 		var/mutant_override = FALSE

 		var/obj/item/bodypart/head/bodypart_head = src.get_bodypart(BODY_ZONE_HEAD)
 		if(worn_item.worn_icon_species && worn_item.worn_icon_species[bodypart_head.species_bodytype])
 			icon_file = worn_item.worn_icon_species[bodypart_head.species_bodytype]
 			mutant_override = TRUE
 		else if(bodypart_head.species_bodytype in icon_files_species)
 			icon_file = icon_files_species[bodypart_head.species_bodytype]
diff --git a/modular_bandastation/objects/code/items/clothing/spacesuits/hev_suit.dm b/modular_bandastation/objects/code/items/clothing/spacesuits/hev_suit.dm
 		"Вы пытаетесь что-то сказать, но костюм сдавливает вам гортань..."
 	)

 	speech_args[SPEECH_MESSAGE] = "..."
 	to_chat(source, span_warning(pick(cancel_messages)))

 //Fire
diff --git a/modular_bandastation/species/code/clothing/mod.dm b/modular_bandastation/species/code/clothing/mod.dm
 	var/mob/living/carbon/user = usr
 	if(istype(user))
 		var/obj/item/bodypart/head/bodypart_head = user.get_bodypart(BODY_ZONE_HEAD)
 		if(bodypart_head && worn_icon_species && worn_icon_species[bodypart_head.species_bodytype])
 			module_icon = mutable_appearance(worn_icon_species[bodypart_head.species_bodytype], used_overlay, layer = standing.layer + 0.1)
 	if(!use_mod_colors)
 		module_icon.appearance_flags |= RESET_COLOR
 	. += module_icon
	var/mutant_override = FALSE

	var/obj/item/bodypart/head/bodypart_head = src.get_bodypart(BODY_ZONE_HEAD)
	if(worn_item.worn_icon_species && worn_item.worn_icon_species[bodypart_head.species_bodytype])
Check warning on line 402 in code/modules/mob/living/carbon/human/human_update_icons.dm GitHub Actions / Run Linters `OD2304: Invalid index operation. datum[] index operations are not valid starting in BYOND 515.1641`
	icon_file = worn_item.worn_icon_species[bodypart_head.species_bodytype]
Check warning on line 403 in code/modules/mob/living/carbon/human/human_update_icons.dm GitHub Actions / Run Linters `OD2304: Invalid index operation. datum[] index operations are not valid starting in BYOND 515.1641`
	mutant_override = TRUE
	else if(bodypart_head.species_bodytype in icon_files_species)
	icon_file = icon_files_species[bodypart_head.species_bodytype]
	var/mutant_override = FALSE

	var/obj/item/bodypart/chest/bodypart_chest = src.get_bodypart(BODY_ZONE_CHEST)
	if(worn_item.worn_icon_species && worn_item.worn_icon_species[bodypart_chest.species_bodytype])
Check warning on line 471 in code/modules/mob/living/carbon/human/human_update_icons.dm GitHub Actions / Run Linters `OD2304: Invalid index operation. datum[] index operations are not valid starting in BYOND 515.1641`
	icon_file = worn_item.worn_icon_species[bodypart_chest.species_bodytype]
Check warning on line 472 in code/modules/mob/living/carbon/human/human_update_icons.dm GitHub Actions / Run Linters `OD2304: Invalid index operation. datum[] index operations are not valid starting in BYOND 515.1641`
	mutant_override = TRUE
	else if(bodypart_chest.species_bodytype in icon_files_species)
	icon_file = icon_files_species[bodypart_chest.species_bodytype]
	var/mutant_override = FALSE

	var/obj/item/bodypart/head/bodypart_head = src.get_bodypart(BODY_ZONE_HEAD)
	if(worn_item.worn_icon_species && worn_item.worn_icon_species[bodypart_head.species_bodytype])
Check warning on line 541 in code/modules/mob/living/carbon/human/human_update_icons.dm GitHub Actions / Run Linters `OD2304: Invalid index operation. datum[] index operations are not valid starting in BYOND 515.1641`
	icon_file = worn_item.worn_icon_species[bodypart_head.species_bodytype]
Check warning on line 542 in code/modules/mob/living/carbon/human/human_update_icons.dm GitHub Actions / Run Linters `OD2304: Invalid index operation. datum[] index operations are not valid starting in BYOND 515.1641`
	mutant_override = TRUE
	else if(bodypart_head.species_bodytype in icon_files_species)
	icon_file = icon_files_species[bodypart_head.species_bodytype]
	"Вы пытаетесь что-то сказать, но костюм сдавливает вам гортань..."
	)

	speech_args[SPEECH_MESSAGE] = "..."
Check warning on line 117 in modular_bandastation/objects/code/items/clothing/spacesuits/hev_suit.dm GitHub Actions / Run Linters `OD2304: Invalid index operation. datum[] index operations are not valid starting in BYOND 515.1641`
	to_chat(source, span_warning(pick(cancel_messages)))

	//Fire
	var/mob/living/carbon/user = usr
	if(istype(user))
	var/obj/item/bodypart/head/bodypart_head = user.get_bodypart(BODY_ZONE_HEAD)
	if(bodypart_head && worn_icon_species && worn_icon_species[bodypart_head.species_bodytype])
Check warning on line 18 in modular_bandastation/species/code/clothing/mod.dm GitHub Actions / Run Linters `OD2304: Invalid index operation. datum[] index operations are not valid starting in BYOND 515.1641`
	module_icon = mutable_appearance(worn_icon_species[bodypart_head.species_bodytype], used_overlay, layer = standing.layer + 0.1)
Check warning on line 19 in modular_bandastation/species/code/clothing/mod.dm GitHub Actions / Run Linters `OD2304: Invalid index operation. datum[] index operations are not valid starting in BYOND 515.1641`
	if(!use_mod_colors)
	module_icon.appearance_flags \|= RESET_COLOR
	. += module_icon