From a1e5096ad0c02720d50df94c108dce30a1beab86 Mon Sep 17 00:00:00 2001 From: Wizard-Grin <100096262+Wizard-Grin@users.noreply.github.com> Date: Sat, 22 Jul 2023 23:44:21 +0300 Subject: [PATCH 1/3] heads items update --- .../clothing/head/hardsuit-helmets.ftl | 3 + .../clothing/outerclothing/hardsuits.ftl | 3 + .../objects/specific/tablets/tablets.ftl | 12 ++ .../Catalog/Fills/Lockers/heads.yml | 5 + .../Clothing/Head/hardsuit-helmets.yml | 39 ++++++ .../Clothing/OuterClothing/hardsuits.yml | 36 ++++- .../Objects/Specific/Tablets/cargo_pda.yml | 127 ++++++++++++++++++ .../Head/Hardsuits/kmsuit.rsi/icon-flash.png | Bin 0 -> 435 bytes .../Head/Hardsuits/kmsuit.rsi/icon.png | Bin 0 -> 435 bytes .../Head/Hardsuits/kmsuit.rsi/meta.json | 41 ++++++ .../kmsuit.rsi/off-equipped-HELMET.png | Bin 0 -> 789 bytes .../Hardsuits/kmsuit.rsi/off-inhand-left.png | Bin 0 -> 789 bytes .../Hardsuits/kmsuit.rsi/off-inhand-right.png | Bin 0 -> 789 bytes .../kmsuit.rsi/on-equipped-HELMET.png | Bin 0 -> 789 bytes .../Hardsuits/kmsuit.rsi/on-inhand-left.png | Bin 0 -> 789 bytes .../Hardsuits/kmsuit.rsi/on-inhand-right.png | Bin 0 -> 789 bytes .../kmsuit.rsi/equipped-OUTERCLOTHING.png | Bin 0 -> 935 bytes .../Hardsuits/kmsuit.rsi/icon.png | Bin 0 -> 620 bytes .../Hardsuits/kmsuit.rsi/inhand-left.png | Bin 0 -> 565 bytes .../Hardsuits/kmsuit.rsi/inhand-right.png | Bin 0 -> 604 bytes .../Hardsuits/kmsuit.rsi/meta.json | 26 ++++ .../Specific/Tablets/cargo.rsi/icon.png | Bin 0 -> 298 bytes .../Specific/Tablets/cargo.rsi/meta.json | 15 +++ .../Specific/Tablets/intercom.rsi/icon.png | Bin 0 -> 308 bytes .../Specific/Tablets/intercom.rsi/meta.json | 15 +++ .../Objects/Specific/Tablets/rnd.rsi/icon.png | Bin 0 -> 313 bytes .../Specific/Tablets/rnd.rsi/meta.json | 15 +++ .../Specific/Tablets/solar.rsi/icon.png | Bin 0 -> 308 bytes .../Specific/Tablets/solar.rsi/meta.json | 15 +++ 29 files changed, 349 insertions(+), 3 deletions(-) create mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/tablets/tablets.ftl create mode 100644 Resources/Prototypes/Entities/Objects/Specific/Tablets/cargo_pda.yml create mode 100644 Resources/Textures/Clothing/Head/Hardsuits/kmsuit.rsi/icon-flash.png create mode 100644 Resources/Textures/Clothing/Head/Hardsuits/kmsuit.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Head/Hardsuits/kmsuit.rsi/meta.json create mode 100644 Resources/Textures/Clothing/Head/Hardsuits/kmsuit.rsi/off-equipped-HELMET.png create mode 100644 Resources/Textures/Clothing/Head/Hardsuits/kmsuit.rsi/off-inhand-left.png create mode 100644 Resources/Textures/Clothing/Head/Hardsuits/kmsuit.rsi/off-inhand-right.png create mode 100644 Resources/Textures/Clothing/Head/Hardsuits/kmsuit.rsi/on-equipped-HELMET.png create mode 100644 Resources/Textures/Clothing/Head/Hardsuits/kmsuit.rsi/on-inhand-left.png create mode 100644 Resources/Textures/Clothing/Head/Hardsuits/kmsuit.rsi/on-inhand-right.png create mode 100644 Resources/Textures/Clothing/OuterClothing/Hardsuits/kmsuit.rsi/equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/Clothing/OuterClothing/Hardsuits/kmsuit.rsi/icon.png create mode 100644 Resources/Textures/Clothing/OuterClothing/Hardsuits/kmsuit.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/OuterClothing/Hardsuits/kmsuit.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/OuterClothing/Hardsuits/kmsuit.rsi/meta.json create mode 100644 Resources/Textures/Objects/Specific/Tablets/cargo.rsi/icon.png create mode 100644 Resources/Textures/Objects/Specific/Tablets/cargo.rsi/meta.json create mode 100644 Resources/Textures/Objects/Specific/Tablets/intercom.rsi/icon.png create mode 100644 Resources/Textures/Objects/Specific/Tablets/intercom.rsi/meta.json create mode 100644 Resources/Textures/Objects/Specific/Tablets/rnd.rsi/icon.png create mode 100644 Resources/Textures/Objects/Specific/Tablets/rnd.rsi/meta.json create mode 100644 Resources/Textures/Objects/Specific/Tablets/solar.rsi/icon.png create mode 100644 Resources/Textures/Objects/Specific/Tablets/solar.rsi/meta.json 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..b1f52452949b46 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 @@ -445,8 +475,8 @@ highPressureMultiplier: 0.05 lowPressureMultiplier: 1000 - type: ClothingSpeedModifier - walkModifier: 0.9 - sprintModifier: 0.9 + walkModifier: 1 + sprintModifier: 1 - type: Armor modifiers: coefficients: @@ -477,7 +507,7 @@ lowPressureMultiplier: 1000 - type: ClothingSpeedModifier walkModifier: 0.6 - sprintModifier: 0.6 #extremely slow + sprintModifier: 0.5 #extremely slow - type: Armor modifiers: coefficients: 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 0000000000000000000000000000000000000000..60bb73fce587383271c0b0494e0c2decefe5577f GIT binary patch literal 435 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 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..1fb781159dbd5504a191f3eb684edcd0d641c3ec GIT binary patch literal 604 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEU{dyUaSW-L^Y+%ptlI%1Y!B|M zc5hHnk@Awgz$(e|^}-_e4IeLDOt25Uw?u#P(q_;02#Xs9yoH&LMy!&$t+x+u^q7+E zsub?g_&>U5ozC3(%8L(vXK;Z7hIh8{p^^EkuYanuD80zraIs)ctj%n{D;XAH=BjzO zmfS3vl&U>>`{L*~)%%1FwN8=dc=+hkB{v!Mn;WM{ues*^cB`*6@9|Y$_cs4=y8k&; zfX5)-CPm!4(n7t3`{!@{rUalrdVN>S`tHiipwK70WVi03&GqN6E!J?_^}E@^&RlK} zU+Sl<`3dhYPi0~_{p!%R-32o2fg*~Y-#jkcG9>(dy|C0@o?%}dXUNn&x28Y1tZ&`d zY!GvxQ0DE=Z7XMm-)>O8{Z5HTe8ZZ<%X7-R;*Q_ppC93=F(`ftD6`&3m42C~HOniT{6 zbNBYs@AKCGGQFztC)!5d$=q0>rQ0fouR>8n#TCEnfZMertF3 zPQ#hr(c%SyEX=^bN&c?C_2kc-vG=aA|)1x!x;Ue}!^@!drLchwfr@_dUz=jFjO$WGDM>QQtgc37|Zy9#bWd;w%aB3;quU z48i^tLLk8ckH}&M2EHR8%s5q>PZ}uL?CIhdV&Q*x;zhm&1rAqVm%sn@`F5;3vhh~U zmnmyc?(EU|D(@#0#NqXAhf_fF1o4t&A&tPo6Kto8m^R<(+UM$&%Wo>C7IGn5tYQhT z=WF+h#1`IVJ}RdjF={g25LoCG$day#-kmAyEq5U{A$i9f}UsW{Pjn}^2N9V=Bu z*g`HCa@C|t`&8+x$DCvfR-0tW*>2Y8=CYwZYNf(WfiUfeiBjJ$eCS#5lS@*P?^LtE nCl1;AHyZ_7#Q!OLsbl&&Ro2R6+fRR>gBUzr{an^LB{Ts53Q22a literal 0 HcmV?d00001 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..4c053af6e81ca7 --- /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": " ", + "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 0000000000000000000000000000000000000000..55f5d9bc1982d821bff6dd5893cc23b1941de198 GIT binary patch literal 313 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCilo1AIbUD;pG6E!0;r;B*U>bP{skYknq8CVzp>+M~Xg`ZZ?H&|KQ0(g#!< zyliP6km4-~@(cct1Q={zD7674I14-?iy0XBj({-ZRBb+KpkR}yi(`m||J{jq`5F{B z+EC;?h46M(jYZ_u47q~8r zQHb%M5Oh$nNk@On*^3VML|c+0G6NWQZOIa5 qT;b=jvn8=!=HfI?{y&Zq$?O~rN_tO|H!cRchQZU-&t;ucLK6V20dOw> literal 0 HcmV?d00001 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..4c053af6e81ca7 --- /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": " ", + "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 0000000000000000000000000000000000000000..63fff3b62b59c9dedcef3ecd3c17181e3f93b06c GIT binary patch literal 308 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCijS1AIbUD;pG6E!0;r;B*U>Oi5z+@{Xaaogp-sVfti-gL{CA7)~U}WdbSg zk|4j}|8T(I<BOiI$dyG`Wv%mC)12P_&J^gl2b={jY*2mhGJ+47f3 zQ&dLj#3v_pclMp(0?#&FTF6wO%cR)v_3<3%q3JC1%pPVpwI%%HGqIoKWVrB_3&Sem npuEHz_I(+rTiE|8^b|7vij{TlTwz`dbP$85tDnm{r-UW|pV@Bi literal 0 HcmV?d00001 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..4c053af6e81ca7 --- /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": " ", + "states": [ + { + "name": "icon", + "directions": 1 + } + ] +} From 9613bdb14eb8c9a16586701363f4686bca577bf3 Mon Sep 17 00:00:00 2001 From: Wizard-Grin <100096262+Wizard-Grin@users.noreply.github.com> Date: Sun, 23 Jul 2023 00:01:28 +0300 Subject: [PATCH 2/3] Copyright moment --- Resources/Textures/Objects/Specific/Tablets/cargo.rsi/meta.json | 2 +- .../Textures/Objects/Specific/Tablets/intercom.rsi/meta.json | 2 +- Resources/Textures/Objects/Specific/Tablets/rnd.rsi/meta.json | 2 +- Resources/Textures/Objects/Specific/Tablets/solar.rsi/meta.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Resources/Textures/Objects/Specific/Tablets/cargo.rsi/meta.json b/Resources/Textures/Objects/Specific/Tablets/cargo.rsi/meta.json index 4c053af6e81ca7..cc009d5aefb536 100644 --- a/Resources/Textures/Objects/Specific/Tablets/cargo.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Tablets/cargo.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": " ", + "copyright": "Made by Wizord", "states": [ { "name": "icon", diff --git a/Resources/Textures/Objects/Specific/Tablets/intercom.rsi/meta.json b/Resources/Textures/Objects/Specific/Tablets/intercom.rsi/meta.json index 4c053af6e81ca7..cc009d5aefb536 100644 --- a/Resources/Textures/Objects/Specific/Tablets/intercom.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Tablets/intercom.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": " ", + "copyright": "Made by Wizord", "states": [ { "name": "icon", diff --git a/Resources/Textures/Objects/Specific/Tablets/rnd.rsi/meta.json b/Resources/Textures/Objects/Specific/Tablets/rnd.rsi/meta.json index 4c053af6e81ca7..cc009d5aefb536 100644 --- a/Resources/Textures/Objects/Specific/Tablets/rnd.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Tablets/rnd.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": " ", + "copyright": "Made by Wizord", "states": [ { "name": "icon", diff --git a/Resources/Textures/Objects/Specific/Tablets/solar.rsi/meta.json b/Resources/Textures/Objects/Specific/Tablets/solar.rsi/meta.json index 4c053af6e81ca7..cc009d5aefb536 100644 --- a/Resources/Textures/Objects/Specific/Tablets/solar.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Tablets/solar.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": " ", + "copyright": "Made by Wizord", "states": [ { "name": "icon", From 1f9cdf820dcb973dfd23b6db24225ae1b9001261 Mon Sep 17 00:00:00 2001 From: Wizard-Grin <100096262+Wizard-Grin@users.noreply.github.com> Date: Sun, 23 Jul 2023 00:06:55 +0300 Subject: [PATCH 3/3] da --- .../Entities/Clothing/OuterClothing/hardsuits.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml index b1f52452949b46..4c8a4d931178b4 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml @@ -475,8 +475,8 @@ highPressureMultiplier: 0.05 lowPressureMultiplier: 1000 - type: ClothingSpeedModifier - walkModifier: 1 - sprintModifier: 1 + walkModifier: 0.9 + sprintModifier: 0.9 - type: Armor modifiers: coefficients: @@ -507,7 +507,7 @@ lowPressureMultiplier: 1000 - type: ClothingSpeedModifier walkModifier: 0.6 - sprintModifier: 0.5 #extremely slow + sprintModifier: 0.6 #extremely slow - type: Armor modifiers: coefficients: