diff --git a/Resources/Locale/ru-RU/deltav/prototypes/catalog/fills/crates/vending-crates.ftl b/Resources/Locale/ru-RU/deltav/prototypes/catalog/fills/crates/vending-crates.ftl index c7358923b5..1d287ff0f1 100644 --- a/Resources/Locale/ru-RU/deltav/prototypes/catalog/fills/crates/vending-crates.ftl +++ b/Resources/Locale/ru-RU/deltav/prototypes/catalog/fills/crates/vending-crates.ftl @@ -1,2 +1,2 @@ -ent-CrateVendingMachineRestockPrideFilled = Ящик для пополнения запасов Pride-O-Mat - .desc = Содержит ящик для пополнения запасов для мата Pride-O-Mat. +ent-CrateVendingMachineRestockPrideFilled = Ящик для пополнения запасов РКНмат + .desc = Содержит ящик для пополнения запасов для мата РКНмат diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/entities/structures/machines/vending_machines.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/entities/structures/machines/vending_machines.ftl index 4dc1cde566..48e900d1ec 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/entities/structures/machines/vending_machines.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/entities/structures/machines/vending_machines.ftl @@ -1,4 +1,4 @@ -ent-VendingMachinePride = Прайд-О-Мат - .desc = Торговый автомат, содержащий преступления. +ent-VendingMachinePride = РКНмат + .desc = Торговый автомат, содержащий преступления и уголовные статьи. ent-VendingMachineCourierDrobe = Курьер-О-Мат .desc = Ни солнечные вспышки, ни метеориты, ни плазменный огонь, ни космическая пустота не помешают этим курьерам быстро завершить назначенную им доставку. diff --git a/Resources/Prototypes/_LostParadise/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/_LostParadise/Entities/Clothing/Belt/belts.yml index 5629242d6c..256443e0c5 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Clothing/Belt/belts.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Clothing/Belt/belts.yml @@ -35,3 +35,20 @@ sprite: _LostParadise/Clothing/Belt/flamingo.rsi - type: Clothing sprite: _LostParadise/Clothing/Belt/flamingo.rsi + +- type: entity + parent: ClothingBeltStorageBase + id: LPPClothingBeltNPZWebbing + name: РПС НПЗ + description: Плотная дюратканевая РПС в расцветке войск НПЗ. + components: + - type: Sprite + sprite: _LostParadise/Clothing/Belt/NPZ.rsi + - type: Clothing + sprite: _LostParadise/Clothing/Belt/NPZ.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.9 + Slash: 0.85 + Heat: 0.95 \ No newline at end of file diff --git a/Resources/Textures/DeltaV/Structures/Machines/VendingMachines/pride.rsi/broken.png b/Resources/Textures/DeltaV/Structures/Machines/VendingMachines/pride.rsi/broken.png index b506b41a54..e8b8155ab5 100644 Binary files a/Resources/Textures/DeltaV/Structures/Machines/VendingMachines/pride.rsi/broken.png and b/Resources/Textures/DeltaV/Structures/Machines/VendingMachines/pride.rsi/broken.png differ diff --git a/Resources/Textures/DeltaV/Structures/Machines/VendingMachines/pride.rsi/normal-unshaded.png b/Resources/Textures/DeltaV/Structures/Machines/VendingMachines/pride.rsi/normal-unshaded.png index 4bea61c2ab..5febf887fa 100644 Binary files a/Resources/Textures/DeltaV/Structures/Machines/VendingMachines/pride.rsi/normal-unshaded.png and b/Resources/Textures/DeltaV/Structures/Machines/VendingMachines/pride.rsi/normal-unshaded.png differ diff --git a/Resources/Textures/DeltaV/Structures/Machines/VendingMachines/pride.rsi/off.png b/Resources/Textures/DeltaV/Structures/Machines/VendingMachines/pride.rsi/off.png index 4e1dc9af28..ae6632406d 100644 Binary files a/Resources/Textures/DeltaV/Structures/Machines/VendingMachines/pride.rsi/off.png and b/Resources/Textures/DeltaV/Structures/Machines/VendingMachines/pride.rsi/off.png differ diff --git a/Resources/Textures/Structures/Wallmounts/flags.rsi/lgbtq_flag.png b/Resources/Textures/Structures/Wallmounts/flags.rsi/lgbtq_flag.png index 36237bb459..f55a373520 100644 Binary files a/Resources/Textures/Structures/Wallmounts/flags.rsi/lgbtq_flag.png and b/Resources/Textures/Structures/Wallmounts/flags.rsi/lgbtq_flag.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Belt/NPZ.rsi/equipped-BELT.png b/Resources/Textures/_LostParadise/Clothing/Belt/NPZ.rsi/equipped-BELT.png new file mode 100644 index 0000000000..829290815f Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Belt/NPZ.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Belt/NPZ.rsi/icon.png b/Resources/Textures/_LostParadise/Clothing/Belt/NPZ.rsi/icon.png new file mode 100644 index 0000000000..f96b887efa Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Belt/NPZ.rsi/icon.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Belt/NPZ.rsi/inhand-left.png b/Resources/Textures/_LostParadise/Clothing/Belt/NPZ.rsi/inhand-left.png new file mode 100644 index 0000000000..fb2f37311e Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Belt/NPZ.rsi/inhand-left.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Belt/NPZ.rsi/inhand-right.png b/Resources/Textures/_LostParadise/Clothing/Belt/NPZ.rsi/inhand-right.png new file mode 100644 index 0000000000..b316c80418 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Belt/NPZ.rsi/inhand-right.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Belt/NPZ.rsi/meta.json b/Resources/Textures/_LostParadise/Clothing/Belt/NPZ.rsi/meta.json new file mode 100644 index 0000000000..52e124d9dc --- /dev/null +++ b/Resources/Textures/_LostParadise/Clothing/Belt/NPZ.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Resprited by MegaDaimond", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +}