Merge pull request #114 from Gorox221/tsf

Пак ТСФ

Resources/Locale/ru-RU/ganimed/entities/clothing/tsf_clothing.ftl

@@ -0,0 +1,12 @@
+ent-ClothingUniformJumpsuitTSF = комбинезон флота
+    .desc = Выглядит технологично.
+ent-ClothingUniformJumpsuitTSFCommander = комбинезон командира флота
+    .desc = Выглядит технологично.
+ent-ClothingShoesBootsMagTSF = боевые магнитные ботинки
+    .desc = Обычные тапочки для военных.
+ent-ClothingHeadsetTSF = гарнитура ТСФ
+    .desc = Гарнитура, используемая ТСФ.
+ent-ClothingHeadHelmetHardsuitTSF = шлем скафандра ТСФ
+    .desc = Бронированный шлем, используемый военными скафандрами ТСФ.
+ent-ClothingOuterHardsuitTSF = легкий скафандр ТСФ
+    .desc = Скафандр, используемый флотом ТСФ.

Resources/Locale/ru-RU/headset/headset-component.ftl

@@ -24,5 +24,6 @@ chat-radio-deathsquad = Рыцари смерти
 chat-radio-ert = ОБР
 chat-radio-srt = ГСН
 chat-radio-mtf = МОГ
+chat-radio-tsf = ТСФ
 # not headset but whatever
 chat-radio-handheld = Портативный

Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/player/humanoid.ftl

@@ -48,3 +48,6 @@ ent-RandomHumanoidSpawnerCluwne = Клувень
 ent-RandomHumanoidSpawnerDeathSquad = Агент эскадрона смерти
     .suffix = ОБР, Эскадрон
     .desc = { "" }
+ent-RandomHumanoidSpawnerTSFNavy = Рекрут ТСФ
+    .suffix = ТСФ, EVA
+    .desc = { "" }

Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/encryption_keys.ftl

@@ -39,4 +39,6 @@ ent-EncryptionKeySRT = ключ шифрования ГСН
 ent-EncryptionKeyMTF = ключ шифрования МОГ
     .desc = Ключ шифрования, используемый МОГом.
 ent-EncryptionKeyERT = ключ шифрования ОБР
-    .desc = Ключ шифрования, используемый ОБР.
+    .desc = Ключ шифрования, используемый ОБР.
+ent-EncryptionKeyTSF = ключ шифрования ТСФ
+    .desc = Ключ шифрования, используемый ТСФ.

Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/pda.ftl

@@ -134,6 +134,8 @@ ent-CoronerPDA = КПК патологоанатома
     .desc = Пахнет сыростью и плесенью. И медициной.
 ent-BlueShieldPDA = КПК синего щита
     .desc = Для тех моментов, когда нужно включить мультики заскучавшему главе.
+ent-TSFPDA = КПК ТСФ
+    .desc = Может, нам пойти и убить ксеносов?
 ent-PiratePDA = КПК пирата
     .desc = Йарр!
 ent-SyndiAgentPDA = КПК синдиката

Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/identification_cards.ftl

@@ -136,6 +136,8 @@ ent-CoronerIDCard = ID карта патологоанатома
     .desc = { ent-IDCardStandard.desc }
 ent-BlueShieldIDCard = ID карта офицера синий щит
     .desc = { ent-IDCardStandard.desc }
+ent-TSFIDCard = ID карта представителя ТСФ
+    .desc = { ent-IDCardStandard.desc }
 ent-PirateIDCard = ID карта пирата
     .desc = { ent-IDCardStandard.desc }
 ent-PirateIDCard = ID карта пирата

Resources/Prototypes/Entities/Clothing/Ears/headsets.yml

@@ -390,4 +390,20 @@
   - type: Sprite
     sprite: Clothing/Ears/Headsets/specops.rsi
   - type: Clothing
-    sprite: Clothing/Ears/Headsets/specops.rsi
+    sprite: Clothing/Ears/Headsets/specops.rsi
+
+- type: entity
+  parent: ClothingHeadset
+  id: ClothingHeadsetTSF
+  name: SpecOps headset
+  description: A headset used by the upper echelons of TSF.
+  components:
+  - type: ContainerFill
+    containers:
+      key_slots:
+      - EncryptionKeyCommon
+      - EncryptionKeyTSF
+  - type: Sprite
+    sprite: Clothing/Ears/Headsets/tsf.rsi
+  - type: Clothing
+    sprite: Clothing/Ears/Headsets/tsf.rsi

Resources/Prototypes/Entities/Mobs/Player/humanoid.yml

@@ -472,3 +472,29 @@
       description: ghost-role-information-cluwne-description
     - type: GhostTakeoverAvailable
     - type: Cluwne
