diff --git a/Resources/Locale/ru-RU/ADT/personalization.ftl b/Resources/Locale/ru-RU/ADT/personalization.ftl index 29a6076c91..554b969d43 100644 --- a/Resources/Locale/ru-RU/ADT/personalization.ftl +++ b/Resources/Locale/ru-RU/ADT/personalization.ftl @@ -374,3 +374,18 @@ ent-ADTClothingUniformZoroJumpsuit = легендарный деловой ко ent-ADTPlushieEmma = плюшевая Эмма .desc = Кажется, она хочет заставить вас работать. +ent-ADTWeaponPistolUma = "Умми" + .desc = Пистолет на основе МК58, выполненный под прихоти владельца. На затворе имеет небольшую надпись "Умми". + .suffix = { "Пистолет, Спонсорское, Ума" } + +ent-ADTClothingNeckUmaChoker = чокер Умы + .desc = Небольшого размера чокер, вокруг которого расположенны шипы, а спереди сердечко с надписью "Ума". + .suffix = { "Спонсорское, Ума" } + +ent-ADTClothingOuterArmorUma = бронежилет + .desc = Небольшой, лёгкий бронежилет, предназвначенный для защиты груди. Поставляется в комплекте с налокотниками и наколенниками. В правом верхнем углу имеется небольшая табличка с именем владельца - "Ума Э.С." + .suffix = { "Спонсорское, Ума" } + +ent-ADTClothingUniformJumpsuitUmaSport = тёмная спортивная форма + .desc = Облегающая спортивная форма, позволяющая телу дышать при интенсивных тренировках. Выглядит ухоженной и на удивление чистой. От неё исходит приятный запах. + .suffix = { "Спонсорское, Ума" } diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/Wallmount/Signs/posters.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/Wallmount/Signs/posters.ftl index 09aaca7a4f..1ff837aecf 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/Wallmount/Signs/posters.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/Wallmount/Signs/posters.ftl @@ -222,4 +222,28 @@ ent-ADTPosterUSSPKS = "Ищем тебя в Космических Силах" ent-ADTPosterUSSPKDV = "Никто кроме нас!" .desc = Плакат с бойцом Космо-Десантных войск СССП и их классическим девизом, ведущим свою историю уже почти шестой век. - .suffix = { "СССП" } \ No newline at end of file + .suffix = { "СССП" } + +ent-ADTPosterContrabandUmaHot = горячая Ума + .desc = На плакате изображена высокая вульпа, с рельефными мышцами, в откровенном наряде. + .suffix = { "Спонсорское, Ума" } + +ent-ADTPosterContrabandUmaPress = горячая Ума + .desc = На плакате изображена высокая вульпа, демонстрирующая свой рельефный пресс. + .suffix = { "Спонсорское, Ума" } + +ent-ADTPosterContrabandUmaSport = Спорт - Жизнь! + .desc = Плакат, призывающий занятся тебя спортом. Посмотри на неё, и на свой пивной живот! + .suffix = { "Спонсорское, Ума" } + +ent-ADTPosterContrabandUmaAndAzalia = дружный коллектив + .desc = На плакате изображены два не безызвестных инженера, что очень "дружны"! + .suffix = { "Спонсорское, Ума" } + +ent-ADTPosterContrabandUmaRabbit = Ума - кролик + .desc = На плакате изображенна высокая вульпа, в облегающем костюме кролика. + .suffix = { "Спонсорское, Ума" } + +ent-ADTPosterContrabandUmaOnBeach = Пляжный сезон! + .desc = Плакат призывающий экипаж опробывать исскуственные пляжи на станции (пляж не доступен на некоторых станциях). + .suffix = { "Спонсорское, Ума" } diff --git a/Resources/Prototypes/ADT/Entities/Personalization/Clothing/personalization_clothing.yml b/Resources/Prototypes/ADT/Entities/Personalization/Clothing/personalization_clothing.yml index cb6c7e28d5..e161dc82b7 100644 --- a/Resources/Prototypes/ADT/Entities/Personalization/Clothing/personalization_clothing.yml +++ b/Resources/Prototypes/ADT/Entities/Personalization/Clothing/personalization_clothing.yml @@ -586,3 +586,36 @@ - ADTSyrelBattleAxe - type: Appearance +#cherreshnia (она же Ума) +- type: entity + parent: ClothingUniformBase + id: ADTClothingUniformJumpsuitUmaSport + name: dark sporting clothing + description: dark sporting clothing + suffix: Sponsor, Uma + components: + - type: Sprite + sprite: ADT/Personalization/uma_sport_clothing.rsi + - type: Clothing + sprite: ADT/Personalization/uma_sport_clothing.rsi + +- type: entity + parent: ClothingNeckBase + id: ADTClothingNeckUmaChoker + name: Uma`s choker + description: Uma`s choker + suffix: Sponsor, Uma + components: + - type: Sprite + sprite: ADT/Personalization/uma_choker.rsi + +- type: entity + parent: ClothingOuterArmorBasic + id: ADTClothingOuterArmorUma + name: Uma`s armor vest + description: A Type III heavy bulletproof vest that excels in protecting the wearer against traditional projectile weaponry and explosives to a minor extent. + components: + - type: Sprite + sprite: ADT/Personalization/uma_armor.rsi + - type: Clothing + sprite: ADT/Personalization/uma_armor.rsi diff --git a/Resources/Prototypes/ADT/Entities/Personalization/Objects/personalization_items.yml b/Resources/Prototypes/ADT/Entities/Personalization/Objects/personalization_items.yml index 771d09d871..d0709e069b 100644 --- a/Resources/Prototypes/ADT/Entities/Personalization/Objects/personalization_items.yml +++ b/Resources/Prototypes/ADT/Entities/Personalization/Objects/personalization_items.yml @@ -1097,3 +1097,20 @@ Wood: 250 - type: Prying +#cherreshnia (она же Ума) +- type: entity + name: Uma`s pistol + parent: WeaponPistolMk58 + id: ADTWeaponPistolUma + description: A cheap, ubiquitous sidearm, produced by a NanoTrasen subsidiary. Uses .35 auto ammo. + suffix: Sponsor, Uma + components: + - type: Sprite + sprite: ADT/Personalization/uma_pistol.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-0 + map: ["enum.GunVisualLayers.Mag"] + - type: Clothing + sprite: ADT/Personalization/uma_pistol.rsi diff --git a/Resources/Prototypes/ADT/Entities/Structures/Wallmount/Signs/posters.yml b/Resources/Prototypes/ADT/Entities/Structures/Wallmount/Signs/posters.yml index d19e37e221..d5b4a12fe0 100644 --- a/Resources/Prototypes/ADT/Entities/Structures/Wallmount/Signs/posters.yml +++ b/Resources/Prototypes/ADT/Entities/Structures/Wallmount/Signs/posters.yml @@ -795,3 +795,65 @@ - type: Sprite sprite: ADT/Structures/Wallmounts/poster_syndicate.rsi state: gasattack + +#спонсорские контрабандные постеры с Умой + +- type: entity + parent: ADTPosterBase + id: ADTPosterContrabandUmaHot + name: Uma`s poster 1 + description: Uma`s poster 1 + suffix: Sponsor, Uma + components: + - type: Sprite + state: poster_umahot_contraband #Спрайт от Празата + +- type: entity + parent: ADTPosterBase + id: ADTPosterContrabandUmaPress + name: Uma`s poster 2 + description: Uma`s poster 2 + suffix: Sponsor, Uma + components: + - type: Sprite + state: poster_umapress_contraband #Спрайт от Празата + +- type: entity + parent: ADTPosterBase + id: ADTPosterContrabandUmaSport + name: Uma`s poster 3 + description: Uma`s poster 3 + suffix: Sponsor, Uma + components: + - type: Sprite + state: poster_umasport_contraband #Спрайт от Празата + +- type: entity + parent: ADTPosterBase + id: ADTPosterContrabandUmaAndAzalia + name: Uma`s poster 4 + description: Uma`s poster 4 + suffix: Sponsor, Uma + components: + - type: Sprite + state: poster_umaazalia_contraband #Спрайт от Празата + +- type: entity + parent: ADTPosterBase + id: ADTPosterContrabandUmaRabbit + name: Uma`s poster 5 + description: Uma`s poster 5 + suffix: Sponsor, Uma + components: + - type: Sprite + state: poster_umarabbit_contraband #Спрайт от Празата + +- type: entity + parent: ADTPosterBase + id: ADTPosterContrabandUmaOnBeach + name: Uma`s poster 6 + description: Uma`s poster 6 + suffix: Sponsor, Uma + components: + - type: Sprite + state: poster_umaonbeach_contraband #Спрайт от Празата diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/posters.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/posters.yml index a230ca9f37..a62518d7ca 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/posters.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/posters.yml @@ -106,6 +106,12 @@ - ADTPosterPanem - ADTPosterGasAttack - ADTPosterNoGood + - ADTPosterContrabandUmaHot + - ADTPosterContrabandUmaPress + - ADTPosterContrabandUmaSport + - ADTPosterContrabandUmaAndAzalia + - ADTPosterContrabandUmaRabbit + - ADTPosterContrabandUmaOnBeach #ADT tweak ^^^ chance: 1 diff --git a/Resources/Textures/ADT/Personalization/uma_armor.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/ADT/Personalization/uma_armor.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000..fcadb7ab36 Binary files /dev/null and b/Resources/Textures/ADT/Personalization/uma_armor.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/ADT/Personalization/uma_armor.rsi/icon.png b/Resources/Textures/ADT/Personalization/uma_armor.rsi/icon.png new file mode 100644 index 0000000000..8f44e9da32 Binary files /dev/null and b/Resources/Textures/ADT/Personalization/uma_armor.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Personalization/uma_armor.rsi/inhand-left.png b/Resources/Textures/ADT/Personalization/uma_armor.rsi/inhand-left.png new file mode 100644 index 0000000000..ae3c554cec Binary files /dev/null and b/Resources/Textures/ADT/Personalization/uma_armor.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Personalization/uma_armor.rsi/inhand-right.png b/Resources/Textures/ADT/Personalization/uma_armor.rsi/inhand-right.png new file mode 100644 index 0000000000..7f61fb4c38 Binary files /dev/null and b/Resources/Textures/ADT/Personalization/uma_armor.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Personalization/uma_armor.rsi/meta.json b/Resources/Textures/ADT/Personalization/uma_armor.rsi/meta.json new file mode 100644 index 0000000000..2c9a90d7e9 --- /dev/null +++ b/Resources/Textures/ADT/Personalization/uma_armor.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:prazat", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Personalization/uma_choker.rsi/equipped-NECK.png b/Resources/Textures/ADT/Personalization/uma_choker.rsi/equipped-NECK.png new file mode 100644 index 0000000000..a89c135e82 Binary files /dev/null and b/Resources/Textures/ADT/Personalization/uma_choker.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/ADT/Personalization/uma_choker.rsi/icon.png b/Resources/Textures/ADT/Personalization/uma_choker.rsi/icon.png new file mode 100644 index 0000000000..280429b82c Binary files /dev/null and b/Resources/Textures/ADT/Personalization/uma_choker.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Personalization/uma_choker.rsi/meta.json b/Resources/Textures/ADT/Personalization/uma_choker.rsi/meta.json new file mode 100644 index 0000000000..fce26e5767 --- /dev/null +++ b/Resources/Textures/ADT/Personalization/uma_choker.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:prazat", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-NECK", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Personalization/uma_pistol.rsi/base.png b/Resources/Textures/ADT/Personalization/uma_pistol.rsi/base.png new file mode 100644 index 0000000000..cb3cf190f7 Binary files /dev/null and b/Resources/Textures/ADT/Personalization/uma_pistol.rsi/base.png differ diff --git a/Resources/Textures/ADT/Personalization/uma_pistol.rsi/bolt-open.png b/Resources/Textures/ADT/Personalization/uma_pistol.rsi/bolt-open.png new file mode 100644 index 0000000000..843a3dfeba Binary files /dev/null and b/Resources/Textures/ADT/Personalization/uma_pistol.rsi/bolt-open.png differ diff --git a/Resources/Textures/ADT/Personalization/uma_pistol.rsi/equipped-BELT.png b/Resources/Textures/ADT/Personalization/uma_pistol.rsi/equipped-BELT.png new file mode 100644 index 0000000000..785f4037d7 Binary files /dev/null and b/Resources/Textures/ADT/Personalization/uma_pistol.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/ADT/Personalization/uma_pistol.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/ADT/Personalization/uma_pistol.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 0000000000..785f4037d7 Binary files /dev/null and b/Resources/Textures/ADT/Personalization/uma_pistol.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/ADT/Personalization/uma_pistol.rsi/icon.png b/Resources/Textures/ADT/Personalization/uma_pistol.rsi/icon.png new file mode 100644 index 0000000000..50c056a678 Binary files /dev/null and b/Resources/Textures/ADT/Personalization/uma_pistol.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Personalization/uma_pistol.rsi/inhand-left.png b/Resources/Textures/ADT/Personalization/uma_pistol.rsi/inhand-left.png new file mode 100644 index 0000000000..e16031c9c3 Binary files /dev/null and b/Resources/Textures/ADT/Personalization/uma_pistol.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Personalization/uma_pistol.rsi/inhand-right.png b/Resources/Textures/ADT/Personalization/uma_pistol.rsi/inhand-right.png new file mode 100644 index 0000000000..262d49c068 Binary files /dev/null and b/Resources/Textures/ADT/Personalization/uma_pistol.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Personalization/uma_pistol.rsi/mag-0.png b/Resources/Textures/ADT/Personalization/uma_pistol.rsi/mag-0.png new file mode 100644 index 0000000000..aa5cf93eb1 Binary files /dev/null and b/Resources/Textures/ADT/Personalization/uma_pistol.rsi/mag-0.png differ diff --git a/Resources/Textures/ADT/Personalization/uma_pistol.rsi/meta.json b/Resources/Textures/ADT/Personalization/uma_pistol.rsi/meta.json new file mode 100644 index 0000000000..5491298d65 --- /dev/null +++ b/Resources/Textures/ADT/Personalization/uma_pistol.rsi/meta.json @@ -0,0 +1,39 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:prazat", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "bolt-open" + }, + { + "name": "mag-0" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Personalization/uma_sport_clothing.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/ADT/Personalization/uma_sport_clothing.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..8764ada167 Binary files /dev/null and b/Resources/Textures/ADT/Personalization/uma_sport_clothing.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/ADT/Personalization/uma_sport_clothing.rsi/icon.png b/Resources/Textures/ADT/Personalization/uma_sport_clothing.rsi/icon.png new file mode 100644 index 0000000000..c6a91d02e7 Binary files /dev/null and b/Resources/Textures/ADT/Personalization/uma_sport_clothing.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Personalization/uma_sport_clothing.rsi/inhand-left.png b/Resources/Textures/ADT/Personalization/uma_sport_clothing.rsi/inhand-left.png new file mode 100644 index 0000000000..e6223c31fe Binary files /dev/null and b/Resources/Textures/ADT/Personalization/uma_sport_clothing.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Personalization/uma_sport_clothing.rsi/inhand-right.png b/Resources/Textures/ADT/Personalization/uma_sport_clothing.rsi/inhand-right.png new file mode 100644 index 0000000000..568c4d7b78 Binary files /dev/null and b/Resources/Textures/ADT/Personalization/uma_sport_clothing.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Personalization/uma_sport_clothing.rsi/meta.json b/Resources/Textures/ADT/Personalization/uma_sport_clothing.rsi/meta.json new file mode 100644 index 0000000000..b5a5358093 --- /dev/null +++ b/Resources/Textures/ADT/Personalization/uma_sport_clothing.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:prazat.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/ADT/Structures/Wallmounts/posters.rsi/meta.json b/Resources/Textures/ADT/Structures/Wallmounts/posters.rsi/meta.json index 42ea63754d..55eab6a72b 100644 --- a/Resources/Textures/ADT/Structures/Wallmounts/posters.rsi/meta.json +++ b/Resources/Textures/ADT/Structures/Wallmounts/posters.rsi/meta.json @@ -6,39 +6,57 @@ "x": 32, "y": 32 }, - "states": [ - { - "name": "poster_adtgreatfood_legit" - }, - { - "name": "poster_adtturnonsensors_legit" - }, - { - "name": "poster_adtoktoberfest_legit" - }, - { - "name": "poster_adtoktoberfest2_legit" - }, - { - "name": "poster_efficiencydiagram_legit" - }, - { - "name": "poster_adtlusttayaran_contraband" - }, - { - "name": "poster_adtfearthem_contraband" - }, - { - "name": "poster_adtsilence_contraband" - }, - { - "name": "poster_adtlustuma_contraband" - }, - { - "name": "poster_adtlustardeco_contraband" - }, - { - "name": "quadro_electronics" - } - ] + "states": [ + { + "name": "poster_adtgreatfood_legit" + }, + { + "name": "poster_adtturnonsensors_legit" + }, + { + "name": "poster_adtoktoberfest_legit" + }, + { + "name": "poster_adtoktoberfest2_legit" + }, + { + "name": "poster_efficiencydiagram_legit" + }, + { + "name": "poster_adtlusttayaran_contraband" + }, + { + "name": "poster_adtfearthem_contraband" + }, + { + "name": "poster_adtsilence_contraband" + }, + { + "name": "poster_adtlustuma_contraband" + }, + { + "name": "poster_adtlustardeco_contraband" + }, + { + "name": "quadro_electronics" + }, + { + "name": "poster_umahot_contraband" + }, + { + "name": "poster_umapress_contraband" + }, + { + "name": "poster_umasport_contraband" + }, + { + "name": "poster_umaazalia_contraband" + }, + { + "name": "poster_umarabbit_contraband" + }, + { + "name": "poster_umaonbeach_contraband" + } + ] } diff --git a/Resources/Textures/ADT/Structures/Wallmounts/posters.rsi/poster_umaazalia_contraband.png b/Resources/Textures/ADT/Structures/Wallmounts/posters.rsi/poster_umaazalia_contraband.png new file mode 100644 index 0000000000..2da4c2f4d8 Binary files /dev/null and b/Resources/Textures/ADT/Structures/Wallmounts/posters.rsi/poster_umaazalia_contraband.png differ diff --git a/Resources/Textures/ADT/Structures/Wallmounts/posters.rsi/poster_umahot_contraband.png b/Resources/Textures/ADT/Structures/Wallmounts/posters.rsi/poster_umahot_contraband.png new file mode 100644 index 0000000000..70e694226c Binary files /dev/null and b/Resources/Textures/ADT/Structures/Wallmounts/posters.rsi/poster_umahot_contraband.png differ diff --git a/Resources/Textures/ADT/Structures/Wallmounts/posters.rsi/poster_umaonbeach_contraband.png b/Resources/Textures/ADT/Structures/Wallmounts/posters.rsi/poster_umaonbeach_contraband.png new file mode 100644 index 0000000000..b49e0605c3 Binary files /dev/null and b/Resources/Textures/ADT/Structures/Wallmounts/posters.rsi/poster_umaonbeach_contraband.png differ diff --git a/Resources/Textures/ADT/Structures/Wallmounts/posters.rsi/poster_umapress_contraband.png b/Resources/Textures/ADT/Structures/Wallmounts/posters.rsi/poster_umapress_contraband.png new file mode 100644 index 0000000000..6b586f85e2 Binary files /dev/null and b/Resources/Textures/ADT/Structures/Wallmounts/posters.rsi/poster_umapress_contraband.png differ diff --git a/Resources/Textures/ADT/Structures/Wallmounts/posters.rsi/poster_umarabbit_contraband.png b/Resources/Textures/ADT/Structures/Wallmounts/posters.rsi/poster_umarabbit_contraband.png new file mode 100644 index 0000000000..678828576d Binary files /dev/null and b/Resources/Textures/ADT/Structures/Wallmounts/posters.rsi/poster_umarabbit_contraband.png differ diff --git a/Resources/Textures/ADT/Structures/Wallmounts/posters.rsi/poster_umasport_contraband.png b/Resources/Textures/ADT/Structures/Wallmounts/posters.rsi/poster_umasport_contraband.png new file mode 100644 index 0000000000..5e8fc05fba Binary files /dev/null and b/Resources/Textures/ADT/Structures/Wallmounts/posters.rsi/poster_umasport_contraband.png differ