diff --git a/Resources/Changelog/ChangelogADT.yml b/Resources/Changelog/ChangelogADT.yml index bff228cf73a..91133921191 100644 --- a/Resources/Changelog/ChangelogADT.yml +++ b/Resources/Changelog/ChangelogADT.yml @@ -317,3 +317,13 @@ Entries: - {message: Добавлены плюшевые игрушки Ло-Вюда и Сати Мадияровой, type: Add} id: 55584 #костыль отображения в Обновлениях time: '2023-10-15T23:23:00.0000000+00:00' + +- author: Петр Игнатьевич + changes: + - {message: Респрайт аварийного скафандра. Автор спрайта - wax391, type: Add} + - {message: Респрайт "Золотого Эля". Автор спрайта - shi_zzy, type: Add} + - {message: Добавлен (пока в качестве прототипа) СтильМат - торговый автомат с одеждой из ателье Празата Дэр Вахеда. Автор спрайта - prazat911, type: Add} + - {message: Незначительно увеличена стоимость подкрепления ядерщиков, type: Tweak} + - {message: Производство патронов .50 калибра потерпело саботаж - они утратили бронебойные свойства. В связи с этим Синдикат снижает цену для набора со снайперской винтовкой., type: Tweak} + id: 55585 #костыль отображения в Обновлениях + time: '2023-10-16T04:20:00.0000000+00:00' diff --git a/Resources/Locale/ru-RU/ADT/Objects/structuries/machines/vending_machines.ftl b/Resources/Locale/ru-RU/ADT/Objects/structuries/machines/vending_machines.ftl new file mode 100644 index 00000000000..21e598a00fa --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/Objects/structuries/machines/vending_machines.ftl @@ -0,0 +1,2 @@ +ent-ADTVendingMachinePrazatClothing = СтильноМат + .desc = Особый вид автомата с одеждой, выдающий нестандартную одежду. Одобрен бюро по контролю за стилем NanoTrasen. diff --git a/Resources/Locale/ru-RU/ADT/Sirena/Neck/chokers.ftl b/Resources/Locale/ru-RU/ADT/Sirena/Neck/chokers.ftl index 8d52bf56a56..5d37a9e5a76 100644 --- a/Resources/Locale/ru-RU/ADT/Sirena/Neck/chokers.ftl +++ b/Resources/Locale/ru-RU/ADT/Sirena/Neck/chokers.ftl @@ -1,6 +1,6 @@ -ent-SirenaChokerSpike = Чокер с шипами +ent-SirenaChokerWithSpike = Чокер с шипами .desc = Если его вывернуть задом-наперед, то это будет оружие пыток .suffix = { "" } -ent-SirenaChokerHeart = Чокер с сердцем +ent-SirenaChokerWithHeart = Чокер с сердцем .desc = Для хороших членов экипажа .suffix = { "" } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/outerclothing/hardsuits.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/outerclothing/hardsuits.ftl index bbd06594a28..99cc8778a86 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/outerclothing/hardsuits.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/outerclothing/hardsuits.ftl @@ -60,3 +60,5 @@ ent-ClothingOuterHardsuitPirateEVA = скафандр EVA космических .suffix = Пират ent-ClothingOuterHardsuitClown = скафандр клоуна .desc = Самодельный клоунский скафандр. +ent-ClothingOuterHardsuitMedic = кроваво-красный костюм медика + .desc = Тяжелобронированный и мобильный скафандр, специально разработанный для оказания медицинской помощи на передовой. diff --git a/Resources/Prototypes/ADT/Catalog/VendingMachines/Inventories/PrazatClothes.yml b/Resources/Prototypes/ADT/Catalog/VendingMachines/Inventories/PrazatClothes.yml new file mode 100644 index 00000000000..1c096bd4cda --- /dev/null +++ b/Resources/Prototypes/ADT/Catalog/VendingMachines/Inventories/PrazatClothes.yml @@ -0,0 +1,16 @@ +- type: vendingMachineInventory + id: ADTPrazatClothesMateInventory + startingInventory: + ADTClothingSandals: 3 + ADTClothingUniformTurleneckBlack: 3 + ADTClothingUniformTurleneckBlackWomen: 3 + ADTClothingUniformTurleneckWhite: 3 + ADTClothingUniformTurleneckWhiteBlack: 3 + ADTClothingUniformTurleneckWhiteWomen: 3 + ADTClothingUniformTurleneckBlackSleeveless: 3 + ADTClothingUniformTurleneckBlackWomenSleeveless: 3 + ADTClothingUniformTurleneckWhiteSleeveless: 3 + ADTClothingUniformTurleneckWhiteBlackSleeveless: 3 + ADTClothingUniformTurleneckWhiteWomenSleeveless: 3 + SirenaChokerWithSpike: 3 + SirenaChokerWithHeart: 3 diff --git a/Resources/Prototypes/ADT/Catalog/uplink.yml b/Resources/Prototypes/ADT/Catalog/uplink.yml index aaf6379558c..fc13bc4f2a3 100644 --- a/Resources/Prototypes/ADT/Catalog/uplink.yml +++ b/Resources/Prototypes/ADT/Catalog/uplink.yml @@ -58,7 +58,7 @@ icon: { sprite: /Textures/Objects/Weapons/Guns/Snipers/heavy_sniper.rsi, state: base } productEntity: ADTClothingBackpackDuffelSyndicateFilledHristov cost: - Telecrystal: 25 + Telecrystal: 20 categories: - UplinkBundles conditions: diff --git a/Resources/Prototypes/ADT/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/ADT/Entities/Structures/Machines/vending_machines.yml new file mode 100644 index 00000000000..265e2efdbe4 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Structures/Machines/vending_machines.yml @@ -0,0 +1,32 @@ +- type: entity + parent: VendingMachine + id: ADTVendingMachinePrazatClothing + name: StyleMate + description: A vending machine for specific clothing. + components: + - type: VendingMachine + pack: ADTPrazatClothesMateInventory + offState: off + brokenState: broken + normalState: normal-unshaded + denyState: deny-unshaded + - type: Advertise + pack: ClothesMateAds + - type: Speech + - type: Tag + tags: + - DroneUsable + - type: Sprite + sprite: ADT/Structures/Machines/VendingMachines/prazatomat.rsi + layers: + - state: "off" + map: ["enum.VendingMachineVisualLayers.Base"] + - state: "off" + map: ["enum.VendingMachineVisualLayers.BaseUnshaded"] + shader: unshaded + - state: panel + map: ["enum.WiresVisualLayers.MaintenancePanel"] + - type: PointLight + radius: 1.8 + energy: 1.6 + color: "#c2adff" diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index c912cb4e317..8d45ba98682 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -427,7 +427,7 @@ productEntity: ReinforcementRadioSyndicateNukeops icon: { sprite: Objects/Devices/communication.rsi, state: old-radio } cost: - Telecrystal: 16 + Telecrystal: 18 categories: - UplinkUtility conditions: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/antimateriel.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/antimateriel.yml index f9065aeb2ea..874eddd5e8c 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/antimateriel.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/antimateriel.yml @@ -7,6 +7,6 @@ - type: Projectile damage: types: - Piercing: 80 + Piercing: 90 Structural: 100 - ignoreResistances: true + #ignoreResistances: true diff --git a/Resources/Textures/ADT/Objects/Consumable/Drinks/oktoberfest_beer.rsi/goldenale.png b/Resources/Textures/ADT/Objects/Consumable/Drinks/oktoberfest_beer.rsi/goldenale.png index 3bf71c5b140..befef2f9ed5 100644 Binary files a/Resources/Textures/ADT/Objects/Consumable/Drinks/oktoberfest_beer.rsi/goldenale.png and b/Resources/Textures/ADT/Objects/Consumable/Drinks/oktoberfest_beer.rsi/goldenale.png differ diff --git a/Resources/Textures/ADT/Structures/Machines/VendingMachines/prazatomat.rsi/broken.png b/Resources/Textures/ADT/Structures/Machines/VendingMachines/prazatomat.rsi/broken.png new file mode 100644 index 00000000000..fcb15542416 Binary files /dev/null and b/Resources/Textures/ADT/Structures/Machines/VendingMachines/prazatomat.rsi/broken.png differ diff --git a/Resources/Textures/ADT/Structures/Machines/VendingMachines/prazatomat.rsi/deny-unshaded.png b/Resources/Textures/ADT/Structures/Machines/VendingMachines/prazatomat.rsi/deny-unshaded.png new file mode 100644 index 00000000000..331e3f033ed Binary files /dev/null and b/Resources/Textures/ADT/Structures/Machines/VendingMachines/prazatomat.rsi/deny-unshaded.png differ diff --git a/Resources/Textures/ADT/Structures/Machines/VendingMachines/prazatomat.rsi/meta.json b/Resources/Textures/ADT/Structures/Machines/VendingMachines/prazatomat.rsi/meta.json new file mode 100644 index 00000000000..185557f7a1e --- /dev/null +++ b/Resources/Textures/ADT/Structures/Machines/VendingMachines/prazatomat.rsi/meta.json @@ -0,0 +1,52 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Празат Дер Вахэд (discord: prazat911) для МРП-сервера Время Приключений ", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "normal-unshaded", + "delays": [ + [ + 1.5, + 0.1, + 1.5, + 0.1, + 1.5, + 0.1, + 1.5, + 0.1, + 1.5, + 0.1, + 1.5, + 0.1, + 1.5, + 0.1, + 1.5, + 0.1 + ] + ] + }, + { + "name": "deny-unshaded", + "delays": [ + [ + 1, + 0.1 + ] + ] + }, + { + "name": "off" + }, + { + "name": "broken" + }, + { + "name": "panel" + } + ] +} diff --git a/Resources/Textures/ADT/Structures/Machines/VendingMachines/prazatomat.rsi/normal-unshaded.png b/Resources/Textures/ADT/Structures/Machines/VendingMachines/prazatomat.rsi/normal-unshaded.png new file mode 100644 index 00000000000..186e1f4be9d Binary files /dev/null and b/Resources/Textures/ADT/Structures/Machines/VendingMachines/prazatomat.rsi/normal-unshaded.png differ diff --git a/Resources/Textures/ADT/Structures/Machines/VendingMachines/prazatomat.rsi/off.png b/Resources/Textures/ADT/Structures/Machines/VendingMachines/prazatomat.rsi/off.png new file mode 100644 index 00000000000..3f195d992cd Binary files /dev/null and b/Resources/Textures/ADT/Structures/Machines/VendingMachines/prazatomat.rsi/off.png differ diff --git a/Resources/Textures/ADT/Structures/Machines/VendingMachines/prazatomat.rsi/panel.png b/Resources/Textures/ADT/Structures/Machines/VendingMachines/prazatomat.rsi/panel.png new file mode 100644 index 00000000000..47afce0bd53 Binary files /dev/null and b/Resources/Textures/ADT/Structures/Machines/VendingMachines/prazatomat.rsi/panel.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/eva_large.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Helmets/eva_large.rsi/equipped-HELMET.png index c64f69b0d84..f5fe10aaef9 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/eva_large.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Helmets/eva_large.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/eva_large.rsi/icon.png b/Resources/Textures/Clothing/Head/Helmets/eva_large.rsi/icon.png index 25a7caf0891..57a2fd7523e 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/eva_large.rsi/icon.png and b/Resources/Textures/Clothing/Head/Helmets/eva_large.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/eva_large.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Helmets/eva_large.rsi/inhand-left.png index 077fb62a2cd..30bc1c84c49 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/eva_large.rsi/inhand-left.png and b/Resources/Textures/Clothing/Head/Helmets/eva_large.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/eva_large.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Helmets/eva_large.rsi/inhand-right.png index 41261d98156..902545e822a 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/eva_large.rsi/inhand-right.png and b/Resources/Textures/Clothing/Head/Helmets/eva_large.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/eva_large.rsi/meta.json b/Resources/Textures/Clothing/Head/Helmets/eva_large.rsi/meta.json index 2e66e1d8357..d5b4789b494 100644 --- a/Resources/Textures/Clothing/Head/Helmets/eva_large.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Helmets/eva_large.rsi/meta.json @@ -1,26 +1,26 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Sprite edited by Flareguy for SS14, original unedited sprite can be found in https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprites by discord: wax391", + "size": { + "x": 32, + "y": 32 }, - { - "name": "equipped-HELMET", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/eva_emergency.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Suits/eva_emergency.rsi/equipped-OUTERCLOTHING.png index 8b85a776354..69eba30299b 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Suits/eva_emergency.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Suits/eva_emergency.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/eva_emergency.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Suits/eva_emergency.rsi/icon.png index 3fd01918c66..165e6cb9ac2 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Suits/eva_emergency.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Suits/eva_emergency.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/eva_emergency.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Suits/eva_emergency.rsi/inhand-left.png index 974a3be3a7f..1b1f1ad0a66 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Suits/eva_emergency.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Suits/eva_emergency.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/eva_emergency.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Suits/eva_emergency.rsi/inhand-right.png index bd076ae1d7f..1a78287f2cb 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Suits/eva_emergency.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Suits/eva_emergency.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/eva_emergency.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Suits/eva_emergency.rsi/meta.json index b2c50fc4c67..38118a158ed 100644 --- a/Resources/Textures/Clothing/OuterClothing/Suits/eva_emergency.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Suits/eva_emergency.rsi/meta.json @@ -1,26 +1,26 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Sprites by Flareguy & cboyjet, heavily edited from space suit sprites found in https://github.com/tgstation/tgstation/commit/fb2d71495bfe81446159ef528534193d09dd8d34", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprites by discord: wax391", + "size": { + "x": 32, + "y": 32 }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] }