+
+- type: entity
+  id: RandomHumanoidSpawnerTSFNavy
+  name: TSF recruit
+  suffix: TSF, EVA
+  components:
+    - type: Sprite
+      sprite: Ganimed/Clothing/OuterClothing/Hardsuits/tsf.rsi
+      state: icon
+    - type: RandomMetadata
+      nameSegments:
+        - NamesFirstMilitary
+        - NamesLastMilitary
+    - type: RandomHumanoidSpawner
+      settings: TSFNavy
+
+- type: randomHumanoidSettings
+  id: TSFNavy
+  randomizeName: false
+  components:
+    - type: Loadout
+      prototypes: [ TSFHardsuitGear ]
+    - type: RandomMetadata
+      nameSegments:
+      - NamesFirstMilitary
+      - NamesLastMilitary

Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml

@@ -324,4 +324,19 @@
   - type: Sprite
     layers:
     - state: crypt_blue
-    - state: ert_label
+    - state: ert_label
+
+- type: entity
+  parent: EncryptionKey
+  id: EncryptionKeyTSF
+  name: TSF encryption key
+  description: An encryption key used by TSF.
+  components:
+  - type: EncryptionKey
+    channels:
+    - TSF
+    defaultChannel: TSF
+  - type: Sprite
+    layers:
+    - state: crypt_blue
+    - state: tsf_label

Resources/Prototypes/Entities/Objects/Devices/pda.yml

@@ -1368,3 +1368,24 @@
     borderColor: "#7C5D00"
   - type: Icon
     state: pda-bridgeofficer
+
+- type: entity
+  parent: BasePDA
+  id: TSFPDA
+  name: TSF PDA
+  description: Should we go and kill the xenos?
+  components:
+  - type: Pda
+    id: TSFIDCard
+    state: pda-tsf
+    penSlot:
+      startingItem: BlackFountainPen
+      priority: -1
+      whitelist:
+        tags:
+        - Write
+  - type: PdaBorderColor
+    borderColor: "#38507D"
+    accentVColor: "#38507D"
+  - type: Icon
+    state: pda-tsf

Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml

@@ -969,3 +969,22 @@
     layers:
     - state: default
     - state: idcoroner
+
+- type: entity
+  parent: IDCardStandard
+  id: TSFIDCard
+  name: TSF representative ID card
+  components:
+  - type: Sprite
+    layers:
+    - state: centcom
+    - state: idtsf
+  - type: Item
+    heldPrefix: blue
+  - type: IdCard
+    jobTitle: Представитель ТСФ
+    jobIcon: JobIconTSF
+    jobColor: "#2A5760"
+  - type: Access
+    access:
+     - Maintenance

Resources/Prototypes/Ganimed/Entities/Clothing/Head/hardsuit-helmets.yml

@@ -618,4 +618,31 @@
     color: "#7b9bf2"
   - type: PressureProtection
     highPressureMultiplier: 0.6
-    lowPressureMultiplier: 1000
+    lowPressureMultiplier: 1000
+
+- type: entity
+  parent: ClothingHeadHardsuitWithLightBase
+  id: ClothingHeadHelmetHardsuitTSF
+  noSpawn: true
+  name: TSF hardsuit helmet
+  description: Armored hardsuit helmet for millitary needs.
+  components:
+  - type: BreathMask
+  - type: Sprite
+    sprite: Ganimed/Clothing/Head/Hardsuits/tsf.rsi
+  - type: Clothing
+    sprite: Ganimed/Clothing/Head/Hardsuits/tsf.rsi
+  - type: PointLight
+    color: "#76f1fb"
+  - type: PressureProtection
+    highPressureMultiplier: 0.525
+    lowPressureMultiplier: 1000
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.9
+        Slash: 0.9
+        Piercing: 0.9
+        Heat: 0.9
+  - type: StaminaProtection
+    coefficient: 0.95

Resources/Prototypes/Ganimed/Entities/Clothing/OuterClothing/hardsuits.yml

@@ -870,4 +870,35 @@
   - type: Tag
     tags:
     - WhitelistChameleon
-    - HighRiskItem
+    - HighRiskItem
+
+- type: entity
+  parent: ClothingOuterHardsuitBase
+  id: ClothingOuterHardsuitTSF
+  name: security hardsuit
+  description: A spacesuit used by the TSF navy.
+  components:
+  - type: Sprite
+    sprite: Ganimed/Clothing/OuterClothing/Hardsuits/tsf.rsi
+  - type: Clothing
+    sprite: Ganimed/Clothing/OuterClothing/Hardsuits/tsf.rsi
+  - type: PressureProtection
+    highPressureMultiplier: 0.5
+    lowPressureMultiplier: 1000
+  - type: ExplosionResistance
+    damageCoefficient: 0.4
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.6
+        Slash: 0.6
+        Piercing: 0.6
+        Caustic: 0.7
+  - type: ClothingSpeedModifier
+    walkModifier: 0.9
+    sprintModifier: 0.9
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadHelmetHardsuitTSF
+  - type: StaminaProtection
+    coefficient: 0.55
+  - type: HeldSpeedModifier

