diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/head/hardsuit-helmets.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/head/hardsuit-helmets.ftl index 4447219ad2e433..4fe0a1113e2261 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/head/hardsuit-helmets.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/head/hardsuit-helmets.ftl @@ -25,6 +25,9 @@ ent-ClothingHeadHelmetHardsuitMedical = шлем скафандра главно ent-ClothingHeadHelmetHardsuitRd = экспериментальный шлем исследовательского скафандра .desc = Легкий шлем скафандра, не стесняющий движений головы. .suffix = { "" } +ent-ClothingHeadHelmetHardsuitKm = шлем скафандра квартирмейстера + .desc = Специальный шлем, защищающий от опасной среды с низким давлением. Создан из облегчённых материалов для столкновений с враждебной фауной обломков и экспедиций. + .suffix = { "" } ent-ClothingHeadHelmetHardsuitSalvage = шлем скафандра утилизатора .desc = Специальный шлем, предназначенный для работы в опасной среде с низким давлением. Имеет усиленную броню, на случай встречи с дикими животными, а так же двойные прожекторы. .suffix = { "" } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/outerclothing/hardsuits.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/outerclothing/hardsuits.ftl index 38965c98daca2d..62f78e8e7d398a 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/outerclothing/hardsuits.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/outerclothing/hardsuits.ftl @@ -25,6 +25,9 @@ ent-ClothingOuterHardsuitMedical = скафандр главного врача ent-ClothingOuterHardsuitRd = скафандр научного руководителя .desc = Специальный костюм, защищающий от опасной среды с низким давлением. Имеет дополнительный слой брони. .suffix = { "" } +ent-ClothingOuterHardsuitKm = скафандр квартирмейстера + .desc = Специальный костюм, защищающий от опасной среды с низким давлением. Создан из облегчённых материалов для столкновений с враждебной фауной обломков и экспедиций. + .suffix = { "" } ent-ClothingOuterHardsuitSalvage = скафандр утилизатора .desc = Специальный костюм, защищающий от опасной среды с низким давлением. Имеет усиленное покрытие на случай встречи с дикой фауной. .suffix = { "" } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/tablets/tablets.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/tablets/tablets.ftl new file mode 100644 index 00000000000000..d8d5c9cb5ff3d6 --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/tablets/tablets.ftl @@ -0,0 +1,12 @@ +ent-HandheldCargoMonitor = планшет закупок карго + .desc = Планшет, используемый квартирмейстером, для удаленного заказа грузов. + .suffix = { "" } +ent-HandheldIntercomMonitor = планшет оповещений + .desc = Планшет, испульзуемый капитаном, для удаленного оповещения станции. + .suffix = { "" } +ent-HandheldRndMonitor = планшет изучений + .desc = Планшет, используемый научным руководителем, для удаленного доступа к серверу изучений. + .suffix = { "" } +ent-HandheldSolarMonitor = планшет управления солнечными панелями + .desc = Планшет, используемый старшим инженером, для удаленной настройки солнечными понелями. + .suffix = { "" } diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml index e764328db4b739..8991c2df9bb299 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml @@ -18,6 +18,8 @@ prob: 0.8 - id: CargoRequestComputerCircuitboard - id: CargoShuttleComputerCircuitboard + - id: ClothingOuterHardsuitKm + - id: HandheldCargoMonitor - id: CargoShuttleConsoleCircuitboard - id: SalvageShuttleConsoleCircuitboard - id: CargoBountyComputerCircuitboard @@ -78,6 +80,7 @@ - id: ClothingHandsGlovesCaptain - id: WeaponDisabler - id: CommsComputerCircuitboard + - id: HandheldIntercomMonitor - id: ClothingHeadsetAltCommand - id: SpaceCash1000 - id: PlushieNuke @@ -164,6 +167,7 @@ - id: ClothingEyesGlassesMeson - id: ClothingBeltChiefEngineerFilled - id: ClothingHeadHatBeretEngineering + - id: HandheldSolarMonitor - id: CigarCase prob: 0.15 - id: DoorRemoteEngineering @@ -269,6 +273,7 @@ prob: 0.1 - id: DoorRemoteResearch - id: ClothingHeadHatBeretRND + - id: HandheldRndMonitor - id: RubberStampRd - id: ClothingHeadsetAltScience - id: BoxEncryptionKeyScience diff --git a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml index c231a3ba2feaf0..c5e22f1fd3eaf6 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml @@ -128,6 +128,45 @@ radius: 7 energy: 3 +- type: entity + parent: ClothingHeadHardsuitWithLightBase + id: ClothingHeadHelmetHardsuitKm + noSpawn: true + name: km hardsuit helmet + description: A special helmet designed for work in a hazardous, low pressure environment. Has reinforced plating for wildlife encounters and dual floodlights. + components: + - type: Sprite + sprite: Clothing/Head/Hardsuits/kmsuit.rsi + - type: Clothing + sprite: Clothing/Head/Hardsuits/kmsuit.rsi + - type: PressureProtection + highPressureMultiplier: 0.525 + lowPressureMultiplier: 10000 + - type: PointLight + radius: 7 + energy: 3 + - type: CargoOrderConsole + - type: ActivatableUI + key: enum.CargoConsoleUiKey.Orders + closeOnHandDeselect: false + - type: UserInterface + interfaces: + - key: enum.CargoConsoleUiKey.Orders + type: CargoOrderConsoleBoundUserInterface + - type: AccessReader + access: [["Cargo"]] + - type: DeviceNetwork + deviceNetId: Wireless + receiveFrequencyId: BasicDevice + - type: WirelessNetworkConnection + range: 200 + - type: DeviceLinkSource + range: 200 + ports: + - OrderSender + - type: StaticPrice + price: 500 + #Security Hardsuit - type: entity parent: ClothingHeadHardsuitWithLightBase diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml index 4d442b21badc3a..4c8a4d931178b4 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml @@ -156,6 +156,36 @@ - type: ToggleableClothing clothingPrototype: ClothingHeadHelmetHardsuitSpatio +- type: entity + parent: ClothingOuterHardsuitBase + id: ClothingOuterHardsuitKm + name: Kvas + description: A special suit that protects against hazardous, low pressure environments. Has reinforced plating for wildlife encounters. + components: + - type: Sprite + sprite: Clothing/OuterClothing/Hardsuits/kmsuit.rsi + - type: Clothing + sprite: Clothing/OuterClothing/Hardsuits/kmsuit.rsi + - type: PressureProtection + highPressureMultiplier: 0.525 + lowPressureMultiplier: 10000 + - type: ClothingSpeedModifier + walkModifier: 0.9 + sprintModifier: 0.9 + - type: Armor + modifiers: + coefficients: + Blunt: 0.7 + Slash: 0.7 + Piercing: 0.8 + Heat: 0.85 + Radiation: 0.50 + Caustic: 0.75 + - type: ExplosionResistance + damageCoefficient: 0.4 + - type: ToggleableClothing + clothingPrototype: ClothingHeadHelmetHardsuitKm + #Salvage Hardsuit - type: entity parent: ClothingOuterHardsuitBase diff --git a/Resources/Prototypes/Entities/Objects/Specific/Tablets/cargo_pda.yml b/Resources/Prototypes/Entities/Objects/Specific/Tablets/cargo_pda.yml new file mode 100644 index 00000000000000..aa4af16d6dbd55 --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Specific/Tablets/cargo_pda.yml @@ -0,0 +1,127 @@ +- type: entity + name: handheld cargo monitor + parent: + - BaseItem + id: HandheldCargoMonitor + description: A hand-held crew monitor displaying the status of suit sensors. + components: + - type: Sprite + sprite: Objects/Specific/Tablets/cargo.rsi + state: icon + - type: CargoOrderConsole + - type: ActivatableUI + key: enum.CargoConsoleUiKey.Orders + closeOnHandDeselect: true + - type: UserInterface + interfaces: + - key: enum.CargoConsoleUiKey.Orders + type: CargoOrderConsoleBoundUserInterface + - type: AccessReader + access: [["Cargo"]] + - type: DeviceNetwork + deviceNetId: Wireless + receiveFrequencyId: BasicDevice + - type: WirelessNetworkConnection + range: 200 + - type: DeviceLinkSource + range: 200 + ports: + - OrderSender + - type: StaticPrice + price: 500 + +- type: entity + name: handheld intercom monitor + parent: + - BaseItem + id: HandheldIntercomMonitor + description: A hand-held crew monitor displaying the status of suit sensors. + components: + - type: Sprite + sprite: Objects/Specific/Tablets/intercom.rsi + state: icon + - type: AccessReader + access: [[ "Command" ]] + - type: CommunicationsConsole + title: comms-console-announcement-title-station + - type: ActivatableUI + key: enum.CommunicationsConsoleUiKey.Key + - type: UserInterface + interfaces: + - key: enum.CommunicationsConsoleUiKey.Key + type: CommunicationsConsoleBoundUserInterface + - type: DeviceNetwork + deviceNetId: Wireless + receiveFrequencyId: BasicDevice + - type: WirelessNetworkConnection + range: 200 + - type: DeviceLinkSource + range: 200 + ports: + - OrderSender + - type: StaticPrice + price: 500 + +- type: entity + name: handheld research monitor + parent: + - BaseItem + id: HandheldRndMonitor + description: A hand-held crew monitor displaying the status of suit sensors. + components: + - type: Sprite + sprite: Objects/Specific/Tablets/rnd.rsi + state: icon + - type: ResearchClient + - type: ResearchConsole + - type: TechnologyDatabase + - type: ActivatableUI + key: enum.ResearchConsoleUiKey.Key + - type: UserInterface + interfaces: + - key: enum.ResearchConsoleUiKey.Key + type: ResearchConsoleBoundUserInterface + - key: enum.ResearchClientUiKey.Key + type: ResearchClientBoundUserInterface + - type: AccessReader + access: [["Research"]] + - type: DeviceNetwork + deviceNetId: Wireless + receiveFrequencyId: BasicDevice + - type: WirelessNetworkConnection + range: 200 + - type: DeviceLinkSource + range: 200 + ports: + - OrderSender + - type: StaticPrice + price: 500 + +- type: entity + name: handheld Solar monitor + parent: + - BaseItem + id: HandheldSolarMonitor + description: A hand-held crew monitor displaying the status of suit sensors. + components: + - type: Sprite + sprite: Objects/Specific/Tablets/solar.rsi + state: icon + - type: SolarControlConsole + - type: ActivatableUI + key: enum.SolarControlConsoleUiKey.Key + - type: UserInterface + interfaces: + - key: enum.SolarControlConsoleUiKey.Key + type: SolarControlConsoleBoundUserInterface + - type: DeviceNetwork + deviceNetId: Wireless + receiveFrequencyId: BasicDevice + - type: WirelessNetworkConnection + range: 200 + - type: DeviceLinkSource + range: 200 + ports: + - OrderSender + - type: StaticPrice + price: 500 diff --git a/Resources/Textures/Clothing/Head/Hardsuits/kmsuit.rsi/icon-flash.png b/Resources/Textures/Clothing/Head/Hardsuits/kmsuit.rsi/icon-flash.png new file mode 100644 index 00000000000000..60bb73fce58738 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/kmsuit.rsi/icon-flash.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/kmsuit.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardsuits/kmsuit.rsi/icon.png new file mode 100644 index 00000000000000..60bb73fce58738 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/kmsuit.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/kmsuit.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/kmsuit.rsi/meta.json new file mode 100644 index 00000000000000..6b668cd1f166f6 --- /dev/null +++ b/Resources/Textures/Clothing/Head/Hardsuits/kmsuit.rsi/meta.json @@ -0,0 +1,41 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/0d34bc7798721c5b45d0600bd18b47709a3f5825", + "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/Clothing/Head/Hardsuits/kmsuit.rsi/off-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/kmsuit.rsi/off-equipped-HELMET.png new file mode 100644 index 00000000000000..cc96fd61730705 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/kmsuit.rsi/off-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/kmsuit.rsi/off-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/kmsuit.rsi/off-inhand-left.png new file mode 100644 index 00000000000000..cc96fd61730705 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/kmsuit.rsi/off-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/kmsuit.rsi/off-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/kmsuit.rsi/off-inhand-right.png new file mode 100644 index 00000000000000..cc96fd61730705 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/kmsuit.rsi/off-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/kmsuit.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/kmsuit.rsi/on-equipped-HELMET.png new file mode 100644 index 00000000000000..cc96fd61730705 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/kmsuit.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/kmsuit.rsi/on-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/kmsuit.rsi/on-inhand-left.png new file mode 100644 index 00000000000000..cc96fd61730705 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/kmsuit.rsi/on-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/kmsuit.rsi/on-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/kmsuit.rsi/on-inhand-right.png new file mode 100644 index 00000000000000..cc96fd61730705 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/kmsuit.rsi/on-inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/kmsuit.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/kmsuit.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000000..aacc2f47588c4b Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/kmsuit.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/kmsuit.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/kmsuit.rsi/icon.png new file mode 100644 index 00000000000000..9928d914784a57 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/kmsuit.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/kmsuit.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/kmsuit.rsi/inhand-left.png new file mode 100644 index 00000000000000..f808f0c9754b5c Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/kmsuit.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/kmsuit.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/kmsuit.rsi/inhand-right.png new file mode 100644 index 00000000000000..1fb781159dbd55 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/kmsuit.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/kmsuit.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/kmsuit.rsi/meta.json new file mode 100644 index 00000000000000..0be233962acfa3 --- /dev/null +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/kmsuit.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/0d34bc7798721c5b45d0600bd18b47709a3f5825", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Specific/Tablets/cargo.rsi/icon.png b/Resources/Textures/Objects/Specific/Tablets/cargo.rsi/icon.png new file mode 100644 index 00000000000000..371c2ee175448d Binary files /dev/null and b/Resources/Textures/Objects/Specific/Tablets/cargo.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Specific/Tablets/cargo.rsi/meta.json b/Resources/Textures/Objects/Specific/Tablets/cargo.rsi/meta.json new file mode 100644 index 00000000000000..cc009d5aefb536 --- /dev/null +++ b/Resources/Textures/Objects/Specific/Tablets/cargo.rsi/meta.json @@ -0,0 +1,15 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Wizord", + "states": [ + { + "name": "icon", + "directions": 1 + } + ] +} diff --git a/Resources/Textures/Objects/Specific/Tablets/intercom.rsi/icon.png b/Resources/Textures/Objects/Specific/Tablets/intercom.rsi/icon.png new file mode 100644 index 00000000000000..f0148e5a44aa77 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Tablets/intercom.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Specific/Tablets/intercom.rsi/meta.json b/Resources/Textures/Objects/Specific/Tablets/intercom.rsi/meta.json new file mode 100644 index 00000000000000..cc009d5aefb536 --- /dev/null +++ b/Resources/Textures/Objects/Specific/Tablets/intercom.rsi/meta.json @@ -0,0 +1,15 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Wizord", + "states": [ + { + "name": "icon", + "directions": 1 + } + ] +} diff --git a/Resources/Textures/Objects/Specific/Tablets/rnd.rsi/icon.png b/Resources/Textures/Objects/Specific/Tablets/rnd.rsi/icon.png new file mode 100644 index 00000000000000..55f5d9bc1982d8 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Tablets/rnd.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Specific/Tablets/rnd.rsi/meta.json b/Resources/Textures/Objects/Specific/Tablets/rnd.rsi/meta.json new file mode 100644 index 00000000000000..cc009d5aefb536 --- /dev/null +++ b/Resources/Textures/Objects/Specific/Tablets/rnd.rsi/meta.json @@ -0,0 +1,15 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Wizord", + "states": [ + { + "name": "icon", + "directions": 1 + } + ] +} diff --git a/Resources/Textures/Objects/Specific/Tablets/solar.rsi/icon.png b/Resources/Textures/Objects/Specific/Tablets/solar.rsi/icon.png new file mode 100644 index 00000000000000..63fff3b62b59c9 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Tablets/solar.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Specific/Tablets/solar.rsi/meta.json b/Resources/Textures/Objects/Specific/Tablets/solar.rsi/meta.json new file mode 100644 index 00000000000000..cc009d5aefb536 --- /dev/null +++ b/Resources/Textures/Objects/Specific/Tablets/solar.rsi/meta.json @@ -0,0 +1,15 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Wizord", + "states": [ + { + "name": "icon", + "directions": 1 + } + ] +}