From c3221e30ab2d8900ce49cd510ef6e9b70d229772 Mon Sep 17 00:00:00 2001 From: Morb0 <14136326+Morb0@users.noreply.github.com> Date: Fri, 21 Jun 2024 22:07:04 +0300 Subject: [PATCH] Fix locale --- .../machines/medical/chemistry_machines.ftl | 5 ++--- Resources/Prototypes/Corvax/Maps/astra.yml | 3 --- Resources/Prototypes/Corvax/Maps/avrite.yml | 3 --- Resources/Prototypes/Corvax/Maps/delta.yml | 3 --- Resources/Prototypes/Corvax/Maps/frame.yml | 3 --- Resources/Prototypes/Corvax/Maps/ishimura.yml | 3 --- Resources/Prototypes/Corvax/Maps/maus.yml | 3 --- Resources/Prototypes/Corvax/Maps/pearl.yml | 5 +---- Resources/Prototypes/Corvax/Maps/pilgrim.yml | 3 --- Resources/Prototypes/Corvax/Maps/terra.yml | 3 --- .../Clothing/Head/Hats/brownfedora.rsi/meta.json | 4 ---- .../Clothing/Head/Helmets/security.rsi/meta.json | 8 -------- .../Clothing/Uniforms/Jumpskirt/warden.rsi/meta.json | 12 ------------ .../Clothing/Uniforms/Jumpsuit/hos.rsi/meta.json | 4 ++-- .../Uniforms/Jumpsuit/security.rsi/meta.json | 4 ++-- .../Clothing/Uniforms/Jumpsuit/warden.rsi/meta.json | 4 ++-- 16 files changed, 9 insertions(+), 61 deletions(-) diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/medical/chemistry_machines.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/medical/chemistry_machines.ftl index da9f5ea8b2f..468cab28e7e 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/medical/chemistry_machines.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/medical/chemistry_machines.ftl @@ -1,6 +1,5 @@ -ent-BaseTabletopChemicalMachine = { ent-['BaseMachinePowered', 'SmallConstructibleMachine'] } - - .desc = { ent-['BaseMachinePowered', 'SmallConstructibleMachine'].desc } +ent-BaseTabletopChemicalMachine = { ent-BaseMachinePowered } + .desc = { ent-BaseMachinePowered.desc } ent-MachineElectrolysisUnit = electrolysis unit .desc = The latest in medicinal electrocution technology. ent-MachineCentrifuge = tabletop centrifuge diff --git a/Resources/Prototypes/Corvax/Maps/astra.yml b/Resources/Prototypes/Corvax/Maps/astra.yml index 8e147b7ba22..a784d15b5f9 100644 --- a/Resources/Prototypes/Corvax/Maps/astra.yml +++ b/Resources/Prototypes/Corvax/Maps/astra.yml @@ -14,9 +14,6 @@ prefixCreator: 'MT' - type: StationEmergencyShuttle emergencyShuttlePath: /Maps/Shuttles/corvax_emergency.yml - - type: StationRandomTransform - enableStationRotation: false - maxStationOffset: null - type: StationJobs availableJobs: # service diff --git a/Resources/Prototypes/Corvax/Maps/avrite.yml b/Resources/Prototypes/Corvax/Maps/avrite.yml index 0d8ff0c5dd6..a2c76236b54 100644 --- a/Resources/Prototypes/Corvax/Maps/avrite.yml +++ b/Resources/Prototypes/Corvax/Maps/avrite.yml @@ -12,9 +12,6 @@ nameGenerator: !type:NanotrasenNameGenerator prefixCreator: 'SY' - - type: StationRandomTransform - enableStationRotation: false - maxStationOffset: null - type: StationEmergencyShuttle emergencyShuttlePath: /Maps/Shuttles/emergency_corvaxavrit.yml - type: StationJobs diff --git a/Resources/Prototypes/Corvax/Maps/delta.yml b/Resources/Prototypes/Corvax/Maps/delta.yml index 637cfdb1bb9..3c8bc2e6aae 100644 --- a/Resources/Prototypes/Corvax/Maps/delta.yml +++ b/Resources/Prototypes/Corvax/Maps/delta.yml @@ -14,9 +14,6 @@ prefixCreator: 'TG' - type: StationEmergencyShuttle emergencyShuttlePath: /Maps/Shuttles/emergency_corvaxdelta.yml - - type: StationRandomTransform - enableStationRotation: false - maxStationOffset: null - type: StationJobs availableJobs: Borg: [ 2, 3 ] diff --git a/Resources/Prototypes/Corvax/Maps/frame.yml b/Resources/Prototypes/Corvax/Maps/frame.yml index 71129ce8bc2..9dfa1c31aa6 100644 --- a/Resources/Prototypes/Corvax/Maps/frame.yml +++ b/Resources/Prototypes/Corvax/Maps/frame.yml @@ -43,9 +43,6 @@ - /Maps/Ruins/syndicate_dropship.yml - /Maps/Ruins/whiteship_ancient.yml - /Maps/Ruins/whiteship_bluespacejumper.yml - - type: StationRandomTransform - enableStationRotation: false - maxStationOffset: null - type: StationJobs availableJobs: # service diff --git a/Resources/Prototypes/Corvax/Maps/ishimura.yml b/Resources/Prototypes/Corvax/Maps/ishimura.yml index f295a7eb0e8..13d139e45cc 100644 --- a/Resources/Prototypes/Corvax/Maps/ishimura.yml +++ b/Resources/Prototypes/Corvax/Maps/ishimura.yml @@ -8,9 +8,6 @@ Ishimura: stationProto: StandardNanotrasenStation components: - - type: StationRandomTransform - enableStationRotation: false - maxStationOffset: null - type: StationNameSetup mapNameTemplate: '{0} USG Ishimura {1}' nameGenerator: diff --git a/Resources/Prototypes/Corvax/Maps/maus.yml b/Resources/Prototypes/Corvax/Maps/maus.yml index eb3934b60cc..2ad98cbf2b4 100644 --- a/Resources/Prototypes/Corvax/Maps/maus.yml +++ b/Resources/Prototypes/Corvax/Maps/maus.yml @@ -17,9 +17,6 @@ emergencyShuttlePath: /Maps/Shuttles/emergency_maus.yml - type: StationCargoShuttle path: /Maps/Shuttles/cargo_maus.yml - - type: StationRandomTransform - enableStationRotation: false - maxStationOffset: null - type: StationJobs availableJobs: CargoTechnician: [ 2, 2 ] diff --git a/Resources/Prototypes/Corvax/Maps/pearl.yml b/Resources/Prototypes/Corvax/Maps/pearl.yml index db7dbdbac69..30aa8710b24 100644 --- a/Resources/Prototypes/Corvax/Maps/pearl.yml +++ b/Resources/Prototypes/Corvax/Maps/pearl.yml @@ -13,9 +13,6 @@ nameGenerator: !type:NanotrasenNameGenerator prefixCreator: 'SS' - - type: StationRandomTransform - enableStationRotation: false - maxStationOffset: null - type: StationEmergencyShuttle emergencyShuttlePath: /Maps/Shuttles/corvax_emergency.yml - type: StationArrivals @@ -66,4 +63,4 @@ # cargo Quartermaster: [ 1, 1 ] SalvageSpecialist: [ 3, 3 ] - CargoTechnician: [ 3, 3 ] \ No newline at end of file + CargoTechnician: [ 3, 3 ] diff --git a/Resources/Prototypes/Corvax/Maps/pilgrim.yml b/Resources/Prototypes/Corvax/Maps/pilgrim.yml index d4fd13eb89a..a855abd0f5a 100644 --- a/Resources/Prototypes/Corvax/Maps/pilgrim.yml +++ b/Resources/Prototypes/Corvax/Maps/pilgrim.yml @@ -12,9 +12,6 @@ nameGenerator: !type:NanotrasenNameGenerator prefixCreator: 'TA' - - type: StationRandomTransform - enableStationRotation: false - maxStationOffset: null - type: StationEmergencyShuttle emergencyShuttlePath: /Maps/Shuttles/emergency_pilgrim.yml - type: StationJobs diff --git a/Resources/Prototypes/Corvax/Maps/terra.yml b/Resources/Prototypes/Corvax/Maps/terra.yml index 0a0c08a8602..26b2c53e571 100644 --- a/Resources/Prototypes/Corvax/Maps/terra.yml +++ b/Resources/Prototypes/Corvax/Maps/terra.yml @@ -15,9 +15,6 @@ prefixCreator: 'MT' - type: StationEmergencyShuttle emergencyShuttlePath: /Maps/Shuttles/corvax_emergency.yml - - type: StationRandomTransform - enableStationRotation: false - maxStationOffset: null - type: StationBiome biome: TerraPlanet mapLightColor: "#090303FF" diff --git a/Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/meta.json index 2a407dcc753..56b194c573d 100644 --- a/Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/meta.json @@ -14,10 +14,6 @@ "name": "equipped-HELMET", "directions": 4 }, - { - "name": "equipped-HELMET-hamster", - "directions": 4 - }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Head/Helmets/security.rsi/meta.json b/Resources/Textures/Clothing/Head/Helmets/security.rsi/meta.json index c3c3c5832e7..df46b471e37 100644 --- a/Resources/Textures/Clothing/Head/Helmets/security.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Helmets/security.rsi/meta.json @@ -18,14 +18,6 @@ "name": "equipped-HELMET-vox", "directions": 4 }, - { - "name": "light-equipped-HELMET", - "directions": 4 - }, - { - "name": "lighton-equipped-HELMET", - "directions": 4 - }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/meta.json index 75457c53a69..e4172bf64bc 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/meta.json @@ -13,18 +13,6 @@ { "name": "equipped-INNERCLOTHING", "directions": 4 - }, - { - "name": "equipped-INNERCLOTHING-monkey", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/meta.json index 06779492278..69b81db0aad 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/meta.json @@ -23,11 +23,11 @@ "directions": 4 }, { - "name": "inhand-left", + "name": "overlay-inhand-left", "directions": 4 }, { - "name": "inhand-right", + "name": "overlay-inhand-right", "directions": 4 } ] diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/meta.json index 06779492278..69b81db0aad 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/meta.json @@ -23,11 +23,11 @@ "directions": 4 }, { - "name": "inhand-left", + "name": "overlay-inhand-left", "directions": 4 }, { - "name": "inhand-right", + "name": "overlay-inhand-right", "directions": 4 } ] diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/meta.json index 06779492278..69b81db0aad 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/meta.json @@ -23,11 +23,11 @@ "directions": 4 }, { - "name": "inhand-left", + "name": "overlay-inhand-left", "directions": 4 }, { - "name": "inhand-right", + "name": "overlay-inhand-right", "directions": 4 } ]