diff --git a/Resources/Locale/ru-RU/ganimed/entities/clothing/tsf_clothing.ftl b/Resources/Locale/ru-RU/ganimed/entities/clothing/tsf_clothing.ftl new file mode 100644 index 000000000000..f8e4dc35bf65 --- /dev/null +++ b/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 = Скафандр, используемый флотом ТСФ. diff --git a/Resources/Locale/ru-RU/headset/headset-component.ftl b/Resources/Locale/ru-RU/headset/headset-component.ftl index 2e23ad840dcd..99cd134156bb 100644 --- a/Resources/Locale/ru-RU/headset/headset-component.ftl +++ b/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 = Портативный diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/player/humanoid.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/player/humanoid.ftl index 3fdcc7494f65..44bae755d0bf 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/player/humanoid.ftl +++ b/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 = { "" } \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/encryption_keys.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/encryption_keys.ftl index 732b4ed5b334..95b77a5808cc 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/encryption_keys.ftl +++ b/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 = Ключ шифрования, используемый ОБР. \ No newline at end of file + .desc = Ключ шифрования, используемый ОБР. +ent-EncryptionKeyTSF = ключ шифрования ТСФ + .desc = Ключ шифрования, используемый ТСФ. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/pda.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/pda.ftl index e71e4ee2ba34..2b507693d0bf 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/pda.ftl +++ b/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 = КПК синдиката diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/identification_cards.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/identification_cards.ftl index d280aff86abf..dc15e3aa3b10 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/identification_cards.ftl +++ b/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 карта пирата diff --git a/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml b/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml index 6f5e387eb6e9..3ab2ec97c697 100644 --- a/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml +++ b/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 \ No newline at end of file + 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 \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml b/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml index 7db33940980b..544587fa8c43 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml +++ b/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 \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml b/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml index b077eccf16a0..4a98d7a8aa87 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml @@ -324,4 +324,19 @@ - type: Sprite layers: - state: crypt_blue - - state: ert_label \ No newline at end of file + - 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 \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml index 922feaf698c4..1f464d0fa90c 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml +++ b/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 diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml index 51fb9ef71632..556520da07a8 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml +++ b/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 \ No newline at end of file diff --git a/Resources/Prototypes/Ganimed/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/Ganimed/Entities/Clothing/Head/hardsuit-helmets.yml index 7c1afdac6153..745960bd7515 100644 --- a/Resources/Prototypes/Ganimed/Entities/Clothing/Head/hardsuit-helmets.yml +++ b/Resources/Prototypes/Ganimed/Entities/Clothing/Head/hardsuit-helmets.yml @@ -618,4 +618,31 @@ color: "#7b9bf2" - type: PressureProtection highPressureMultiplier: 0.6 - lowPressureMultiplier: 1000 \ No newline at end of file + 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 \ No newline at end of file diff --git a/Resources/Prototypes/Ganimed/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/Ganimed/Entities/Clothing/OuterClothing/hardsuits.yml index c71718170bd6..3ce5f136ee47 100644 --- a/Resources/Prototypes/Ganimed/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/Resources/Prototypes/Ganimed/Entities/Clothing/OuterClothing/hardsuits.yml @@ -870,4 +870,35 @@ - type: Tag tags: - WhitelistChameleon - - HighRiskItem \ No newline at end of file + - 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 \ No newline at end of file diff --git a/Resources/Prototypes/Ganimed/Entities/Clothing/Shoes/tsf.yml b/Resources/Prototypes/Ganimed/Entities/Clothing/Shoes/tsf.yml new file mode 100644 index 000000000000..e8e5d3de6e52 --- /dev/null +++ b/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 diff --git a/Resources/Prototypes/Ganimed/Entities/Clothing/Uniforms/tsf.yml b/Resources/Prototypes/Ganimed/Entities/Clothing/Uniforms/tsf.yml new file mode 100644 index 000000000000..45795cf47637 --- /dev/null +++ b/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 diff --git a/Resources/Prototypes/Roles/Jobs/Fun/tsf.yml b/Resources/Prototypes/Roles/Jobs/Fun/tsf.yml new file mode 100644 index 000000000000..c6d9fef301d0 --- /dev/null +++ b/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 + + diff --git a/Resources/Prototypes/StatusEffects/job.yml b/Resources/Prototypes/StatusEffects/job.yml index b0cc42d721ba..002b83a82b94 100644 --- a/Resources/Prototypes/StatusEffects/job.yml +++ b/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 diff --git a/Resources/Prototypes/radio_channels.yml b/Resources/Prototypes/radio_channels.yml index 017633df81eb..e474b1bcc73b 100644 --- a/Resources/Prototypes/radio_channels.yml +++ b/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 \ No newline at end of file diff --git a/Resources/Textures/Clothing/Ears/Headsets/tsf.rsi/equipped-EARS.png b/Resources/Textures/Clothing/Ears/Headsets/tsf.rsi/equipped-EARS.png new file mode 100644 index 000000000000..dceafed7de3c Binary files /dev/null and b/Resources/Textures/Clothing/Ears/Headsets/tsf.rsi/equipped-EARS.png differ diff --git a/Resources/Textures/Clothing/Ears/Headsets/tsf.rsi/icon.png b/Resources/Textures/Clothing/Ears/Headsets/tsf.rsi/icon.png new file mode 100644 index 000000000000..4aac6d23ab9d Binary files /dev/null and b/Resources/Textures/Clothing/Ears/Headsets/tsf.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Ears/Headsets/tsf.rsi/meta.json b/Resources/Textures/Clothing/Ears/Headsets/tsf.rsi/meta.json new file mode 100644 index 000000000000..5b3c1f392da1 --- /dev/null +++ b/Resources/Textures/Clothing/Ears/Headsets/tsf.rsi/meta.json @@ -0,0 +1,19 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428 and modifyed by Gorox", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-EARS", + "directions": 4 + } + ] +} + diff --git a/Resources/Textures/Ganimed/Clothing/Head/Hardsuits/tsf.rsi/icon-flash.png b/Resources/Textures/Ganimed/Clothing/Head/Hardsuits/tsf.rsi/icon-flash.png new file mode 100644 index 000000000000..9279100c06f7 Binary files /dev/null and b/Resources/Textures/Ganimed/Clothing/Head/Hardsuits/tsf.rsi/icon-flash.png differ diff --git a/Resources/Textures/Ganimed/Clothing/Head/Hardsuits/tsf.rsi/icon.png b/Resources/Textures/Ganimed/Clothing/Head/Hardsuits/tsf.rsi/icon.png new file mode 100644 index 000000000000..4f2ade25ccd5 Binary files /dev/null and b/Resources/Textures/Ganimed/Clothing/Head/Hardsuits/tsf.rsi/icon.png differ diff --git a/Resources/Textures/Ganimed/Clothing/Head/Hardsuits/tsf.rsi/meta.json b/Resources/Textures/Ganimed/Clothing/Head/Hardsuits/tsf.rsi/meta.json new file mode 100644 index 000000000000..62611d6b5e76 --- /dev/null +++ b/Resources/Textures/Ganimed/Clothing/Head/Hardsuits/tsf.rsi/meta.json @@ -0,0 +1,41 @@ +{ + "version": 1, + "license": "CLA", + "copyright": "Create by Gorox for enterprise", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "icon-flash" + }, + { + "name": "off-equipped-HELMET", + "directions": 4 + }, + { + "name": "off-inhand-left", + "directions": 4 + }, + { + "name": "off-inhand-right", + "directions": 4 + }, + { + "name": "on-equipped-HELMET", + "directions": 4 + }, + { + "name": "on-inhand-left", + "directions": 4 + }, + { + "name": "on-inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Ganimed/Clothing/Head/Hardsuits/tsf.rsi/off-equipped-HELMET.png b/Resources/Textures/Ganimed/Clothing/Head/Hardsuits/tsf.rsi/off-equipped-HELMET.png new file mode 100644 index 000000000000..bf555a8cf86d Binary files /dev/null and b/Resources/Textures/Ganimed/Clothing/Head/Hardsuits/tsf.rsi/off-equipped-HELMET.png differ diff --git a/Resources/Textures/Ganimed/Clothing/Head/Hardsuits/tsf.rsi/off-inhand-left.png b/Resources/Textures/Ganimed/Clothing/Head/Hardsuits/tsf.rsi/off-inhand-left.png new file mode 100644 index 000000000000..b938860139be Binary files /dev/null and b/Resources/Textures/Ganimed/Clothing/Head/Hardsuits/tsf.rsi/off-inhand-left.png differ diff --git a/Resources/Textures/Ganimed/Clothing/Head/Hardsuits/tsf.rsi/off-inhand-right.png b/Resources/Textures/Ganimed/Clothing/Head/Hardsuits/tsf.rsi/off-inhand-right.png new file mode 100644 index 000000000000..872abb5c0e8e Binary files /dev/null and b/Resources/Textures/Ganimed/Clothing/Head/Hardsuits/tsf.rsi/off-inhand-right.png differ diff --git a/Resources/Textures/Ganimed/Clothing/Head/Hardsuits/tsf.rsi/on-equipped-HELMET.png b/Resources/Textures/Ganimed/Clothing/Head/Hardsuits/tsf.rsi/on-equipped-HELMET.png new file mode 100644 index 000000000000..0b482661f4ec Binary files /dev/null and b/Resources/Textures/Ganimed/Clothing/Head/Hardsuits/tsf.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/Ganimed/Clothing/Head/Hardsuits/tsf.rsi/on-inhand-left.png b/Resources/Textures/Ganimed/Clothing/Head/Hardsuits/tsf.rsi/on-inhand-left.png new file mode 100644 index 000000000000..aaef6f5f87ec Binary files /dev/null and b/Resources/Textures/Ganimed/Clothing/Head/Hardsuits/tsf.rsi/on-inhand-left.png differ diff --git a/Resources/Textures/Ganimed/Clothing/Head/Hardsuits/tsf.rsi/on-inhand-right.png b/Resources/Textures/Ganimed/Clothing/Head/Hardsuits/tsf.rsi/on-inhand-right.png new file mode 100644 index 000000000000..7f76c33b2015 Binary files /dev/null and b/Resources/Textures/Ganimed/Clothing/Head/Hardsuits/tsf.rsi/on-inhand-right.png differ diff --git a/Resources/Textures/Ganimed/Clothing/OuterClothing/Hardsuits/tsf.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Ganimed/Clothing/OuterClothing/Hardsuits/tsf.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 000000000000..ea9d19c1a75a Binary files /dev/null and b/Resources/Textures/Ganimed/Clothing/OuterClothing/Hardsuits/tsf.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Ganimed/Clothing/OuterClothing/Hardsuits/tsf.rsi/icon.png b/Resources/Textures/Ganimed/Clothing/OuterClothing/Hardsuits/tsf.rsi/icon.png new file mode 100644 index 000000000000..a3b5ce2415dd Binary files /dev/null and b/Resources/Textures/Ganimed/Clothing/OuterClothing/Hardsuits/tsf.rsi/icon.png differ diff --git a/Resources/Textures/Ganimed/Clothing/OuterClothing/Hardsuits/tsf.rsi/inhand-left.png b/Resources/Textures/Ganimed/Clothing/OuterClothing/Hardsuits/tsf.rsi/inhand-left.png new file mode 100644 index 000000000000..ecaa18f5b72b Binary files /dev/null and b/Resources/Textures/Ganimed/Clothing/OuterClothing/Hardsuits/tsf.rsi/inhand-left.png differ diff --git a/Resources/Textures/Ganimed/Clothing/OuterClothing/Hardsuits/tsf.rsi/inhand-right.png b/Resources/Textures/Ganimed/Clothing/OuterClothing/Hardsuits/tsf.rsi/inhand-right.png new file mode 100644 index 000000000000..d10a2576625a Binary files /dev/null and b/Resources/Textures/Ganimed/Clothing/OuterClothing/Hardsuits/tsf.rsi/inhand-right.png differ diff --git a/Resources/Textures/Ganimed/Clothing/OuterClothing/Hardsuits/tsf.rsi/meta.json b/Resources/Textures/Ganimed/Clothing/OuterClothing/Hardsuits/tsf.rsi/meta.json new file mode 100644 index 000000000000..fe81c4d764ab --- /dev/null +++ b/Resources/Textures/Ganimed/Clothing/OuterClothing/Hardsuits/tsf.rsi/meta.json @@ -0,0 +1,28 @@ + +{ + "version": 1, + "license": "CLA", + "copyright": "Made by Gorox for enterprise", + + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Ganimed/Clothing/Shoes/tsf_magboots.rsi/equipped-FEET-digi.png b/Resources/Textures/Ganimed/Clothing/Shoes/tsf_magboots.rsi/equipped-FEET-digi.png new file mode 100644 index 000000000000..4d6abd4fbcd2 Binary files /dev/null and b/Resources/Textures/Ganimed/Clothing/Shoes/tsf_magboots.rsi/equipped-FEET-digi.png differ diff --git a/Resources/Textures/Ganimed/Clothing/Shoes/tsf_magboots.rsi/equipped-FEET.png b/Resources/Textures/Ganimed/Clothing/Shoes/tsf_magboots.rsi/equipped-FEET.png new file mode 100644 index 000000000000..c2ab527b9af9 Binary files /dev/null and b/Resources/Textures/Ganimed/Clothing/Shoes/tsf_magboots.rsi/equipped-FEET.png differ diff --git a/Resources/Textures/Ganimed/Clothing/Shoes/tsf_magboots.rsi/icon-on.png b/Resources/Textures/Ganimed/Clothing/Shoes/tsf_magboots.rsi/icon-on.png new file mode 100644 index 000000000000..dc2061037f11 Binary files /dev/null and b/Resources/Textures/Ganimed/Clothing/Shoes/tsf_magboots.rsi/icon-on.png differ diff --git a/Resources/Textures/Ganimed/Clothing/Shoes/tsf_magboots.rsi/icon.png b/Resources/Textures/Ganimed/Clothing/Shoes/tsf_magboots.rsi/icon.png new file mode 100644 index 000000000000..e6584b8c8897 Binary files /dev/null and b/Resources/Textures/Ganimed/Clothing/Shoes/tsf_magboots.rsi/icon.png differ diff --git a/Resources/Textures/Ganimed/Clothing/Shoes/tsf_magboots.rsi/inhand-left.png b/Resources/Textures/Ganimed/Clothing/Shoes/tsf_magboots.rsi/inhand-left.png new file mode 100644 index 000000000000..8a14890d819b Binary files /dev/null and b/Resources/Textures/Ganimed/Clothing/Shoes/tsf_magboots.rsi/inhand-left.png differ diff --git a/Resources/Textures/Ganimed/Clothing/Shoes/tsf_magboots.rsi/inhand-right.png b/Resources/Textures/Ganimed/Clothing/Shoes/tsf_magboots.rsi/inhand-right.png new file mode 100644 index 000000000000..795d87b7faea Binary files /dev/null and b/Resources/Textures/Ganimed/Clothing/Shoes/tsf_magboots.rsi/inhand-right.png differ diff --git a/Resources/Textures/Ganimed/Clothing/Shoes/tsf_magboots.rsi/meta.json b/Resources/Textures/Ganimed/Clothing/Shoes/tsf_magboots.rsi/meta.json new file mode 100644 index 000000000000..5b34aab8bec5 --- /dev/null +++ b/Resources/Textures/Ganimed/Clothing/Shoes/tsf_magboots.rsi/meta.json @@ -0,0 +1,49 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8, digi made by kuro(388673708753027083)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "equipped-FEET", + "directions": 4 + }, + { + "name": "equipped-FEET-digi", + "directions": 4 + }, + { + "name": "on-equipped-FEET", + "directions": 4 + }, + { + "name": "on-equipped-FEET-digi", + "directions": 4 + }, + { + "name": "icon" + }, + { + "name": "icon-on" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "on-inhand-left", + "directions": 4 + }, + { + "name": "on-inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Ganimed/Clothing/Shoes/tsf_magboots.rsi/on-equipped-FEET-digi.png b/Resources/Textures/Ganimed/Clothing/Shoes/tsf_magboots.rsi/on-equipped-FEET-digi.png new file mode 100644 index 000000000000..5be3860724a1 Binary files /dev/null and b/Resources/Textures/Ganimed/Clothing/Shoes/tsf_magboots.rsi/on-equipped-FEET-digi.png differ diff --git a/Resources/Textures/Ganimed/Clothing/Shoes/tsf_magboots.rsi/on-equipped-FEET.png b/Resources/Textures/Ganimed/Clothing/Shoes/tsf_magboots.rsi/on-equipped-FEET.png new file mode 100644 index 000000000000..bb60023f9dba Binary files /dev/null and b/Resources/Textures/Ganimed/Clothing/Shoes/tsf_magboots.rsi/on-equipped-FEET.png differ diff --git a/Resources/Textures/Ganimed/Clothing/Shoes/tsf_magboots.rsi/on-inhand-left.png b/Resources/Textures/Ganimed/Clothing/Shoes/tsf_magboots.rsi/on-inhand-left.png new file mode 100644 index 000000000000..aa3dca3a78b1 Binary files /dev/null and b/Resources/Textures/Ganimed/Clothing/Shoes/tsf_magboots.rsi/on-inhand-left.png differ diff --git a/Resources/Textures/Ganimed/Clothing/Shoes/tsf_magboots.rsi/on-inhand-right.png b/Resources/Textures/Ganimed/Clothing/Shoes/tsf_magboots.rsi/on-inhand-right.png new file mode 100644 index 000000000000..72aa2f95e52f Binary files /dev/null and b/Resources/Textures/Ganimed/Clothing/Shoes/tsf_magboots.rsi/on-inhand-right.png differ diff --git a/Resources/Textures/Ganimed/Clothing/Uniforms/tsf/tsf.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Ganimed/Clothing/Uniforms/tsf/tsf.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 000000000000..43683c304b9d Binary files /dev/null and b/Resources/Textures/Ganimed/Clothing/Uniforms/tsf/tsf.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Ganimed/Clothing/Uniforms/tsf/tsf.rsi/icon.png b/Resources/Textures/Ganimed/Clothing/Uniforms/tsf/tsf.rsi/icon.png new file mode 100644 index 000000000000..d1ac892c9fa2 Binary files /dev/null and b/Resources/Textures/Ganimed/Clothing/Uniforms/tsf/tsf.rsi/icon.png differ diff --git a/Resources/Textures/Ganimed/Clothing/Uniforms/tsf/tsf.rsi/inhand-left.png b/Resources/Textures/Ganimed/Clothing/Uniforms/tsf/tsf.rsi/inhand-left.png new file mode 100644 index 000000000000..5cfb368f89ec Binary files /dev/null and b/Resources/Textures/Ganimed/Clothing/Uniforms/tsf/tsf.rsi/inhand-left.png differ diff --git a/Resources/Textures/Ganimed/Clothing/Uniforms/tsf/tsf.rsi/inhand-right.png b/Resources/Textures/Ganimed/Clothing/Uniforms/tsf/tsf.rsi/inhand-right.png new file mode 100644 index 000000000000..a92c5abbea69 Binary files /dev/null and b/Resources/Textures/Ganimed/Clothing/Uniforms/tsf/tsf.rsi/inhand-right.png differ diff --git a/Resources/Textures/Ganimed/Clothing/Uniforms/tsf/tsf.rsi/meta.json b/Resources/Textures/Ganimed/Clothing/Uniforms/tsf/tsf.rsi/meta.json new file mode 100644 index 000000000000..eb777a3f5746 --- /dev/null +++ b/Resources/Textures/Ganimed/Clothing/Uniforms/tsf/tsf.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "taked from https://github.com/ParadiseSS13/Paradise/blob/master/icons/mob/clothing/under/solgov.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Ganimed/Clothing/Uniforms/tsf/tsf_captain.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Ganimed/Clothing/Uniforms/tsf/tsf_captain.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 000000000000..d1e849e979be Binary files /dev/null and b/Resources/Textures/Ganimed/Clothing/Uniforms/tsf/tsf_captain.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Ganimed/Clothing/Uniforms/tsf/tsf_captain.rsi/icon.png b/Resources/Textures/Ganimed/Clothing/Uniforms/tsf/tsf_captain.rsi/icon.png new file mode 100644 index 000000000000..6680bb52b0c9 Binary files /dev/null and b/Resources/Textures/Ganimed/Clothing/Uniforms/tsf/tsf_captain.rsi/icon.png differ diff --git a/Resources/Textures/Ganimed/Clothing/Uniforms/tsf/tsf_captain.rsi/inhand-left.png b/Resources/Textures/Ganimed/Clothing/Uniforms/tsf/tsf_captain.rsi/inhand-left.png new file mode 100644 index 000000000000..5cfb368f89ec Binary files /dev/null and b/Resources/Textures/Ganimed/Clothing/Uniforms/tsf/tsf_captain.rsi/inhand-left.png differ diff --git a/Resources/Textures/Ganimed/Clothing/Uniforms/tsf/tsf_captain.rsi/inhand-right.png b/Resources/Textures/Ganimed/Clothing/Uniforms/tsf/tsf_captain.rsi/inhand-right.png new file mode 100644 index 000000000000..a92c5abbea69 Binary files /dev/null and b/Resources/Textures/Ganimed/Clothing/Uniforms/tsf/tsf_captain.rsi/inhand-right.png differ diff --git a/Resources/Textures/Ganimed/Clothing/Uniforms/tsf/tsf_captain.rsi/meta.json b/Resources/Textures/Ganimed/Clothing/Uniforms/tsf/tsf_captain.rsi/meta.json new file mode 100644 index 000000000000..eb777a3f5746 --- /dev/null +++ b/Resources/Textures/Ganimed/Clothing/Uniforms/tsf/tsf_captain.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "taked from https://github.com/ParadiseSS13/Paradise/blob/master/icons/mob/clothing/under/solgov.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/TSF.png b/Resources/Textures/Interface/Misc/job_icons.rsi/TSF.png new file mode 100644 index 000000000000..362294321de9 Binary files /dev/null and b/Resources/Textures/Interface/Misc/job_icons.rsi/TSF.png differ diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json b/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json index 9c7c8138aec4..3ad1089abc3f 100644 --- a/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json +++ b/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json @@ -209,6 +209,9 @@ { "name": "DeathSquad" }, + { + "name": "TSF" + }, { "name": "IAA" }, diff --git a/Resources/Textures/Objects/Devices/encryption_keys.rsi/meta.json b/Resources/Textures/Objects/Devices/encryption_keys.rsi/meta.json index 6ef7aeaed502..1d62c1df23f4 100644 --- a/Resources/Textures/Objects/Devices/encryption_keys.rsi/meta.json +++ b/Resources/Textures/Objects/Devices/encryption_keys.rsi/meta.json @@ -40,6 +40,7 @@ {"name": "specops_label"}, {"name": "srt_label"}, {"name": "mtf_label"}, + {"name": "tsf_label"}, {"name": "synd_label"} ] } \ No newline at end of file diff --git a/Resources/Textures/Objects/Devices/encryption_keys.rsi/tsf_label.png b/Resources/Textures/Objects/Devices/encryption_keys.rsi/tsf_label.png new file mode 100644 index 000000000000..565e6918ab41 Binary files /dev/null and b/Resources/Textures/Objects/Devices/encryption_keys.rsi/tsf_label.png differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/meta.json b/Resources/Textures/Objects/Devices/pda.rsi/meta.json index 8136b3162605..c5340981e1b0 100644 --- a/Resources/Textures/Objects/Devices/pda.rsi/meta.json +++ b/Resources/Textures/Objects/Devices/pda.rsi/meta.json @@ -235,6 +235,9 @@ { "name": "pda-bridgeofficer" }, + { + "name": "pda-tsf" + }, { "name": "pda-blueshield" }, diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-tsf.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-tsf.png new file mode 100644 index 000000000000..f24ff852b296 Binary files /dev/null and b/Resources/Textures/Objects/Devices/pda.rsi/pda-tsf.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idtsf.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idtsf.png new file mode 100644 index 000000000000..233a865cee2c Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/idtsf.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json b/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json index a2796b6739dd..ae1f4f3ab757 100644 --- a/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json +++ b/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json @@ -226,6 +226,9 @@ { "name": "idcoroner" }, + { + "name": "idtsf" + }, { "name": "idblueshield" },