From 1b46270edb97602dc433cafc68f3b97e05324989 Mon Sep 17 00:00:00 2001 From: Raldjatech Date: Mon, 22 Jun 2026 14:19:24 +0300 Subject: [PATCH 1/3] =?UTF-8?q?=D0=BE=D1=82=D0=BA=D0=B0=D1=82=20=D1=80?= =?UTF-8?q?=D0=B0=D0=B4=D0=B0=D1=80=20=D0=B1=D0=BB=D0=B8=D0=BF=D0=B0=20?= =?UTF-8?q?=D0=BC=D0=BE=D0=B7=D0=B3=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Prototypes/Body/Organs/human.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/Resources/Prototypes/Body/Organs/human.yml b/Resources/Prototypes/Body/Organs/human.yml index ce0f1ae3180..06cfeb643f7 100644 --- a/Resources/Prototypes/Body/Organs/human.yml +++ b/Resources/Prototypes/Body/Organs/human.yml @@ -97,17 +97,17 @@ - type: Item size: Small heldPrefix: brain - - type: RadarBlip # LuaM - radarColor: "#E0FFFF" - scale: 6 - shape: Star - visibleFromOtherGrids: true - gridConfig: - color: "#E0FFFF" - shape: Star - respectZoom: true - rotate: true - bounds: "-0.5,-0.5,0.5,0.5" +# - type: RadarBlip # LuaM +# radarColor: "#E0FFFF" +# scale: 6 +# shape: Star +# visibleFromOtherGrids: true +# gridConfig: +# color: "#E0FFFF" +# shape: Star +# respectZoom: true +# rotate: true +# bounds: "-0.5,-0.5,0.5,0.5" - type: entity id: OrganHumanEyes From aff33549f23dfd669e8d1eac4fa6b12e30ba71d8 Mon Sep 17 00:00:00 2001 From: Raldjatech Date: Wed, 24 Jun 2026 10:34:49 +0300 Subject: [PATCH 2/3] =?UTF-8?q?=D0=B2=D1=80=D0=BE=D0=B4=D0=B5=20=D0=B1?= =?UTF-8?q?=D1=8B=20=D1=8D=D1=82=D0=BE=20=D0=B8=D0=B4=D0=B5=D1=82=20=D0=B2?= =?UTF-8?q?=20=D0=BC=D0=BE=D0=B9=20=D1=84=D0=BE=D1=80=D0=BA....=20=D0=B2?= =?UTF-8?q?=D1=80=D0=BE=D0=B4=D0=B5=20=D0=B1=D1=8B...?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Locale/ru-RU/_LuaM/Organs.ftl | 4 ++-- .../hydrakin_inventory_template.yml | 14 ++++++------ .../Nyanotrasen/Body/Prototypes/felinid.yml | 4 ++-- .../Nyanotrasen/Damage/modifier_sets.yml | 8 +++---- .../Nyanotrasen/Species/felinid.yml | 2 +- .../Recipes/Lathes/Packs/animal_cubes.yml | 4 ++-- Resources/Prototypes/Species/arachnid.yml | 2 +- .../Entities/Mobs/Player/ipc.yml | 10 ++++----- .../Prototypes/_Mono/Body/Organs/protogen.yml | 7 ++++++ .../Prototypes/_Mono/Damage/modifier_sets.yml | 4 ++-- .../Prototypes/_Mono/Species/protogen.yml | 2 +- Resources/Prototypes/_NF/radio_channels.yml | 4 ++-- Resources/Prototypes/radio_channels.yml | 22 +++++++++---------- 13 files changed, 47 insertions(+), 40 deletions(-) diff --git a/Resources/Locale/ru-RU/_LuaM/Organs.ftl b/Resources/Locale/ru-RU/_LuaM/Organs.ftl index 73fbecc5765..5b151d3171f 100644 --- a/Resources/Locale/ru-RU/_LuaM/Organs.ftl +++ b/Resources/Locale/ru-RU/_LuaM/Organs.ftl @@ -1,5 +1,5 @@ ent-OrganVulpkaninEyes = Глаза вульпканина .desc = Они отражают красные тона -ent-JunkCannon = Глаза таяры - .desc = Они отражают даже самые слабые лучи света \ No newline at end of file +ent-OrganTajaranEyes = Кошачьи глаза + .desc = Они отражают даже самые слабые лучи света diff --git a/Resources/Prototypes/InventoryTemplates/hydrakin_inventory_template.yml b/Resources/Prototypes/InventoryTemplates/hydrakin_inventory_template.yml index 483431c24de..53b99fbbf56 100644 --- a/Resources/Prototypes/InventoryTemplates/hydrakin_inventory_template.yml +++ b/Resources/Prototypes/InventoryTemplates/hydrakin_inventory_template.yml @@ -40,13 +40,13 @@ uiWindowPos: 1,3 strippingWindowPos: 1,1 displayName: Mask -# - name: eyes -# slotTexture: glasses -# slotFlags: EYES -# stripTime: 3 -# uiWindowPos: 0,4 -# strippingWindowPos: 0,0 -# displayName: Eyes + - name: eyes # LuaM - Enabled + slotTexture: glasses + slotFlags: EYES + stripTime: 3 + uiWindowPos: 0,4 + strippingWindowPos: 0,0 + displayName: Eyes - name: ears slotTexture: ears slotFlags: EARS diff --git a/Resources/Prototypes/Nyanotrasen/Body/Prototypes/felinid.yml b/Resources/Prototypes/Nyanotrasen/Body/Prototypes/felinid.yml index 39ef66eb76e..628f4cb8b23 100644 --- a/Resources/Prototypes/Nyanotrasen/Body/Prototypes/felinid.yml +++ b/Resources/Prototypes/Nyanotrasen/Body/Prototypes/felinid.yml @@ -9,7 +9,7 @@ - torso organs: brain: OrganHumanBrain - eyes: OrganHumanEyes + eyes: OrganTajaranEyes # LuaM - OrganHumanEyes -> OrganTajaranEyes torso: part: TorsoHuman connections: @@ -47,4 +47,4 @@ right foot: part: RightFootHuman left foot: - part: LeftFootHuman \ No newline at end of file + part: LeftFootHuman diff --git a/Resources/Prototypes/Nyanotrasen/Damage/modifier_sets.yml b/Resources/Prototypes/Nyanotrasen/Damage/modifier_sets.yml index 0b4070a5e6c..dfbeb3aa934 100644 --- a/Resources/Prototypes/Nyanotrasen/Damage/modifier_sets.yml +++ b/Resources/Prototypes/Nyanotrasen/Damage/modifier_sets.yml @@ -7,7 +7,7 @@ - type: damageModifierSet id: Felinid - coefficients: - Blunt: 1.1 # 1.15->1.1 Mono - Slash: 1.1 # 1.15->1.1 Mono -# Piercing: 1.1 + coefficients: #LuaM + Blunt: 1.25 # 1.15 -> 1.1 by Mono, 1.1 -> 1.25 by LuaM + Slash: 1.25 # 1.15 -> 1.1 by Mono, 1.1 -> 1.25 by LuaM + Piercing: 1.15 # disabled by Mono, 1.1 -> 1.25 and enabled by LuaM diff --git a/Resources/Prototypes/Nyanotrasen/Species/felinid.yml b/Resources/Prototypes/Nyanotrasen/Species/felinid.yml index 8c3fb3598dd..86e1afde0ee 100644 --- a/Resources/Prototypes/Nyanotrasen/Species/felinid.yml +++ b/Resources/Prototypes/Nyanotrasen/Species/felinid.yml @@ -1,7 +1,7 @@ - type: species id: Felinid name: species-name-felinid - roundStart: false # Mono + roundStart: true # LuaM - false -> true (меня заставили) prototype: MobFelinid sprites: MobHumanSprites markingLimits: MobFelinidMarkingLimits diff --git a/Resources/Prototypes/Recipes/Lathes/Packs/animal_cubes.yml b/Resources/Prototypes/Recipes/Lathes/Packs/animal_cubes.yml index 0d463662efd..2ffc48197e2 100644 --- a/Resources/Prototypes/Recipes/Lathes/Packs/animal_cubes.yml +++ b/Resources/Prototypes/Recipes/Lathes/Packs/animal_cubes.yml @@ -34,9 +34,9 @@ - ReptilianCube - VulpkaninCube - SlimePersonCube - - YowieCube +# - YowieCube #LuaM - Disabled... Хуй вам а не выключение передозов - VoxCube - ResomiCube - GoblinCube - ChitinidCube -# - ProtogenCube #mono: retired + - ProtogenCube #LuaM - enabled diff --git a/Resources/Prototypes/Species/arachnid.yml b/Resources/Prototypes/Species/arachnid.yml index 3e1328c63e8..2a73361aa7c 100644 --- a/Resources/Prototypes/Species/arachnid.yml +++ b/Resources/Prototypes/Species/arachnid.yml @@ -1,7 +1,7 @@ - type: species id: Arachnid name: species-name-arachnid - roundStart: true + roundStart: false #LuaM True -> false due to a bug prototype: MobArachnid sprites: MobArachnidSprites defaultSkinTone: "#385878" diff --git a/Resources/Prototypes/_EinsteinEngines/Entities/Mobs/Player/ipc.yml b/Resources/Prototypes/_EinsteinEngines/Entities/Mobs/Player/ipc.yml index 442ab835d4b..1e3eb3993c9 100644 --- a/Resources/Prototypes/_EinsteinEngines/Entities/Mobs/Player/ipc.yml +++ b/Resources/Prototypes/_EinsteinEngines/Entities/Mobs/Player/ipc.yml @@ -70,7 +70,7 @@ - type: MobThresholds thresholds: 0: Alive - 100: Dead # mono + 150: Dead # LuaM - 100 -> 150 stateAlertDict: Alive: BorgHealth Critical: BorgCrit @@ -87,9 +87,9 @@ - !type:GibBehavior { } - type: SlowOnDamage speedModifierThresholds: - 60: 0.7 - 90: 0.5 - 120: 0.3 + 90: 0.8 # LuaM 60 -> 90 / 0.7 -> 0.8 + 115: 0.5 # LuaM 90 -> 115 + 140: 0.3 # LuaM 120 -> 140 - type: SiliconDownOnDead - type: Inventory templateId: ipc @@ -111,7 +111,7 @@ 0: 0.00 - type: BatteryDrinker - type: EncryptionKeyHolder - keySlots: 8 # Mono + keySlots: 18 # LuaM - 8 -> 18 examineWhileLocked: false keysExtractionMethod: Cutting keysUnlocked: false diff --git a/Resources/Prototypes/_Mono/Body/Organs/protogen.yml b/Resources/Prototypes/_Mono/Body/Organs/protogen.yml index c553ef6deff..db25fb2a273 100644 --- a/Resources/Prototypes/_Mono/Body/Organs/protogen.yml +++ b/Resources/Prototypes/_Mono/Body/Organs/protogen.yml @@ -93,6 +93,13 @@ components: - type: Organ # Shitmed Change slotId: eyes # Shitmed Change + onAdd: + - type: ThermalVision # LuaM + flashDurationMultiplier: 1 + pulseTime: 2 + isEquipment: false + toggleAction: PulseVulpkaninThermalVision + color: "#da4260" - type: Eyes # Shitmed Change - type: Sprite layers: diff --git a/Resources/Prototypes/_Mono/Damage/modifier_sets.yml b/Resources/Prototypes/_Mono/Damage/modifier_sets.yml index 6f54a9b6e43..2d474d2f67e 100644 --- a/Resources/Prototypes/_Mono/Damage/modifier_sets.yml +++ b/Resources/Prototypes/_Mono/Damage/modifier_sets.yml @@ -2,10 +2,10 @@ - type: damageModifierSet # Mono id: Protogen coefficients: - Heat: 1.3 + Heat: 1.1 # 1.3 -> 1.1 by LuaM Cold: 1.15 Radiation: 1.55 - Shock: 1.5 +# Shock: 1.5 # Disabled by LuaM Blunt: 0.8 Slash: 0.9 Piercing: 0.9 diff --git a/Resources/Prototypes/_Mono/Species/protogen.yml b/Resources/Prototypes/_Mono/Species/protogen.yml index ac6033b579a..a455acf7e12 100644 --- a/Resources/Prototypes/_Mono/Species/protogen.yml +++ b/Resources/Prototypes/_Mono/Species/protogen.yml @@ -1,7 +1,7 @@ - type: species id: Protogen name: species-name-protogen - roundStart: false + roundStart: true # LuaM - false -> true prototype: MobProtogen sprites: MobProtogenSprites defaultSkinTone: "#ffda93" diff --git a/Resources/Prototypes/_NF/radio_channels.yml b/Resources/Prototypes/_NF/radio_channels.yml index dbcf2b2457b..07c9a33857b 100644 --- a/Resources/Prototypes/_NF/radio_channels.yml +++ b/Resources/Prototypes/_NF/radio_channels.yml @@ -3,7 +3,7 @@ - type: radioChannel id: Traffic name: chat-radio-traffic - keycode: 'd' + keycode: 'д' # LuaM - локалайз каналов frequency: 1022 color: "#CC6633" maxRange: 1500 @@ -13,7 +13,7 @@ - type: radioChannel id: Nfsd name: chat-radio-ncmc - keycode: 's' + keycode: 'т' # LuaM - локалайз каналов frequency: 1023 color: "#0c8ad3" diff --git a/Resources/Prototypes/radio_channels.yml b/Resources/Prototypes/radio_channels.yml index 07f2f8a2821..049961bf89c 100644 --- a/Resources/Prototypes/radio_channels.yml +++ b/Resources/Prototypes/radio_channels.yml @@ -8,7 +8,7 @@ - type: radioChannel id: CentCom name: chat-radio-centcom - keycode: 'y' + keycode: 'ц' # LuaM - локалайз каналов frequency: 1337 color: "#2681a5" longRange: true @@ -16,56 +16,56 @@ - type: radioChannel id: Command name: chat-radio-command - keycode: 'c' + keycode: 'к' # LuaM - локалайз каналов frequency: 1353 color: "#5569ff" # Mono - type: radioChannel id: Engineering name: chat-radio-engineering - keycode: 'e' + keycode: 'и' # LuaM - локалайз каналов frequency: 1357 color: "#ff733c" - type: radioChannel id: Medical name: chat-radio-medical - keycode: 'm' + keycode: 'м' # LuaM - локалайз каналов frequency: 1355 color: "#57b8f0" - type: radioChannel id: Science name: chat-radio-science - keycode: 'n' + keycode: 'ь' # LuaM - локалайз каналов frequency: 1351 color: "#cd7ccd" - type: radioChannel id: Security name: chat-radio-security - keycode: 'g' + keycode: 'о' # LuaM - локалайз каналов frequency: 1359 color: "#ff4242" - type: radioChannel id: Service name: chat-radio-service - keycode: 'v' + keycode: 'л' # LuaM - локалайз каналов frequency: 1349 color: "#09b96d" - type: radioChannel id: Supply name: chat-radio-supply - keycode: 'u' + keycode: 'г' # LuaM - локалайз каналов frequency: 1347 color: "#b48b57" - type: radioChannel id: Syndicate name: chat-radio-syndicate - keycode: 't' + keycode: 'с' # LuaM - локалайз каналов frequency: 1213 color: "#8f4a4b" # longRange: true # Frontier - Move to Syndicate Base @@ -94,7 +94,7 @@ - type: radioChannel id: Freelance name: chat-radio-freelance - keycode: 'f' + keycode: 'н' # LuaM - локалайз каналов frequency: 1984 color: "#f6ce64" # long range since otherwise it'd defeat the point of a handheld radio independent of telecomms @@ -103,7 +103,7 @@ - type: radioChannel id: VanguardCommand name: chat-radio-vanguard-command - keycode: 'r' + keycode: 'ф' # LuaM - локалайз каналов frequency: 1985 color: "#BF94E4" # long range since otherwise it'd defeat the point of a handheld radio independent of telecomms From 6eef0a613c82f7b3c20c73edb66ce31c9be0d42f Mon Sep 17 00:00:00 2001 From: Raldjatech Date: Wed, 24 Jun 2026 13:40:11 +0300 Subject: [PATCH 3/3] Update Resources/Prototypes/Nyanotrasen/Damage/modifier_sets.yml Co-authored-by: Pcol --- Resources/Prototypes/Nyanotrasen/Damage/modifier_sets.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Nyanotrasen/Damage/modifier_sets.yml b/Resources/Prototypes/Nyanotrasen/Damage/modifier_sets.yml index dfbeb3aa934..3c7db4befb2 100644 --- a/Resources/Prototypes/Nyanotrasen/Damage/modifier_sets.yml +++ b/Resources/Prototypes/Nyanotrasen/Damage/modifier_sets.yml @@ -7,7 +7,7 @@ - type: damageModifierSet id: Felinid - coefficients: #LuaM + coefficients: Blunt: 1.25 # 1.15 -> 1.1 by Mono, 1.1 -> 1.25 by LuaM Slash: 1.25 # 1.15 -> 1.1 by Mono, 1.1 -> 1.25 by LuaM Piercing: 1.15 # disabled by Mono, 1.1 -> 1.25 and enabled by LuaM