diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/deltav/entities/objects/devices/station_beacon.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/deltav/entities/objects/devices/station_beacon.ftl index 948497d36bc..925d4396476 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/deltav/entities/objects/devices/station_beacon.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/deltav/entities/objects/devices/station_beacon.ftl @@ -52,6 +52,6 @@ ent-DefaultStationBeaconJustice = { ent-DefaultStationBeacon } ent-DefaultStationBeaconChiefJustice = { ent-DefaultStationBeaconJustice } .suffix = Chief Justice .desc = { ent-DefaultStationBeaconJustice.desc } -ent-DefaultStationBeaconProsecutor = { ent-DefaultStationBeaconJustice } +ent-DefaultStationBeaconProsecutor = { ent-DefaultStationBeacon } .suffix = Prosecutor - .desc = { ent-DefaultStationBeaconJustice.desc } + .desc = { ent-DefaultStationBeacon.desc } diff --git a/Resources/Locale/ru-RU/navmap-beacons/station-beacons.ftl b/Resources/Locale/ru-RU/navmap-beacons/station-beacons.ftl index bbf71b73c2e..80a80605353 100644 --- a/Resources/Locale/ru-RU/navmap-beacons/station-beacons.ftl +++ b/Resources/Locale/ru-RU/navmap-beacons/station-beacons.ftl @@ -65,3 +65,4 @@ station-beacon-tools = Хранилище инструментов station-beacon-disposals = Мусоросброс station-beacon-cryosleep = Криосон station-beacon-escape-pod = Спасательная капсула + diff --git a/Resources/Locale/ru-RU/nyanotrasen/ghost/roles/ghost-role-component.ftl b/Resources/Locale/ru-RU/nyanotrasen/ghost/roles/ghost-role-component.ftl index 8a73337795a..1e7ebf680e9 100644 --- a/Resources/Locale/ru-RU/nyanotrasen/ghost/roles/ghost-role-component.ftl +++ b/Resources/Locale/ru-RU/nyanotrasen/ghost/roles/ghost-role-component.ftl @@ -2,3 +2,5 @@ ghost-role-information-giant-spider-vampire-name = Онейрофаг ghost-role-information-giant-spider-vampire-description = Гнездо. Приманка. Засада. Потреблять. ghost-role-information-cancer-mouse-name = Раковая мышь ghost-role-information-cancer-mouse-description = Делайте цветные комментарии, но не настолько резкие, чтобы они нарушали правила сервера. +ghost-role-information-friendlyxeno-name = Нейтральный ксеноморф +ghost-role-information-friendlyxeno-description = Вы — одиночный ксеноморф, оторвавшийся от основного гнезда, решивший первым не нападать на живых существ. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/entities/objects/devices/station_beacon.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/entities/objects/devices/station_beacon.ftl index 724d9016f96..39ca049be2a 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/entities/objects/devices/station_beacon.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/entities/objects/devices/station_beacon.ftl @@ -52,6 +52,6 @@ ent-DefaultStationBeaconJustice = { ent-DefaultStationBeacon } ent-DefaultStationBeaconChiefJustice = { ent-DefaultStationBeaconJustice } .suffix = Кабинет верховного судьи .desc = { ent-DefaultStationBeaconJustice.desc } -ent-DefaultStationBeaconProsecutor = { ent-DefaultStationBeaconJustice } +ent-DefaultStationBeaconProsecutor = { ent-DefaultStationBeacon } .suffix = Кабинет прокурора - .desc = { ent-DefaultStationBeaconJustice.desc } + .desc = { ent-DefaultStationBeacon.desc } diff --git a/Resources/Locale/ru-RU/station-goal/station-goals.ftl b/Resources/Locale/ru-RU/station-goal/station-goals.ftl index e056496edfa..09614d0701c 100644 --- a/Resources/Locale/ru-RU/station-goal/station-goals.ftl +++ b/Resources/Locale/ru-RU/station-goal/station-goals.ftl @@ -87,7 +87,7 @@ station-goal-anomalies = 2. Физическое описание; 3. Пассивные свойства; 4. Реакция аномалии на различные частицы; - 5. Последствия коллапса; + 5. Последствия импульса; 6. Местоположение аномалии. Документ необходимо заверить печатью руководителя научно-исследовательского отдела и отправить по факсу в Центральное Командование. diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/station_beacon.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/station_beacon.yml index bd3975767ba..d6ffa2c24a2 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/station_beacon.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/station_beacon.yml @@ -1,113 +1,113 @@ #Command - type: entity - parent: DefaultStationBeaconCommand + parent: DefaultStationBeacon id: DefaultStationBeaconConferenceRoom suffix: Conference Room components: - type: NavMapBeacon - text: station-beacon-conference-room + defaultText: station-beacon-conference-room #Medical - type: entity - parent: DefaultStationBeaconMedical + parent: DefaultStationBeacon id: DefaultStationBeaconVirology suffix: Virology components: - type: NavMapBeacon - text: station-beacon-virology + defaultText: station-beacon-virology - type: entity - parent: DefaultStationBeaconMedical + parent: DefaultStationBeacon id: DefaultStationBeaconMetempsychosis suffix: Cloning #Metempsychosis components: - type: NavMapBeacon - text: station-beacon-metempsychosis + defaultText: station-beacon-metempsychosis - type: entity - parent: DefaultStationBeaconMedical + parent: DefaultStationBeacon id: DefaultStationBeaconExam suffix: Exam components: - type: NavMapBeacon - text: station-beacon-exam + defaultText: station-beacon-exam - type: entity - parent: DefaultStationBeaconMedical + parent: DefaultStationBeacon id: DefaultStationBeaconMedicalOutpost suffix: Medical Outpost components: - type: NavMapBeacon - text: station-beacon-med-outpost + defaultText: station-beacon-med-outpost - type: entity - parent: DefaultStationBeaconMedical + parent: DefaultStationBeacon id: DefaultStationBeaconPsychologist suffix: Psych components: - type: NavMapBeacon - text: station-beacon-psych + defaultText: station-beacon-psych #Epistemics - type: entity - parent: DefaultStationBeaconScience + parent: DefaultStationBeacon id: DefaultStationBeaconProber suffix: Prober components: - type: NavMapBeacon - text: station-beacon-glimmer-prober + defaultText: station-beacon-glimmer-prober - type: entity - parent: DefaultStationBeaconScience + parent: DefaultStationBeacon id: DefaultStationBeaconMantis suffix: Mantis components: - type: NavMapBeacon - text: station-beacon-forensic-mantis + defaultText: station-beacon-forensic-mantis #Logistics - type: entity - parent: DefaultStationBeaconSupply + parent: DefaultStationBeacon id: DefaultStationBeaconMailroom suffix: Mailroom components: - type: NavMapBeacon - text: station-beacon-mailroom + defaultText: station-beacon-mailroom #Engineering - type: entity - parent: DefaultStationBeaconEngineering + parent: DefaultStationBeacon id: DefaultStationBeaconEngiOutpost suffix: Engi Outpost components: - type: NavMapBeacon - text: station-beacon-engi-outpost + defaultText: station-beacon-engi-outpost #Service - type: entity - parent: DefaultStationBeaconService + parent: DefaultStationBeacon id: DefaultStationBeaconJanitorsOffice suffix: Janitor's Office components: - type: NavMapBeacon - text: station-beacon-janitor-office + defaultText: station-beacon-janitor-office - type: entity - parent: DefaultStationBeaconService + parent: DefaultStationBeacon id: DefaultStationBeaconReporter suffix: Reporter components: - type: NavMapBeacon - text: station-beacon-reporter + defaultText: station-beacon-reporter #Surveilance - type: entity - parent: DefaultStationBeaconAI + parent: DefaultStationBeacon id: DefaultStationBeaconCameraServerRoom suffix: Camera Servers components: - type: NavMapBeacon - text: station-beacon-camera-servers + defaultText: station-beacon-camera-servers #General - type: entity @@ -116,7 +116,7 @@ suffix: Boxing Ring components: - type: NavMapBeacon - text: station-beacon-boxing-ring + defaultText: station-beacon-boxing-ring - type: entity parent: DefaultStationBeacon @@ -124,16 +124,16 @@ suffix: Park components: - type: NavMapBeacon - text: station-beacon-park + defaultText: station-beacon-park #Security - type: entity - parent: DefaultStationBeaconSecurity + parent: DefaultStationBeacon id: DefaultStationBeaconCorpsman suffix: Corpsman components: - type: NavMapBeacon - text: station-beacon-corpsman + defaultText: station-beacon-corpsman #Justice - type: entity @@ -142,20 +142,20 @@ suffix: Justice components: - type: NavMapBeacon - text: station-beacon-justice + defaultText: station-beacon-justice - type: entity - parent: DefaultStationBeaconJustice + parent: DefaultStationBeacon id: DefaultStationBeaconChiefJustice suffix: Chief Justice components: - type: NavMapBeacon - text: station-beacon-chiefjustice + defaultText: station-beacon-chiefjustice - type: entity - parent: DefaultStationBeaconJustice + parent: DefaultStationBeacon id: DefaultStationBeaconProsecutor suffix: Prosecutor components: - type: NavMapBeacon - text: station-beacon-prosecutor + defaultText: station-beacon-prosecutor diff --git a/Resources/Prototypes/Traits/physical.yml b/Resources/Prototypes/Traits/physical.yml index eb60e352b7e..7bfb620fa8c 100644 --- a/Resources/Prototypes/Traits/physical.yml +++ b/Resources/Prototypes/Traits/physical.yml @@ -473,120 +473,120 @@ - type: Damageable damageModifierSet: DermalArmor -- type: trait - id: CyberEyes - category: Physical - points: -8 - requirements: - - !type:CharacterJobRequirement - inverted: true - jobs: - - Prisoner # Bionics should be "Confiscated" from long term prisoners. - - !type:CharacterTraitRequirement - inverted: true - traits: - - Photophobia - - Blindness - - Nearsighted - componentRemovals: - - Flashable - components: - - type: FlashImmunity - - type: EyeProtection - - type: CyberEyes +# - type: trait +# id: CyberEyes +# category: Physical +# points: -8 +# requirements: +# - !type:CharacterJobRequirement +# inverted: true +# jobs: +# - Prisoner # Bionics should be "Confiscated" from long term prisoners. +# - !type:CharacterTraitRequirement +# inverted: true +# traits: +# - Photophobia +# - Blindness +# - Nearsighted +# componentRemovals: +# - Flashable +# components: +# - type: FlashImmunity +# - type: EyeProtection +# - type: CyberEyes -- type: trait - id: CyberEyesSecurity - category: Physical - points: -1 - requirements: - - !type:CharacterJobRequirement - inverted: true - jobs: - - Prisoner # Bionics should be "Confiscated" from long term prisoners. - - !type:CharacterDepartmentRequirement - departments: - - Security - - !type:CharacterTraitRequirement - traits: - - CyberEyes - - !type:CharacterTraitRequirement - inverted: true - traits: - - CyberEyesOmni - components: - - type: ShowSecurityIcons +# - type: trait +# id: CyberEyesSecurity +# category: Physical +# points: -1 +# requirements: +# - !type:CharacterJobRequirement +# inverted: true +# jobs: +# - Prisoner # Bionics should be "Confiscated" from long term prisoners. +# - !type:CharacterDepartmentRequirement +# departments: +# - Security +# - !type:CharacterTraitRequirement +# traits: +# - CyberEyes +# - !type:CharacterTraitRequirement +# inverted: true +# traits: +# - CyberEyesOmni +# components: +# - type: ShowSecurityIcons -- type: trait - id: CyberEyesMedical - category: Physical - points: -1 - requirements: - - !type:CharacterJobRequirement - inverted: true - jobs: - - Prisoner # Bionics should be "Confiscated" from long term prisoners. - - !type:CharacterTraitRequirement - traits: - - CyberEyes - - !type:CharacterTraitRequirement - inverted: true - traits: - - CyberEyesDiagnostic - - CyberEyesOmni - components: - - type: ShowHealthBars - damageContainers: - - Biological +# - type: trait +# id: CyberEyesMedical +# category: Physical +# points: -1 +# requirements: +# - !type:CharacterJobRequirement +# inverted: true +# jobs: +# - Prisoner # Bionics should be "Confiscated" from long term prisoners. +# - !type:CharacterTraitRequirement +# traits: +# - CyberEyes +# - !type:CharacterTraitRequirement +# inverted: true +# traits: +# - CyberEyesDiagnostic +# - CyberEyesOmni +# components: +# - type: ShowHealthBars +# damageContainers: +# - Biological -- type: trait - id: CyberEyesDiagnostic - category: Physical - points: -1 - requirements: - - !type:CharacterJobRequirement - inverted: true - jobs: - - Prisoner # Bionics should be "Confiscated" from long term prisoners. - - !type:CharacterTraitRequirement - traits: - - CyberEyes - - !type:CharacterTraitRequirement - inverted: true - traits: - - CyberEyesMedical - - CyberEyesOmni - components: - - type: ShowHealthBars - damageContainers: - - Inorganic - - Silicon +# - type: trait +# id: CyberEyesDiagnostic +# category: Physical +# points: -1 +# requirements: +# - !type:CharacterJobRequirement +# inverted: true +# jobs: +# - Prisoner # Bionics should be "Confiscated" from long term prisoners. +# - !type:CharacterTraitRequirement +# traits: +# - CyberEyes +# - !type:CharacterTraitRequirement +# inverted: true +# traits: +# - CyberEyesMedical +# - CyberEyesOmni +# components: +# - type: ShowHealthBars +# damageContainers: +# - Inorganic +# - Silicon -- type: trait - id: CyberEyesOmni - category: Physical - points: -3 - requirements: - - !type:CharacterJobRequirement - inverted: true - jobs: - - Prisoner # Bionics should be "Confiscated" from long term prisoners. - - !type:CharacterDepartmentRequirement - departments: - - Security - - !type:CharacterTraitRequirement - traits: - - CyberEyes - - !type:CharacterTraitRequirement - inverted: true - traits: - - CyberEyesMedical - - CyberEyesDiagnostic - - CyberEyesSecurity - components: - - type: ShowSecurityIcons - - type: ShowHealthBars - damageContainers: - - Biological - - Inorganic - - Silicon +# - type: trait +# id: CyberEyesOmni +# category: Physical +# points: -3 +# requirements: +# - !type:CharacterJobRequirement +# inverted: true +# jobs: +# - Prisoner # Bionics should be "Confiscated" from long term prisoners. +# - !type:CharacterDepartmentRequirement +# departments: +# - Security +# - !type:CharacterTraitRequirement +# traits: +# - CyberEyes +# - !type:CharacterTraitRequirement +# inverted: true +# traits: +# - CyberEyesMedical +# - CyberEyesDiagnostic +# - CyberEyesSecurity +# components: +# - type: ShowSecurityIcons +# - type: ShowHealthBars +# damageContainers: +# - Biological +# - Inorganic +# - Silicon