From 3fdac524238ddb7d9c4e336748c54c2006b9d5fd Mon Sep 17 00:00:00 2001 From: 0RK Date: Sat, 1 Aug 2026 13:29:51 +0300 Subject: [PATCH 1/6] =?UTF-8?q?[Fix]=20=D0=9F=D0=B0=D1=80=D1=83=20=D1=84?= =?UTF-8?q?=D0=B8=D0=BA=D1=81=D0=BE=D0=B2=20=D1=88=D0=B5=D0=B4=D0=BE=D0=B2?= =?UTF-8?q?=D0=BA=D0=B8=D0=BD=D0=BE=D0=B2=20=D0=B8=20=D0=BB=D0=BE=D0=B4?= =?UTF-8?q?=D0=B0=D1=83=D1=82=D0=B0=20=D0=98=D0=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Roles/Jobs/Engineering/atmospheric_technician.yml | 2 +- .../Roles/Jobs/Engineering/station_engineer.yml | 2 +- .../_EinsteinEngines/Voice/speech_emote_sounds.yml | 2 +- .../Prototypes/_EinsteinEngines/Voice/speech_emotes.yml | 8 ++++++++ 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml b/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml index e82b6ca35cc..e6427acf53b 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml @@ -39,7 +39,7 @@ - type: startingGear id: AtmosphericTechnicianGear equipment: -# eyes: ClothingEyesGlassesMeson # Orion-Edit: In loadout + eyes: ClothingEyesGlassesMeson #Arcane-Edit id: AtmosPDA belt: ClothingBeltUtilityEngineering ears: ClothingHeadsetEngineering diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml b/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml index 72c341f2adc..61aae30efe5 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml @@ -36,7 +36,7 @@ - type: startingGear id: StationEngineerGear equipment: -# eyes: ClothingEyesGlassesMeson # Orion-Edit: In loadout + eyes: ClothingEyesGlassesMeson #Arcane-Edit belt: ClothingBeltUtilityEngineering ears: ClothingHeadsetEngineering #storage: diff --git a/Resources/Prototypes/_EinsteinEngines/Voice/speech_emote_sounds.yml b/Resources/Prototypes/_EinsteinEngines/Voice/speech_emote_sounds.yml index df392fd86d9..a1931d2006f 100644 --- a/Resources/Prototypes/_EinsteinEngines/Voice/speech_emote_sounds.yml +++ b/Resources/Prototypes/_EinsteinEngines/Voice/speech_emote_sounds.yml @@ -132,7 +132,7 @@ Scream: collection: SlimeFemaleScreams Laugh: - collection: MaleLaugh + collection: FemaleLaugh # Arcane-Edit Sneeze: collection: FemaleSneezes Cough: diff --git a/Resources/Prototypes/_EinsteinEngines/Voice/speech_emotes.yml b/Resources/Prototypes/_EinsteinEngines/Voice/speech_emotes.yml index 78953f1a89c..11f640d1781 100644 --- a/Resources/Prototypes/_EinsteinEngines/Voice/speech_emotes.yml +++ b/Resources/Prototypes/_EinsteinEngines/Voice/speech_emotes.yml @@ -52,6 +52,14 @@ - mars - marsing - marsed + #Arcane-Start + - марс + - марс! + - марс. + - мар + - мар! + - мар. + #Arcane-End - type: emoteSounds id: UnisexPlasmaman From 8481dc37dcfc03219af2bd16e984959146799631 Mon Sep 17 00:00:00 2001 From: 0RK Date: Sat, 1 Aug 2026 14:07:43 +0300 Subject: [PATCH 2/6] =?UTF-8?q?[Fix][Translate]=20=D0=9F=D0=BE=D0=B4=D0=BA?= =?UTF-8?q?=D0=BE=D1=80=D0=B5=D0=BA=D1=82=D0=B8=D1=80=D0=BE=D0=B2=D0=B0?= =?UTF-8?q?=D0=BB=20=D0=BB=D0=B0=D0=B4=D0=B0=D1=83=D1=82=20=D0=93=D0=A1?= =?UTF-8?q?=D0=91=20=D0=B8=20=D0=BB=D0=BE=D0=BA=D0=B0=D0=BB=D0=B8=D0=B7?= =?UTF-8?q?=D0=B0=D1=86=D0=B8=D1=8E=20=D0=BA=D0=B0=D1=82=D0=B5=D0=B3=D0=BE?= =?UTF-8?q?=D1=80=D0=B8=D0=B8=20=D0=B2=20=D0=BB=D0=BE=D0=B4=D0=B0=D1=83?= =?UTF-8?q?=D1=82=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Locale/ru-RU/_Goobstation/loadouts/loadout-groups.ftl | 1 + Resources/Prototypes/Loadouts/role_loadouts.yml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Resources/Locale/ru-RU/_Goobstation/loadouts/loadout-groups.ftl b/Resources/Locale/ru-RU/_Goobstation/loadouts/loadout-groups.ftl index e00c12b39eb..b353b327001 100644 --- a/Resources/Locale/ru-RU/_Goobstation/loadouts/loadout-groups.ftl +++ b/Resources/Locale/ru-RU/_Goobstation/loadouts/loadout-groups.ftl @@ -180,5 +180,6 @@ loadout-group-boxer-envirohelm = Экошлем боксёра loadout-group-boxer-envirosuit = Экокостюм боксёра # Misc loadout-group-plasma-tank = баллон плазмы +loadout-group-security-gloves = Перчатки СБ # Shaft Miner loadout-group-shaft-miner-jumpsuit = комбинезон шахтёра diff --git a/Resources/Prototypes/Loadouts/role_loadouts.yml b/Resources/Prototypes/Loadouts/role_loadouts.yml index f94b876732d..33d0471f104 100644 --- a/Resources/Prototypes/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/Loadouts/role_loadouts.yml @@ -675,7 +675,7 @@ - SecurityBelt - HeadofSecurityOuterClothing - HeadofSecurityShoes # Goobstation edit - - SecurityGloves #goob + #- SecurityGloves #goob Arcane-Edit: The HoS has HeadofSecurityGloves - SurvivalSecurity - Trinkets - Patron # Arcane From fa1751ccf6ac3bc58a871115f94409971c42b37d Mon Sep 17 00:00:00 2001 From: 0RK <136014510+BloodyDog0021@users.noreply.github.com> Date: Sat, 1 Aug 2026 16:14:42 +0300 Subject: [PATCH 3/6] Update Resources/Prototypes/Loadouts/role_loadouts.yml Co-authored-by: UmbiMax <109347499+UmbiMax@users.noreply.github.com> --- Resources/Prototypes/Loadouts/role_loadouts.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Loadouts/role_loadouts.yml b/Resources/Prototypes/Loadouts/role_loadouts.yml index 33d0471f104..2c34a6b239e 100644 --- a/Resources/Prototypes/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/Loadouts/role_loadouts.yml @@ -675,7 +675,7 @@ - SecurityBelt - HeadofSecurityOuterClothing - HeadofSecurityShoes # Goobstation edit - #- SecurityGloves #goob Arcane-Edit: The HoS has HeadofSecurityGloves +# - SecurityGloves #goob # Arcane-Edit: The HoS has HeadofSecurityGloves - SurvivalSecurity - Trinkets - Patron # Arcane From 8da11c40d37a876ba35d2fc81e805072f8d95026 Mon Sep 17 00:00:00 2001 From: 0RK Date: Sat, 1 Aug 2026 13:29:51 +0300 Subject: [PATCH 4/6] =?UTF-8?q?=D0=9F=D1=80=D0=B0=D0=B2=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prototypes/Roles/Jobs/Engineering/station_engineer.yml | 2 +- .../Prototypes/Roles/Jobs/Engineering/technical_assistant.yml | 2 +- Resources/Prototypes/_EinsteinEngines/Voice/speech_emotes.yml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml b/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml index 61aae30efe5..72c341f2adc 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml @@ -36,7 +36,7 @@ - type: startingGear id: StationEngineerGear equipment: - eyes: ClothingEyesGlassesMeson #Arcane-Edit +# eyes: ClothingEyesGlassesMeson # Orion-Edit: In loadout belt: ClothingBeltUtilityEngineering ears: ClothingHeadsetEngineering #storage: diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml b/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml index 1c60dda874e..69fe3298cf0 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml @@ -54,7 +54,7 @@ job: TechnicalAssistant equipment: head: ClothingHeadHatHardhatOrange - eyes: ClothingEyesGlassesMeson +# eyes: ClothingEyesGlassesMeson # Orion-Edit: In loadout mask: ClothingMaskBreath neck: ClothingNeckScarfStripedOrange outerClothing: ClothingOuterVestHazard diff --git a/Resources/Prototypes/_EinsteinEngines/Voice/speech_emotes.yml b/Resources/Prototypes/_EinsteinEngines/Voice/speech_emotes.yml index 11f640d1781..16fce7dddb3 100644 --- a/Resources/Prototypes/_EinsteinEngines/Voice/speech_emotes.yml +++ b/Resources/Prototypes/_EinsteinEngines/Voice/speech_emotes.yml @@ -52,14 +52,14 @@ - mars - marsing - marsed - #Arcane-Start + # Arcane-Start - марс - марс! - марс. - мар - мар! - мар. - #Arcane-End + # Arcane-End - type: emoteSounds id: UnisexPlasmaman From 1ed4d012897477a46392746b68b943a49f6da035 Mon Sep 17 00:00:00 2001 From: 0RK Date: Sat, 1 Aug 2026 16:30:31 +0300 Subject: [PATCH 5/6] =?UTF-8?q?Revert=20"=D0=9F=D1=80=D0=B0=D0=B2=D0=BA?= =?UTF-8?q?=D0=B8"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 8da11c40d37a876ba35d2fc81e805072f8d95026. --- .../Prototypes/Roles/Jobs/Engineering/station_engineer.yml | 2 +- .../Prototypes/Roles/Jobs/Engineering/technical_assistant.yml | 2 +- Resources/Prototypes/_EinsteinEngines/Voice/speech_emotes.yml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml b/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml index 72c341f2adc..61aae30efe5 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml @@ -36,7 +36,7 @@ - type: startingGear id: StationEngineerGear equipment: -# eyes: ClothingEyesGlassesMeson # Orion-Edit: In loadout + eyes: ClothingEyesGlassesMeson #Arcane-Edit belt: ClothingBeltUtilityEngineering ears: ClothingHeadsetEngineering #storage: diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml b/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml index 69fe3298cf0..1c60dda874e 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml @@ -54,7 +54,7 @@ job: TechnicalAssistant equipment: head: ClothingHeadHatHardhatOrange -# eyes: ClothingEyesGlassesMeson # Orion-Edit: In loadout + eyes: ClothingEyesGlassesMeson mask: ClothingMaskBreath neck: ClothingNeckScarfStripedOrange outerClothing: ClothingOuterVestHazard diff --git a/Resources/Prototypes/_EinsteinEngines/Voice/speech_emotes.yml b/Resources/Prototypes/_EinsteinEngines/Voice/speech_emotes.yml index 16fce7dddb3..11f640d1781 100644 --- a/Resources/Prototypes/_EinsteinEngines/Voice/speech_emotes.yml +++ b/Resources/Prototypes/_EinsteinEngines/Voice/speech_emotes.yml @@ -52,14 +52,14 @@ - mars - marsing - marsed - # Arcane-Start + #Arcane-Start - марс - марс! - марс. - мар - мар! - мар. - # Arcane-End + #Arcane-End - type: emoteSounds id: UnisexPlasmaman From dad065a124f7870ed7582e15c3bfb66a86eaabde Mon Sep 17 00:00:00 2001 From: 0RK Date: Sat, 1 Aug 2026 16:36:31 +0300 Subject: [PATCH 6/6] =?UTF-8?q?=D0=9F=D1=80=D0=B0=D0=B2=D0=BA=D0=B8=202?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Prototypes/Loadouts/role_loadouts.yml | 2 +- .../Roles/Jobs/Engineering/atmospheric_technician.yml | 2 +- .../Prototypes/Roles/Jobs/Engineering/station_engineer.yml | 2 +- Resources/Prototypes/_EinsteinEngines/Voice/speech_emotes.yml | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Resources/Prototypes/Loadouts/role_loadouts.yml b/Resources/Prototypes/Loadouts/role_loadouts.yml index 2c34a6b239e..36221e79010 100644 --- a/Resources/Prototypes/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/Loadouts/role_loadouts.yml @@ -675,7 +675,7 @@ - SecurityBelt - HeadofSecurityOuterClothing - HeadofSecurityShoes # Goobstation edit -# - SecurityGloves #goob # Arcane-Edit: The HoS has HeadofSecurityGloves +# - SecurityGloves #goob Arcane-Edit: The HoS has HeadofSecurityGloves - SurvivalSecurity - Trinkets - Patron # Arcane diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml b/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml index e6427acf53b..e82b6ca35cc 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml @@ -39,7 +39,7 @@ - type: startingGear id: AtmosphericTechnicianGear equipment: - eyes: ClothingEyesGlassesMeson #Arcane-Edit +# eyes: ClothingEyesGlassesMeson # Orion-Edit: In loadout id: AtmosPDA belt: ClothingBeltUtilityEngineering ears: ClothingHeadsetEngineering diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml b/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml index 61aae30efe5..72c341f2adc 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml @@ -36,7 +36,7 @@ - type: startingGear id: StationEngineerGear equipment: - eyes: ClothingEyesGlassesMeson #Arcane-Edit +# eyes: ClothingEyesGlassesMeson # Orion-Edit: In loadout belt: ClothingBeltUtilityEngineering ears: ClothingHeadsetEngineering #storage: diff --git a/Resources/Prototypes/_EinsteinEngines/Voice/speech_emotes.yml b/Resources/Prototypes/_EinsteinEngines/Voice/speech_emotes.yml index 11f640d1781..16fce7dddb3 100644 --- a/Resources/Prototypes/_EinsteinEngines/Voice/speech_emotes.yml +++ b/Resources/Prototypes/_EinsteinEngines/Voice/speech_emotes.yml @@ -52,14 +52,14 @@ - mars - marsing - marsed - #Arcane-Start + # Arcane-Start - марс - марс! - марс. - мар - мар! - мар. - #Arcane-End + # Arcane-End - type: emoteSounds id: UnisexPlasmaman