From 589edd2021670b1e13b824250028ad668ca8da6a Mon Sep 17 00:00:00 2001 From: NULL882 Date: Sat, 25 Oct 2025 21:40:51 +0300 Subject: [PATCH 1/3] some locale --- .../Prototypes/_Forge/Recipes/Lathes/Packs/CorvaxPacks.yml | 2 +- Resources/Prototypes/_Forge/Syndicate/data.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/_Forge/Recipes/Lathes/Packs/CorvaxPacks.yml b/Resources/Prototypes/_Forge/Recipes/Lathes/Packs/CorvaxPacks.yml index 286588bffcb1..0879d81941b3 100644 --- a/Resources/Prototypes/_Forge/Recipes/Lathes/Packs/CorvaxPacks.yml +++ b/Resources/Prototypes/_Forge/Recipes/Lathes/Packs/CorvaxPacks.yml @@ -307,7 +307,7 @@ - JugBluespaceInter # - 50000 спесо (контрабандные) - PowerCellSyndicateInter -# Конвентер кэша +# Конвертер кэша - type: latheRecipePack id: SyndicateTradingCash recipes: diff --git a/Resources/Prototypes/_Forge/Syndicate/data.yml b/Resources/Prototypes/_Forge/Syndicate/data.yml index c33c1fc1b0f0..96bf0dbf98ec 100644 --- a/Resources/Prototypes/_Forge/Syndicate/data.yml +++ b/Resources/Prototypes/_Forge/Syndicate/data.yml @@ -82,7 +82,7 @@ - type: entity parent: [ BaseLatheLube, BaseStructureDisableToolUse ] id: SyndicateDataConventor - name: конвентер кэша Синдиката + name: конвертер кэша Синдиката description: Сервер на котором хранятся ужасные данные Синдиката. Тут имеется слот для кэша. components: - type: Sprite From 1bcd7ef8443c2108f28fb644e54ee0df4929efeb Mon Sep 17 00:00:00 2001 From: NULL882 Date: Sat, 25 Oct 2025 21:51:33 +0300 Subject: [PATCH 2/3] whoops --- ...\272\320\276\320\277\320\270\321\217.json" | 26 ------------------- 1 file changed, 26 deletions(-) delete mode 100644 "Resources/Textures/Forge/Clothing/Belt/syndicatewebbingcom.rsi/meta \342\200\224 \320\272\320\276\320\277\320\270\321\217.json" diff --git "a/Resources/Textures/Forge/Clothing/Belt/syndicatewebbingcom.rsi/meta \342\200\224 \320\272\320\276\320\277\320\270\321\217.json" "b/Resources/Textures/Forge/Clothing/Belt/syndicatewebbingcom.rsi/meta \342\200\224 \320\272\320\276\320\277\320\270\321\217.json" deleted file mode 100644 index 5f4bc443cbb8..000000000000 --- "a/Resources/Textures/Forge/Clothing/Belt/syndicatewebbingcom.rsi/meta \342\200\224 \320\272\320\276\320\277\320\270\321\217.json" +++ /dev/null @@ -1,26 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039 and modified by emisse for ss14", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - }, - { - "name": "equipped-BELT", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} From 834253864faca10419255692fa72980877a8b09e Mon Sep 17 00:00:00 2001 From: NULL882 Date: Sat, 25 Oct 2025 22:10:24 +0300 Subject: [PATCH 3/3] =?UTF-8?q?fix=20checkes=20=E2=84=961?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Entities/Clothing/OuterClothing/hardsuits.yml | 2 +- .../Prototypes/_Forge/Catalog/Fills/Paper/forms_nfsd.yml | 6 ------ Resources/Prototypes/_Forge/Clothing/Wallet/leather.yml | 2 +- .../_Forge/Entities/Objects/Weapons/Melee/synd_saber.yml | 1 - Resources/Prototypes/_Forge/Syndicate/Kits/CommanderKit.yml | 2 +- Resources/Prototypes/_Forge/Syndicate/Kits/ShturmKit.yml | 2 +- Resources/Prototypes/_Forge/radio_channels.yml | 4 ++-- .../_NF/Entities/Clothing/OuterClothing/hardsuits.yml | 2 +- 8 files changed, 7 insertions(+), 14 deletions(-) diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml index a6045d359c68..db1883ec15a2 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml @@ -625,7 +625,7 @@ damageCoefficient: 0.3 - type: Armor modifiers: - coefficients: + coefficients: Blunt: 0.4 Slash: 0.4 Piercing: 0.35 diff --git a/Resources/Prototypes/_Forge/Catalog/Fills/Paper/forms_nfsd.yml b/Resources/Prototypes/_Forge/Catalog/Fills/Paper/forms_nfsd.yml index bd1003fc8a1b..ad56234ba5cf 100644 --- a/Resources/Prototypes/_Forge/Catalog/Fills/Paper/forms_nfsd.yml +++ b/Resources/Prototypes/_Forge/Catalog/Fills/Paper/forms_nfsd.yml @@ -1,9 +1,3 @@ -# Station Representative Forms -# Sources: https://discord.com/channels/1123826877245694004/1182366744266932224/1182366744266932224 -# https://docs.google.com/document/d/1jDX9numj-VHKBJ2FiiEo1GIlHESffOUIHIIXaqhEnls/edit?pli=1#heading=h.ru93r8n0fb7m -# These forms should be kept up-to-date with changes to Space Law. - -# Filled Folder - type: entity id: ForgeFillNfsdForms abstract: true diff --git a/Resources/Prototypes/_Forge/Clothing/Wallet/leather.yml b/Resources/Prototypes/_Forge/Clothing/Wallet/leather.yml index ddbfb56ba0ab..ea47a028985d 100644 --- a/Resources/Prototypes/_Forge/Clothing/Wallet/leather.yml +++ b/Resources/Prototypes/_Forge/Clothing/Wallet/leather.yml @@ -72,4 +72,4 @@ visible: false - state: closed-coin map: ["closed-coin"] - visible: false \ No newline at end of file + visible: false diff --git a/Resources/Prototypes/_Forge/Entities/Objects/Weapons/Melee/synd_saber.yml b/Resources/Prototypes/_Forge/Entities/Objects/Weapons/Melee/synd_saber.yml index 9ba323d10c3b..d7e06f2d35c7 100644 --- a/Resources/Prototypes/_Forge/Entities/Objects/Weapons/Melee/synd_saber.yml +++ b/Resources/Prototypes/_Forge/Entities/Objects/Weapons/Melee/synd_saber.yml @@ -70,4 +70,3 @@ tags: - SyndicateSabre - type: DisarmMalus - \ No newline at end of file diff --git a/Resources/Prototypes/_Forge/Syndicate/Kits/CommanderKit.yml b/Resources/Prototypes/_Forge/Syndicate/Kits/CommanderKit.yml index c60fe79fc037..a3a3d4d05610 100644 --- a/Resources/Prototypes/_Forge/Syndicate/Kits/CommanderKit.yml +++ b/Resources/Prototypes/_Forge/Syndicate/Kits/CommanderKit.yml @@ -24,4 +24,4 @@ enum.ThiefBackpackUIKey.Key: type: ThiefBackpackBoundUserInterface - type: Contraband # Frontier - hideValues: true # Frontier \ No newline at end of file + hideValues: true # Frontier diff --git a/Resources/Prototypes/_Forge/Syndicate/Kits/ShturmKit.yml b/Resources/Prototypes/_Forge/Syndicate/Kits/ShturmKit.yml index 0dec3fabe59a..4d9958b5284e 100644 --- a/Resources/Prototypes/_Forge/Syndicate/Kits/ShturmKit.yml +++ b/Resources/Prototypes/_Forge/Syndicate/Kits/ShturmKit.yml @@ -22,4 +22,4 @@ enum.ThiefBackpackUIKey.Key: type: ThiefBackpackBoundUserInterface - type: Contraband # Frontier - hideValues: true # Frontier \ No newline at end of file + hideValues: true # Frontier diff --git a/Resources/Prototypes/_Forge/radio_channels.yml b/Resources/Prototypes/_Forge/radio_channels.yml index 9743a33da465..b883be876875 100644 --- a/Resources/Prototypes/_Forge/radio_channels.yml +++ b/Resources/Prototypes/_Forge/radio_channels.yml @@ -1,6 +1,6 @@ - type: radioChannel id: SyndicateSmuggler - name: Контрабандист + name: radio-smuggler keycode: 'й' frequency: 1246 color: "#9e1500" @@ -8,7 +8,7 @@ - type: radioChannel id: SyndicateShturm - name: Жнецы + name: radio-shturm keycode: 'у' frequency: 5603 color: "#680721" diff --git a/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/hardsuits.yml index 437680a1fd34..406df3fc6ac0 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/hardsuits.yml @@ -223,7 +223,7 @@ damageCoefficient: 0.3 - type: Armor modifiers: - coefficients: + coefficients: Blunt: 0.4 Slash: 0.4 Piercing: 0.35