Resources/Prototypes/Ganimed/Entities/Clothing/Shoes/tsf.yml

@@ -0,0 +1,58 @@
+#license: CLA
+#copyright: https://github.com/ss14-ganimed/ENT14-Master/blob/master/CLA.txt
+- type: entity
+  parent: ClothingShoesBase
+  id: ClothingShoesBootsMagTSF
+  name: battle magboots
+  description: Ordinary slippers for the military.
+  components:
+  - type: Sprite
+    sprite: Ganimed/Clothing/Shoes/tsf_magboots.rsi
+    state: icon
+  - type: Clothing
+    sprite: Ganimed/Clothing/Shoes/tsf_magboots.rsi
+  - type: Magboots
+    toggleAction: ActionToggleMagbootsTSF
+  - type: ClothingSpeedModifier
+    walkModifier: 0.85
+    sprintModifier: 0.8
+    enabled: false
+  - type: GasTank
+    outputPressure: 42.6
+    air:
+      # 2 minutes of thrust
+      volume: 0.75
+      temperature: 293.15
+      moles:
+        - 0.153853429 # oxygen
+        - 0.153853429 # nitrogen
+  - type: ActivatableUI
+    key: enum.SharedGasTankUiKey.Key
+  - type: UserInterface
+    interfaces:
+      - key: enum.SharedGasTankUiKey.Key
+        type: GasTankBoundUserInterface
+  - type: Explosive
+    explosionType: Default
+    maxIntensity: 20
+  - type: Jetpack
+    moleUsage: 0.00085
+  - type: CanMoveInAir
+  - type: InputMover
+    toParent: true
+  - type: MovementSpeedModifier
+    weightlessAcceleration: 1
+    weightlessFriction: 0.3
+    weightlessModifier: 1.2
+  - type: Tag
+    tags:
+      - WhitelistChameleon
+
+- type: entity
+  id: ActionToggleMagbootsTSF
+  parent: ActionBaseToggleMagboots
+  noSpawn: true
+  components:
+  - type: InstantAction
+    icon: { sprite: Ganimed/Clothing/Shoes/tsf_magboots.rsi, state: icon }
+    iconOn: Ganimed/Clothing/Shoes/tsf_magboots.rsi/icon-on.png

Resources/Prototypes/Ganimed/Entities/Clothing/Uniforms/tsf.yml

@@ -0,0 +1,30 @@
+#license: CLA
+#copyright: https://github.com/ss14-ganimed/ENT14-Master/blob/master/CLA.txt
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitTSF
+  name: Fleet jumpsuit
+  description: It looks technologically advanced.
+  components:
+  - type: Sprite
+    sprite: Ganimed/Clothing/Uniforms/tsf/tsf.rsi
+  - type: Clothing
+    sprite: Ganimed/Clothing/Uniforms/tsf/tsf.rsi
+  - type: Tag
+    tags:
+    - WhitelistChameleon
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitTSFCommander
+  name: Commander jumpsuit
+  description: It looks technologically advanced.
+  components:
+  - type: Sprite
+    sprite: Ganimed/Clothing/Uniforms/tsf/tsf_captain.rsi
+  - type: Clothing
+    sprite: Ganimed/Clothing/Uniforms/tsf/tsf_captain.rsi
+  - type: Tag
+    tags:
+    - WhitelistChameleon

Resources/Prototypes/Roles/Jobs/Fun/tsf.yml

@@ -0,0 +1,16 @@
+- type: startingGear
+  id: TSFHardsuitGear
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitTSF
+    back: ClothingMilitaryBackpack
+    shoes: ClothingShoesBootsMagTSF
+    eyes: ClothingEyesGlassesSunglasses
+    gloves: ClothingHandsGlovesCombat
+    outerClothing: ClothingOuterHardsuitTSF
+    id: TSFPDA
+    ears: ClothingHeadsetTSF
+    belt: ClothingBeltMilitaryWebbing
+    pocket1: WeaponPistolMk58Nonlethal
+    pocket2: FlashlightSeclite
+
+

Resources/Prototypes/StatusEffects/job.yml

@@ -459,6 +459,13 @@
     sprite: Interface/Misc/job_icons.rsi
     state: SRT
 
+- type: statusIcon
+  parent: JobIcon
+  id: JobIconTSF
+  icon:
+    sprite: Interface/Misc/job_icons.rsi
+    state: TSF
+
 - type: statusIcon
   parent: JobIcon
   id: JobIconDeathSquad

Resources/Prototypes/radio_channels.yml

@@ -134,4 +134,12 @@
   keycode: 'х'
   frequency: 1401
   color: "#b09800"
+  longRange: true
+
+- type: radioChannel
+  id: TSF
+  name: chat-radio-tsf
+  keycode: 'ь'
+  frequency: 2010
+  color: "#526382"
   longRange: true