From 796b2bf9619df0cdc233c3782d24d87167fcc9ae Mon Sep 17 00:00:00 2001 From: MrFolium Date: Tue, 14 Jul 2026 08:28:04 +0500 Subject: [PATCH 01/18] Rotatable was removed --- Resources/Prototypes/Entities/Structures/catwalk.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Structures/catwalk.yml b/Resources/Prototypes/Entities/Structures/catwalk.yml index 049daf53e3f..48676e953c5 100644 --- a/Resources/Prototypes/Entities/Structures/catwalk.yml +++ b/Resources/Prototypes/Entities/Structures/catwalk.yml @@ -9,7 +9,6 @@ - type: Anchorable flags: - Anchorable - - type: Rotatable - type: Clickable - type: Sprite sprite: Structures/catwalk.rsi From 6864b52bc73281d3d126a0b385706e326e4b8f25 Mon Sep 17 00:00:00 2001 From: MrFolium Date: Tue, 14 Jul 2026 14:37:38 +0500 Subject: [PATCH 02/18] Update sprites and healing values --- .../Objects/Tools/nanite_applicator.yml | 29 ++++++++++----- .../base.png | Bin 0 -> 633 bytes .../icon.png | Bin 0 -> 1161 bytes .../inhand-left.png | Bin 0 -> 689 bytes .../inhand-right.png | Bin 0 -> 682 bytes .../meta.json | 33 ++++++++++++++++++ 6 files changed, 53 insertions(+), 9 deletions(-) create mode 100644 Resources/Textures/_LuaM/Objects/Tools/nanite_applicator_experimental.rsi/base.png create mode 100644 Resources/Textures/_LuaM/Objects/Tools/nanite_applicator_experimental.rsi/icon.png create mode 100644 Resources/Textures/_LuaM/Objects/Tools/nanite_applicator_experimental.rsi/inhand-left.png create mode 100644 Resources/Textures/_LuaM/Objects/Tools/nanite_applicator_experimental.rsi/inhand-right.png create mode 100644 Resources/Textures/_LuaM/Objects/Tools/nanite_applicator_experimental.rsi/meta.json diff --git a/Resources/Prototypes/_Mono/Entities/Objects/Tools/nanite_applicator.yml b/Resources/Prototypes/_Mono/Entities/Objects/Tools/nanite_applicator.yml index 3862bd8827c..709499bfa15 100644 --- a/Resources/Prototypes/_Mono/Entities/Objects/Tools/nanite_applicator.yml +++ b/Resources/Prototypes/_Mono/Entities/Objects/Tools/nanite_applicator.yml @@ -51,12 +51,12 @@ fuelCost: 5 damage: types: - Blunt: -12.5 - Piercing: -12.5 - Slash: -12.5 - Heat: -9 - Shock: -9 - Radiation: -9 + Blunt: -15 # LuaM -12.5 > -15 + Piercing: -15 # LuaM -12.5 > -15 + Slash: -15 # LuaM -12.5 > -15 + Heat: -10 # LuaM -9 > -10 + Shock: -10 # LuaM -9 > -10 + Radiation: -10 # LuaM -9 > -10 - type: entity name: experimental nanite applicator @@ -65,7 +65,7 @@ description: "An experimental nanite applicator with a heavily upgraded nanite capacity capable of self-nanite generation." components: - type: Sprite - sprite: _Mono/Objects/Tools/nanite_applicator_experimental.rsi + sprite: _LuaM/Objects/Tools/nanite_applicator_experimental.rsi layers: - state: icon - type: SolutionRegeneration @@ -76,10 +76,10 @@ Quantity: 2 - type: entity - name: advanced nanite applicator + name: combat nanite applicator parent: NaniteApplicatorExperimental id: NaniteApplicatorSyndicate - description: "Advanced nanite applicator with a heavily upgraded nanite capacity capable of self-nanite generation." + description: "Advanced nanite applicator designed for use in combat with self-nanite generation." components: - type: Sprite sprite: _Mono/Objects/Tools/nanite_applicator_syndicate.rsi @@ -98,3 +98,14 @@ reagents: - ReagentId: NaniteFuel Quantity: 1 + - type: WeldingHealing # LuaM + breakOnMove: false + breakOnDamage: false + damage: + types: + Blunt: -20 + Piercing: -20 + Slash: -20 + Heat: -13.5 + Shock: -13.5 + Radiation: -13.5 \ No newline at end of file diff --git a/Resources/Textures/_LuaM/Objects/Tools/nanite_applicator_experimental.rsi/base.png b/Resources/Textures/_LuaM/Objects/Tools/nanite_applicator_experimental.rsi/base.png new file mode 100644 index 0000000000000000000000000000000000000000..e2c5e9e1861600b9928b3c14383c77bb36a20754 GIT binary patch literal 633 zcmV-<0*3vGP))o}c;3 z@P*?wgQ|`KgPyel!=;PlOa6Zivgtm#SC_^dJq8<2U)HpugYNcDgq=7 z##W`q|2?{u!Hz(2z_Vx17+$`7$#CGnSq8y9Mhw>lt}@SPn7->OkfpW0FGvSu-`*1MUEfC;$Z|y@DSU zf`cyvlvH*9gIor}pezTXmwayqQ4GZJn=XZ6geq7w4g#Yb02L&bf_@w$CZ0IN$1)~74ferxx5ESog Tu*Q#D00000NkvXXu0mjfsF(b; literal 0 HcmV?d00001 diff --git a/Resources/Textures/_LuaM/Objects/Tools/nanite_applicator_experimental.rsi/icon.png b/Resources/Textures/_LuaM/Objects/Tools/nanite_applicator_experimental.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..34ab3615e8a43601736cf03c96c159e5536884f4 GIT binary patch literal 1161 zcmV;41a|w0P)}P>F2xPgox(-89QYcJ_TJ-;({w@@=?%lqO5hw#?KRf_nF8uoSE10=*FpA3&(2)RUHM8GB5_YiKF5s*dCDm zFJ`baSh*X6-GFX?iD5Tb57>Q3_A`M+p~SOi&lq05d?a|7#u#tpqPms2(-4p%Df+JKPd7*44C~G0r2GceULoG7?kWmhJZYeZYHiW02Be} zYC&d@gNd~t9snRqV6gyV6N}l{Simuiiw1cJn}@NPKM?k#1OT$5K#uwP03!>~Gx=dlE%dg3GzFl?f|9E4f0!7k$^)^Nd~XI(48-tZO-!%`G6;Ix zkI@bQHD<(x#TX`fE(SY4e|s#05`!vH{FMv0g7r{B(A$2D6aaF3o!%;NDp=1v3B+Xx z{F?`+3Gpe7eXu1A3=9Kp|0oy*qhJ(_f>AIEM!_f;1*2dTjDq0~P`bmQ;i%E|0i){! zaIX&lWe3o7HLmpmp!s=_8qgg5J;h_-d3*Hr0U)_!JI_+IK0wb}f#K582MnNTd(d<{ zY<&XEevlhr;^_8+B%D3PJ6UgfW zV3vbC2=YAo{5))Z07wqk$Pv2zpamHqJ3;FKkk<$7oOl&%Kgg3HdtmDWK%N6(m^kwK z0GRzCIhf}`02~S+1}Oi7W_D=3J^&OzpgDTt95cE;z}T7reTEn`If847 z8Wd=-KqNNSVd}Bb^spbL7Qp5RbTM3>M^{HHKDF(~ngu{HNw4{NYym}2`$Q`hu-#&rU3LUH8pC4%ZN5Lo<1*2dTi~_($ bNC*G`@~Oft0iDQ;00000NkvXXu0mjfPG$C^ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_LuaM/Objects/Tools/nanite_applicator_experimental.rsi/inhand-left.png b/Resources/Textures/_LuaM/Objects/Tools/nanite_applicator_experimental.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..8fd84c45e0227e8d8fc2617d41a2ee08312d8b5a GIT binary patch literal 689 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9GGLLkg|>2BR01_q{N zPZ!6K3dSS}*2M`TJxzfITy6(7P&f-%XPD)FtPeV)8fvSVws>`_llTI)c+b%9|F>pe z|Hu8#FiGKButKTASA|-IzgJ55%{FI9G2F5F!(;dFA{_m=N~~gHnz5_3g;VaSi2$vc$#gx-$)9`tME-?U&*|Z{blp3bcUInhfY+nnMyy2 z5O6C~>EP#*$f=Z$lv% z4LS^#98U}`*w|}KbKqm^3}$XV!!#3Wl-Jp%Squ*8rJU>76^>t2IG^14Q$4`?HwNd>7V zjuB^?-z+?mGmBwDvm;-#B;TXvB>rRSQ`ug!&SbpIZX|uA{i4A~N5{i5ZrR6qyw3N- glTicjS^)-zoOKG-^?xdufoYJz)78&qol`;+0ATF@WB>pF literal 0 HcmV?d00001 diff --git a/Resources/Textures/_LuaM/Objects/Tools/nanite_applicator_experimental.rsi/inhand-right.png b/Resources/Textures/_LuaM/Objects/Tools/nanite_applicator_experimental.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..ee00525ef3e263f89a5e6fa44597883027f6c5de GIT binary patch literal 682 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9GGLLkg|>2BR01_q`W zPZ!6K3dSS}*2M`TJxzfITy6(7P&f>YnU}@>vtK;S`uH=y@Gf=7F4pf7hB3R#-tM2Y z>fHoBjtRdV|1tbzf1+Qqzlp(%p+RKtOoby0?jJhw;IaI<17{EO2N|arp7^U!-|&a| zllY1H7xNm~89anUf)u4i+FPF|%C)jGorqWX-}r}fGBaZVLj#MWA`6#hKu4pAp@G4g zeKr3$lsyDBG+#>H;^}e8-xYvc2ht!vBLnlapCEo19*}p5Fh#hM(7xZGzf_AA4_4Kd8yLEK}ox zLA~N{)+c!r>J$F4{^quIahS)J*>+LE*I88gH}ezu8TJm36zUKEkTCHu^bl-2A|S%> zlljSf#TQ?&gcnNSfj9w7Jv+^$c1#K@YfyJTS*o9LiP7Y6Q|`5?F~%ETGFQr_u%FPI zF!#ol3EFOf3=Pk2d^opj(rYc1T7~n?X(f)vyA^gjlqq=zpIM^8;IOS(hNVbi-Ous~ zQbmR*J};QTK9hG7bBg%Rw1=16i-5XsCY%(o`s`KlPj>p-iX)EmjthPMV9H&wKb+JQP!<$80ZQ*H% eF+o{_h2hyHStpkJf?t4%kHOQ`&t;ucLK6VlL=Eo% literal 0 HcmV?d00001 diff --git a/Resources/Textures/_LuaM/Objects/Tools/nanite_applicator_experimental.rsi/meta.json b/Resources/Textures/_LuaM/Objects/Tools/nanite_applicator_experimental.rsi/meta.json new file mode 100644 index 00000000000..3500d14cbf7 --- /dev/null +++ b/Resources/Textures/_LuaM/Objects/Tools/nanite_applicator_experimental.rsi/meta.json @@ -0,0 +1,33 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "original sprite by avalon2855 on (discord), recolored by MrFolium", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "base" + }, + { + "name": "icon", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} From 49969a26f8943c0d5520a052062280016999d0c9 Mon Sep 17 00:00:00 2001 From: MrFolium Date: Tue, 14 Jul 2026 14:40:55 +0500 Subject: [PATCH 03/18] added new prototype --- .../Entities/Objects/Power/powercells.yml | 38 ++++++++++++++++++ .../_LuaM/Recipes/Lathes/powercells.yml | 15 +++++++ .../Power/power_cells.rsi/experimental.png | Bin 0 -> 329 bytes .../Objects/Power/power_cells.rsi/meta.json | 20 +++++++++ .../Objects/Power/power_cells.rsi/o1.png | Bin 0 -> 118 bytes .../Objects/Power/power_cells.rsi/o2.png | Bin 0 -> 118 bytes 6 files changed, 73 insertions(+) create mode 100644 Resources/Prototypes/_LuaM/Entities/Objects/Power/powercells.yml create mode 100644 Resources/Prototypes/_LuaM/Recipes/Lathes/powercells.yml create mode 100644 Resources/Textures/_LuaM/Objects/Power/power_cells.rsi/experimental.png create mode 100644 Resources/Textures/_LuaM/Objects/Power/power_cells.rsi/meta.json create mode 100644 Resources/Textures/_LuaM/Objects/Power/power_cells.rsi/o1.png create mode 100644 Resources/Textures/_LuaM/Objects/Power/power_cells.rsi/o2.png diff --git a/Resources/Prototypes/_LuaM/Entities/Objects/Power/powercells.yml b/Resources/Prototypes/_LuaM/Entities/Objects/Power/powercells.yml new file mode 100644 index 00000000000..4543194a396 --- /dev/null +++ b/Resources/Prototypes/_LuaM/Entities/Objects/Power/powercells.yml @@ -0,0 +1,38 @@ +- type: entity + name: experimental combat power cell + description: A rechargeable standardized power cell. This combat brand is equipped with partial protection from power spikes. + id: ExperimentalPowerCellCombat + suffix: Full + parent: PowerCellHigh + components: + - type: BatterySelfRecharger + autoRecharge: true + autoRechargeRate: 12 # takes 1 minute to charge itself back to full + - type: Sprite + sprite: _LuaM/Objects/Power/power_cells.rsi + layers: + - map: [ "enum.PowerCellVisualLayers.Base" ] + state: experimental + - map: [ "enum.PowerCellVisualLayers.Unshaded" ] + state: o2 + shader: unshaded + - type: EmpResistance + coefficient: 0.0001 + + +- type: entity + id: ExperimentalPowerCellCombatPrinted + suffix: Empty + parent: ExperimentalPowerCellCombat + components: + - type: Sprite + layers: + - map: [ "enum.PowerCellVisualLayers.Base" ] + state: experimental + - map: [ "enum.PowerCellVisualLayers.Unshaded" ] + state: o2 + shader: unshaded + visible: false + - type: Battery + maxCharge: 1080 + startingCharge: 0 \ No newline at end of file diff --git a/Resources/Prototypes/_LuaM/Recipes/Lathes/powercells.yml b/Resources/Prototypes/_LuaM/Recipes/Lathes/powercells.yml new file mode 100644 index 00000000000..10af7c4cb4d --- /dev/null +++ b/Resources/Prototypes/_LuaM/Recipes/Lathes/powercells.yml @@ -0,0 +1,15 @@ +- type: latheRecipe + id: ExperimentalPowerCellCombat + result: ExperimentalPowerCellCombatPrinted + categories: + - Parts + completetime: 15 + materials: + Steel: 500 + Plasteel: 250 + Glass: 400 + Plastic: 200 + UraniumFissile: 50 + Gold: 300 + Diamond: 25 + diff --git a/Resources/Textures/_LuaM/Objects/Power/power_cells.rsi/experimental.png b/Resources/Textures/_LuaM/Objects/Power/power_cells.rsi/experimental.png new file mode 100644 index 0000000000000000000000000000000000000000..7a641a4f2c0e619a42a8a7565433e3546b6db96f GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oArNM~bhqvgQ1G{> zi(^OxXOaZ#;slYNra*%W4HF~SE2^vix38?-SjyepvYo%@^oG>e+-&msoNY~ak0uyi zkN0z#eVXN(qsqb4r%y9%n$!4Dr+L8w1&L-I`_l&)(wd)insBY_VLhibsqw>3g$VW& z&lT8O*pnu64`P(QROL9 z07uS8=N~f9s$<%OmHo;%PMkh1oNVW4s$$6y@AT)xL*|p56BfL7JE#HnD1%$S00Top Xyt(r>BlcckFfe$!`njxgN@xNAvqXX& literal 0 HcmV?d00001 diff --git a/Resources/Textures/_LuaM/Objects/Power/power_cells.rsi/meta.json b/Resources/Textures/_LuaM/Objects/Power/power_cells.rsi/meta.json new file mode 100644 index 00000000000..b30763728a5 --- /dev/null +++ b/Resources/Textures/_LuaM/Objects/Power/power_cells.rsi/meta.json @@ -0,0 +1,20 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "sprites based on https://github.com/vgstation-coders/vgstation13/commit/1dbcf389b0ec6b2c51b002df5fef8dd1519f8068. power cells edited by EmoGarbage404", + "states": [ + { + "name": "experimental" + }, + { + "name": "o1" + }, + { + "name": "o2" + } + ] +} diff --git a/Resources/Textures/_LuaM/Objects/Power/power_cells.rsi/o1.png b/Resources/Textures/_LuaM/Objects/Power/power_cells.rsi/o1.png new file mode 100644 index 0000000000000000000000000000000000000000..348baff449932672a0729a9153ce4e5bd4cabd20 GIT binary patch literal 118 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}2A(dCArY-_ z&pHY+IB*<3z%%XKe&!2TJ~P~ZW3THmNkvz6$?TZ&Ea`IxcJK3^r1F57ft5YQW3`YL PP%ne0tDnm{r-UW|F?1uq literal 0 HcmV?d00001 diff --git a/Resources/Textures/_LuaM/Objects/Power/power_cells.rsi/o2.png b/Resources/Textures/_LuaM/Objects/Power/power_cells.rsi/o2.png new file mode 100644 index 0000000000000000000000000000000000000000..504d64fa7032c6c4f91e1a58ef4a2c70d81512ce GIT binary patch literal 118 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}2A(dCArY-_ z&urvnP~c%c*fI4+XXZ(tg$d0|_D Date: Tue, 14 Jul 2026 14:50:08 +0500 Subject: [PATCH 04/18] changed values --- Resources/Prototypes/Entities/Objects/Tools/welders.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Tools/welders.yml b/Resources/Prototypes/Entities/Objects/Tools/welders.yml index 941997808f8..214a861b5d9 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/welders.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/welders.yml @@ -119,9 +119,9 @@ fuelCost: 5 damage: types: - Blunt: -25 - Piercing: -25 - Slash: -25 + Blunt: -12.5 # LuaM -25 > -12.5 + Piercing: -12.5 # LuaM -25 > -12.5 + Slash: -12.5 # LuaM -25 > -12.5 - type: Cautery # Shitmed speed: 0.7 - type: SurgeryTool # Shitmed From a5e1757e8923c59d0dbe61ab74a5481f71c1e3bc Mon Sep 17 00:00:00 2001 From: MrFolium Date: Tue, 14 Jul 2026 14:55:20 +0500 Subject: [PATCH 05/18] Added break toggle, fix crash, Use in Hand support --- .../WeldingHealable/WeldingHealableSystem.cs | 77 +++++++++++++++---- .../WeldingHealing/WeldingHealingComponent.cs | 16 +++- .../Tools/Systems/SharedToolSystem.cs | 28 +++++-- 3 files changed, 95 insertions(+), 26 deletions(-) diff --git a/Content.Server/_EinsteinEngines/Silicon/WeldingHealable/WeldingHealableSystem.cs b/Content.Server/_EinsteinEngines/Silicon/WeldingHealable/WeldingHealableSystem.cs index af88f8ec4de..adcf7727dc5 100644 --- a/Content.Server/_EinsteinEngines/Silicon/WeldingHealable/WeldingHealableSystem.cs +++ b/Content.Server/_EinsteinEngines/Silicon/WeldingHealable/WeldingHealableSystem.cs @@ -10,6 +10,7 @@ using Content.Shared._Shitmed.Targeting; using Content.Shared.Body.Systems; using SharedToolSystem = Content.Shared.Tools.Systems.SharedToolSystem; +using Content.Shared.Interaction.Events; // LuaM namespace Content.Server._EinsteinEngines.Silicon.WeldingHealable; @@ -24,6 +25,7 @@ public override void Initialize() { SubscribeLocalEvent(Repair); SubscribeLocalEvent(OnRepairFinished); + SubscribeLocalEvent(OnUseInHand); //LuaM } private void OnRepairFinished(EntityUid uid, WeldingHealableComponent healableComponent, SiliconRepairFinishedEvent args) @@ -49,19 +51,22 @@ private void OnRepairFinished(EntityUid uid, WeldingHealableComponent healableCo _popup.PopupEntity(str, uid, args.User); if (!args.Used.HasValue - || _toolSystem.GetWelderFuelAndCapacity(args.Used.Value).fuel < component.FuelCost) //Mono: Nanite applicator + || _toolSystem.GetWelderFuelAndCapacity(args.Used.Value).fuel < component.FuelCost //Mono: Nanite applicator + || !HasDamage((args.Target.Value, damageable), component, args.User)) //LuaM HasDamage check return; - args.Handled = _toolSystem.UseTool - (args.Used.Value, - args.User, - uid, - args.Delay, - component.QualityNeeded, - new SiliconRepairFinishedEvent - { - Delay = args.Delay - }); + args.Handled = _toolSystem.UseTool + (args.Used.Value, + args.User, + uid, + args.Delay, + component.QualityNeeded, + new SiliconRepairFinishedEvent + { + Delay = args.Delay + }, + breakOnMove: component.BreakOnMove, // LuaM + breakOnDamage: component.BreakOnDamage); //LuaM dedefault value } private async void Repair(EntityUid uid, WeldingHealableComponent healableComponent, InteractUsingEvent args) { @@ -77,8 +82,8 @@ private async void Repair(EntityUid uid, WeldingHealableComponent healableCompon return; float delay = args.User == args.Target - ? component.DoAfterDelay * component.SelfHealPenalty - : component.DoAfterDelay; + ? component.DoAfterDelay * component.SelfHealPenalty + : component.DoAfterDelay ; args.Handled = _toolSystem.UseTool (args.Used, @@ -89,8 +94,42 @@ private async void Repair(EntityUid uid, WeldingHealableComponent healableCompon new SiliconRepairFinishedEvent { Delay = delay, - }); + }, + breakOnMove: component.BreakOnMove, // LuaM default value + breakOnDamage: component.BreakOnDamage); // LuaM default value + } + // LuaM self-heal with Use in Hand + //LuaM-start: + private void OnUseInHand(Entity ent, ref UseInHandEvent args) + { + var component = ent.Comp; + + if (args.Handled + || !EntityManager.TryGetComponent(args.User, out DamageableComponent? damageable) + || damageable.DamageContainerID is null + || !component.DamageContainers.Contains(damageable.DamageContainerID) + || !HasDamage((args.User, damageable), component, args.User) + || !_toolSystem.HasQuality(ent.Owner, component.QualityNeeded) + || !component.AllowSelfHeal + || _toolSystem.GetWelderFuelAndCapacity(ent.Owner).fuel < component.FuelCost) + return; + + float delay = component.DoAfterDelay * component.SelfHealPenalty; + + args.Handled = _toolSystem.UseTool( + ent.Owner, + args.User, + args.User, + delay, + component.QualityNeeded, + new SiliconRepairFinishedEvent + { + Delay = delay, + }, + breakOnMove: component.BreakOnMove, + breakOnDamage: component.BreakOnDamage); } + //LuaM-end private bool HasDamage(Entity damageable, WeldingHealingComponent healable, EntityUid user) { @@ -98,8 +137,11 @@ private bool HasDamage(Entity damageable, WeldingHealingCom return false; foreach (var type in healable.Damage.DamageDict) - if (damageable.Comp.Damage.DamageDict[type.Key].Value > 0) + if (damageable.Comp.Damage.DamageDict.TryGetValue(type.Key, out var damage) && // LuaM: Prevent crash if damage type is absent. + damage.Value > 0) + { return true; + } // In case the healer is a humanoid entity with targeting, we run the check on the targeted parts. if (!TryComp(user, out TargetingComponent? targeting)) @@ -109,8 +151,11 @@ private bool HasDamage(Entity damageable, WeldingHealingCom foreach (var part in _bodySystem.GetBodyChildrenOfType(damageable, targetType, symmetry: targetSymmetry)) if (TryComp(part.Id, out var damageablePart)) foreach (var type in healable.Damage.DamageDict) - if (damageablePart.Damage.DamageDict[type.Key].Value > 0) + if (damageablePart.Damage.DamageDict.TryGetValue(type.Key, out var damage) // LuaM: Prevent crash if damage type is absent. + && damage.Value > 0) + { return true; + } return false; } diff --git a/Content.Server/_EinsteinEngines/Silicon/WeldingHealing/WeldingHealingComponent.cs b/Content.Server/_EinsteinEngines/Silicon/WeldingHealing/WeldingHealingComponent.cs index 355abee1545..965e0e421cf 100644 --- a/Content.Server/_EinsteinEngines/Silicon/WeldingHealing/WeldingHealingComponent.cs +++ b/Content.Server/_EinsteinEngines/Silicon/WeldingHealing/WeldingHealingComponent.cs @@ -26,15 +26,27 @@ public sealed partial class WeldingHealingComponent : Component /// [DataField] public int FuelCost = 5; + + /// + /// Whether repairing is interrupted when the user moves + /// + [DataField] //LuaM + public bool BreakOnMove = true; + + /// + /// Whether repairing is interrupted when the user takes damage + /// + [DataField] //LuaM + public bool BreakOnDamage = true; [DataField] - public int DoAfterDelay = 3; + public int DoAfterDelay = 3; /// /// A multiplier that will be applied to the above if an entity is repairing themselves. /// [DataField] - public float SelfHealPenalty = 3f; + public float SelfHealPenalty = 1.5f; // LuaM 3f > 1.5f /// /// Whether or not an entity is allowed to repair itself. diff --git a/Content.Shared/Tools/Systems/SharedToolSystem.cs b/Content.Shared/Tools/Systems/SharedToolSystem.cs index 76555b2a05e..964defb3d28 100644 --- a/Content.Shared/Tools/Systems/SharedToolSystem.cs +++ b/Content.Shared/Tools/Systems/SharedToolSystem.cs @@ -128,7 +128,9 @@ public bool UseTool( IEnumerable toolQualitiesNeeded, DoAfterEvent doAfterEv, float fuel = 0, - ToolComponent? toolComponent = null) + ToolComponent? toolComponent = null, + bool breakOnMove = true, // LuaM defaut value + bool breakOnDamage = true) // LuaM defaut value { return UseTool(tool, user, @@ -138,7 +140,9 @@ public bool UseTool( doAfterEv, out _, fuel, - toolComponent); + toolComponent, + breakOnMove, // LuaM + breakOnDamage); // LuaM } /// @@ -167,7 +171,10 @@ public bool UseTool( DoAfterEvent doAfterEv, out DoAfterId? id, float fuel = 0, - ToolComponent? toolComponent = null) + ToolComponent? toolComponent = null, + bool breakOnMove = true, // LuaM defaut value + bool breakOnDamage = true) // LuaM defaut value + { id = null; if (!Resolve(tool, ref toolComponent, false)) @@ -179,8 +186,8 @@ public bool UseTool( var toolEvent = new ToolDoAfterEvent(fuel, doAfterEv, GetNetEntity(target)); var doAfterArgs = new DoAfterArgs(EntityManager, user, delay / toolComponent.SpeedModifier, toolEvent, tool, target: target, used: tool) { - BreakOnDamage = true, - BreakOnMove = true, + BreakOnMove = breakOnMove, // LuaM + BreakOnDamage = breakOnDamage, // LuaM BreakOnWeightlessMove = false, NeedHand = tool != user, AttemptFrequency = fuel > 0 ? AttemptFrequency.EveryTick : AttemptFrequency.Never @@ -213,9 +220,12 @@ public bool UseTool( string toolQualityNeeded, DoAfterEvent doAfterEv, float fuel = 0, - ToolComponent? toolComponent = null) + ToolComponent? toolComponent = null, + bool breakOnMove = true, // LuaM defaut value + bool breakOnDamage = true) // LuaM defaut value { - return UseTool(tool, + return UseTool( + tool, user, target, TimeSpan.FromSeconds(doAfterDelay), @@ -223,7 +233,9 @@ public bool UseTool( doAfterEv, out _, fuel, - toolComponent); + toolComponent, + breakOnMove, // LuaM + breakOnDamage); // LuaM } /// From 3f7bc31d6307dae0af117abb201cf84ff39a1b4c Mon Sep 17 00:00:00 2001 From: MrFolium Date: Tue, 14 Jul 2026 14:55:46 +0500 Subject: [PATCH 06/18] aghost fix --- Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml b/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml index b96c0f10fe8..b004ea1ab20 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml @@ -116,8 +116,8 @@ - Inorganic - type: ShowSyndicateIcons # Monolith - type: MovementSpeedModifier # LuaM - baseWalkSpeed: 10 - baseSprintSpeed: 35 + baseWalkSpeed: 35 + baseSprintSpeed: 15 - type: entity id: ActionAGhostShowSolar From 1f605015aabd1b21c6210fc607f8f411fc2a9190 Mon Sep 17 00:00:00 2001 From: MrFolium Date: Tue, 14 Jul 2026 14:59:03 +0500 Subject: [PATCH 07/18] Applicator Syndicate was cleaned --- Resources/Maps/_Mono/Shuttles/Capitals/saturn.yml | 2 +- Resources/Prototypes/_Mono/Catalogs/pdv_uplink_catalog.yml | 6 +++--- Resources/Prototypes/_Mono/Catalogs/uplink_catalog.yml | 6 +++--- Resources/Prototypes/_Mono/Research/Rogue/rogue_misc.yml | 1 - 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/Resources/Maps/_Mono/Shuttles/Capitals/saturn.yml b/Resources/Maps/_Mono/Shuttles/Capitals/saturn.yml index e2e53d78770..f3d715a92e8 100644 --- a/Resources/Maps/_Mono/Shuttles/Capitals/saturn.yml +++ b/Resources/Maps/_Mono/Shuttles/Capitals/saturn.yml @@ -17886,7 +17886,7 @@ entities: - type: Transform pos: -3.3705235,6.3534303 parent: 1 -- proto: NaniteApplicatorSyndicate +- proto: NaniteApplicatorExperimental # LuaM entities: - uid: 364 components: diff --git a/Resources/Prototypes/_Mono/Catalogs/pdv_uplink_catalog.yml b/Resources/Prototypes/_Mono/Catalogs/pdv_uplink_catalog.yml index a1b2c1c7941..87b7879fc4b 100644 --- a/Resources/Prototypes/_Mono/Catalogs/pdv_uplink_catalog.yml +++ b/Resources/Prototypes/_Mono/Catalogs/pdv_uplink_catalog.yml @@ -475,13 +475,13 @@ tags: - PirateUplink -- type: listing +- type: listing # LuaM id: UplinkPirateSyndicateApplicator name: uplink-syndicate-applicator-name description: uplink-syndicate-applicator-desc - productEntity: NaniteApplicatorSyndicate + productEntity: NaniteApplicatorExperimental cost: - Doubloon: 35 + Doubloon: 15 categories: - UplinkPirateUtility conditions: diff --git a/Resources/Prototypes/_Mono/Catalogs/uplink_catalog.yml b/Resources/Prototypes/_Mono/Catalogs/uplink_catalog.yml index 25a49b10577..4e05244bad3 100644 --- a/Resources/Prototypes/_Mono/Catalogs/uplink_catalog.yml +++ b/Resources/Prototypes/_Mono/Catalogs/uplink_catalog.yml @@ -78,12 +78,12 @@ categories: - UplinkDeception -- type: listing +- type: listing # LuaM id: UplinkSyndicateApplicator name: uplink-syndicate-applicator-name description: uplink-syndicate-applicator-desc - productEntity: NaniteApplicatorSyndicate + productEntity: NaniteApplicatorExperimental cost: - Telecrystal: 35 + Telecrystal: 15 categories: - UplinkDisruption diff --git a/Resources/Prototypes/_Mono/Research/Rogue/rogue_misc.yml b/Resources/Prototypes/_Mono/Research/Rogue/rogue_misc.yml index 7ac3ded848b..65232e45b89 100644 --- a/Resources/Prototypes/_Mono/Research/Rogue/rogue_misc.yml +++ b/Resources/Prototypes/_Mono/Research/Rogue/rogue_misc.yml @@ -54,7 +54,6 @@ cost: 10000 recipeUnlocks: - JawsOfLifeRogue - - NaniteApplicatorSyndicate technologyPrerequisites: - UniversalMaterialResearchT1 position: 12, -1 From 86a151aaa075daeaefe19bdf80337ee0e128bea4 Mon Sep 17 00:00:00 2001 From: MrFolium Date: Tue, 14 Jul 2026 15:40:39 +0500 Subject: [PATCH 08/18] added tech disk --- .../Science/TechDisks/tech_disk_spawners.yml | 2 ++ .../Science/TechDisks/tech_disks_civ.yml | 20 +++++++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/Resources/Prototypes/_Mono/Entities/Objects/Specific/Science/TechDisks/tech_disk_spawners.yml b/Resources/Prototypes/_Mono/Entities/Objects/Specific/Science/TechDisks/tech_disk_spawners.yml index 1353c069be1..a6e047af2ce 100644 --- a/Resources/Prototypes/_Mono/Entities/Objects/Specific/Science/TechDisks/tech_disk_spawners.yml +++ b/Resources/Prototypes/_Mono/Entities/Objects/Specific/Science/TechDisks/tech_disk_spawners.yml @@ -46,6 +46,7 @@ - id: TechDiskCivMicroreactors - id: TechDiskCivAdvancedTools - id: TechDiskCivTranslationBasic + - id: TechDiskCombatSilicon # LuaM #T2 TECH DISKS - type: entity @@ -134,6 +135,7 @@ - id: TechDiskMechWeaponsLight - id: TechDiskMechWeaponsMedium - id: TechDiskMechWeaponsHeavy + - id: TechDiskCombatSilicon # LuaM - !type:GroupSelector weight: 3 children: diff --git a/Resources/Prototypes/_Mono/Entities/Objects/Specific/Science/TechDisks/tech_disks_civ.yml b/Resources/Prototypes/_Mono/Entities/Objects/Specific/Science/TechDisks/tech_disks_civ.yml index f1574460abe..e276bb2ec94 100644 --- a/Resources/Prototypes/_Mono/Entities/Objects/Specific/Science/TechDisks/tech_disks_civ.yml +++ b/Resources/Prototypes/_Mono/Entities/Objects/Specific/Science/TechDisks/tech_disks_civ.yml @@ -247,3 +247,23 @@ - RCD - RCDAmmo - NFBlueprintRCDAmmo + +- type: entity # LuaM + parent: TechDiskBase + id: TechDiskCombatSilicon + name: combat silicon technology tech disk + description: A disk capable of adding advanced combat silicon technology to a server's recipes. + components: + - type: Sprite + layers: + - state: icon + map: ["enum.DamageStateVisualLayers.Base"] + color: "#2d6f8c" + - state: label + - state: protect + - state: design + shader: unshaded + - type: TechnologyDisk + recipes: + - NaniteApplicatorSyndicate + - ExperimentalPowerCellCombat \ No newline at end of file From 0c0257a5ec8fdeda9743b81540efde05e8c5c15e Mon Sep 17 00:00:00 2001 From: MrFolium Date: Tue, 14 Jul 2026 15:48:03 +0500 Subject: [PATCH 09/18] locale --- .../prototypes/_LuaM/objects/power/powercells.ftl | 6 ++++++ .../specific/science/techdisks/tech_disks_civ.ftl | 2 ++ .../_Mono/entities/objects/tools/nanite_applicator.ftl | 9 +++++++++ .../prototypes/_Mono/objects/power/powercells.ftl | 2 +- 4 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/_LuaM/objects/power/powercells.ftl diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_LuaM/objects/power/powercells.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_LuaM/objects/power/powercells.ftl new file mode 100644 index 00000000000..b037e931c7b --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_LuaM/objects/power/powercells.ftl @@ -0,0 +1,6 @@ +ent-ExperimentalPowerCellCombat = экспериментальная боевая батарея + .desc = экспериментальная батарея оснащеная частичной защитой от скачков напряжения. + .suffix = Полная +ent-ExperimentalPowerCellCombatPrinted = экспериментальная боевая батарея + .desc = { ent-ExperimentalPowerCellCombat.desc } + .suffix = Пустрая diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_Mono/entities/objects/specific/science/techdisks/tech_disks_civ.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_Mono/entities/objects/specific/science/techdisks/tech_disks_civ.ftl index 1be0683293e..5eed8a9aad1 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_Mono/entities/objects/specific/science/techdisks/tech_disks_civ.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_Mono/entities/objects/specific/science/techdisks/tech_disks_civ.ftl @@ -16,6 +16,8 @@ ent-TechDiskCivAdvancedTools = технодиск продвинутых инс .desc = Диск, добавляющий челюсти жизни и электродрель в рецепты сервера. ent-TechDiskRCD = технодиск РСУ .desc = Диск, добавляющий РСУ в рецепты сервера. +ent-TechDiskCombatSilicon = технодиск боевых технологий синтетиков + .desc = Диск, добавляющий в рецепты боевых технологии синтетиков. ent-TechDiskSpeedBoots = технодиск скороходов .desc = Диск предтечей, добавляющий скороходы в рецепты сервера. ent-TechDiskFtl = технодиск блюспейс-двигателя diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_Mono/entities/objects/tools/nanite_applicator.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_Mono/entities/objects/tools/nanite_applicator.ftl index 2ede593d6fd..59dfddc6d23 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_Mono/entities/objects/tools/nanite_applicator.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_Mono/entities/objects/tools/nanite_applicator.ftl @@ -1,6 +1,15 @@ +<<<<<<< HEAD ent-NaniteApplicator = аппликатор нанитов .desc = Продвинутый инструмент, использующий технологию нанитов для ремнота киборгов и КПБ. ent-NaniteApplicatorExperimental = экспериментальный аппликатор нанитов .desc = Экспериментальный аппликатор нанитов, способный самостоятельно пополнять заряд. ent-NaniteApplicatorSyndicate = продвинутый аппликатор нанитов .desc = Продвинутый аппликатор нанитов со значительно увеличенной ёмкостью, а также способный самостоятельно пополнять заряд. +======= +ent-NaniteApplicator = нанитный аппликатор + .desc = Продвинутый инструмент, использующий нанотехнологию для ремонта конструкций. +ent-NaniteApplicatorExperimental = экспериментальный нанитный аппликатор + .desc = Экспериментальный нанитный аппликатор с увеличенным запасом нанитов и способностью к самогенерации. +ent-NaniteApplicatorSyndicate = боевой нанитный аппликатор + .desc = Передовой аппликатор нанитов, разработанный для использования в боевых условиях, с самогенерацией наночастиц. +>>>>>>> 4466272dc4 (locale) diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_Mono/objects/power/powercells.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_Mono/objects/power/powercells.ftl index 3855ff726fb..11a4167b78f 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_Mono/objects/power/powercells.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_Mono/objects/power/powercells.ftl @@ -1,5 +1,5 @@ ent-PowerCellCombat = боевая батарея - .desc = Перезаряжаемый стандартный батарея. Эта боевая модель оснащена частичной защитой от скачков напряжения. + .desc = Стандартная батарея оснащеная частичной защитой от скачков напряжения. .suffix = Полная ent-PowerCellCombatPrinted = боевая батарея .desc = { ent-PowerCellCombat.desc } From ee7d66d95ef1b35326f0ef343adf6a92b436910f Mon Sep 17 00:00:00 2001 From: MrFolium Date: Tue, 14 Jul 2026 15:49:37 +0500 Subject: [PATCH 10/18] lathes fix and recipe --- Resources/Prototypes/Recipes/Lathes/Packs/science.yml | 1 + Resources/Prototypes/_Mono/Recipes/Lathes/tools.yml | 8 ++++++-- .../Lathes/Packs/Deprecated/engineering_techfab.yml | 1 + .../Lathes/Packs/Deprecated/hacked_mercenary_techfab.yml | 1 + .../Recipes/Lathes/Packs/Deprecated/mercenary_techfab.yml | 1 + .../Recipes/Lathes/Packs/Deprecated/salvage_techfab.yml | 1 + 6 files changed, 11 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Recipes/Lathes/Packs/science.yml b/Resources/Prototypes/Recipes/Lathes/Packs/science.yml index 6ee30ca412a..b9370cc9178 100644 --- a/Resources/Prototypes/Recipes/Lathes/Packs/science.yml +++ b/Resources/Prototypes/Recipes/Lathes/Packs/science.yml @@ -46,6 +46,7 @@ recipes: - PowerCellMicroreactor - PowerCellCombat # Mono edit + - ExperimentalPowerCellCombat # LuaM - PowerCellHigh - type: latheRecipePack diff --git a/Resources/Prototypes/_Mono/Recipes/Lathes/tools.yml b/Resources/Prototypes/_Mono/Recipes/Lathes/tools.yml index 6a5597b0b90..bb075bd9b9d 100644 --- a/Resources/Prototypes/_Mono/Recipes/Lathes/tools.yml +++ b/Resources/Prototypes/_Mono/Recipes/Lathes/tools.yml @@ -16,8 +16,12 @@ parent: BaseToolRecipe id: NaniteApplicatorSyndicate result: NaniteApplicatorSyndicate - materials: - Steel: 500 + materials: # LuaM + Steel: 1000 + Plasma: 500 + Gold: 500 + UraniumFissile: 50 + - type: latheRecipe parent: BaseToolRecipe diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/Packs/Deprecated/engineering_techfab.yml b/Resources/Prototypes/_NF/Recipes/Lathes/Packs/Deprecated/engineering_techfab.yml index 3ccac085767..b8dcc0c3337 100644 --- a/Resources/Prototypes/_NF/Recipes/Lathes/Packs/Deprecated/engineering_techfab.yml +++ b/Resources/Prototypes/_NF/Recipes/Lathes/Packs/Deprecated/engineering_techfab.yml @@ -120,6 +120,7 @@ - JetpackVoid - PowerCellHigh - PowerCellMicroreactor + - ExperimentalPowerCellCombat # LuaM # Engineering techfab - NanoManipulatorStockPart - PicoManipulatorStockPart diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/Packs/Deprecated/hacked_mercenary_techfab.yml b/Resources/Prototypes/_NF/Recipes/Lathes/Packs/Deprecated/hacked_mercenary_techfab.yml index fac559d4253..45dae5f9c5d 100644 --- a/Resources/Prototypes/_NF/Recipes/Lathes/Packs/Deprecated/hacked_mercenary_techfab.yml +++ b/Resources/Prototypes/_NF/Recipes/Lathes/Packs/Deprecated/hacked_mercenary_techfab.yml @@ -90,6 +90,7 @@ - JetpackVoid - PowerCellHigh - PowerCellMicroreactor + - ExperimentalPowerCellCombat # LuaM # Mercenary techfab ## Armor - TelescopicShield diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/Packs/Deprecated/mercenary_techfab.yml b/Resources/Prototypes/_NF/Recipes/Lathes/Packs/Deprecated/mercenary_techfab.yml index 6a7ed6ad7f0..8df97d73c34 100644 --- a/Resources/Prototypes/_NF/Recipes/Lathes/Packs/Deprecated/mercenary_techfab.yml +++ b/Resources/Prototypes/_NF/Recipes/Lathes/Packs/Deprecated/mercenary_techfab.yml @@ -109,6 +109,7 @@ - PowerCellHigh # - PowerCellHyperNF - PowerCellCombat # Mono edit + - ExperimentalPowerCellCombat # LuaM - PowerCellMicroreactor # Mercenary techfab ## Armor diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/Packs/Deprecated/salvage_techfab.yml b/Resources/Prototypes/_NF/Recipes/Lathes/Packs/Deprecated/salvage_techfab.yml index cfbc8ba48c7..8ab19472262 100644 --- a/Resources/Prototypes/_NF/Recipes/Lathes/Packs/Deprecated/salvage_techfab.yml +++ b/Resources/Prototypes/_NF/Recipes/Lathes/Packs/Deprecated/salvage_techfab.yml @@ -83,6 +83,7 @@ - JetpackVoid - PowerCellHigh - PowerCellMicroreactor + - ExperimentalPowerCellCombat # LuaM # Salvage techfab - WeaponCrusher - WeaponCrusherDagger From a4cbfe1963133f0f3b4dc5d6d80122de4538ae0d Mon Sep 17 00:00:00 2001 From: MrFolium Date: Wed, 15 Jul 2026 18:10:22 +0500 Subject: [PATCH 11/18] removed powercell, lathes fix --- Resources/Prototypes/Recipes/Lathes/Packs/engineering.yml | 1 + .../Objects/Specific/Science/TechDisks/tech_disks_civ.yml | 2 +- .../_Mono/Recipes/Lathes/Packs/Factions/phaethon_dynasty.yml | 1 - .../Recipes/Lathes/Packs/Deprecated/engineering_techfab.yml | 1 - .../Lathes/Packs/Deprecated/hacked_mercenary_techfab.yml | 1 + .../_NF/Recipes/Lathes/Packs/Deprecated/mercenary_techfab.yml | 3 ++- .../_NF/Recipes/Lathes/Packs/Deprecated/nfsd_techfab.yml | 2 ++ .../_NF/Recipes/Lathes/Packs/Deprecated/salvage_techfab.yml | 1 + 8 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/Recipes/Lathes/Packs/engineering.yml b/Resources/Prototypes/Recipes/Lathes/Packs/engineering.yml index c4f310d99b2..f8705c6bea8 100644 --- a/Resources/Prototypes/Recipes/Lathes/Packs/engineering.yml +++ b/Resources/Prototypes/Recipes/Lathes/Packs/engineering.yml @@ -60,6 +60,7 @@ - WelderExperimental - JawsOfLife - ExperimentalNaniteApplicator + - NaniteApplicatorSyndicate # LuaM - TrayGoggles # Delta-V # - Fulton # Frontier # - FultonBeacon # Frontier diff --git a/Resources/Prototypes/_Mono/Entities/Objects/Specific/Science/TechDisks/tech_disks_civ.yml b/Resources/Prototypes/_Mono/Entities/Objects/Specific/Science/TechDisks/tech_disks_civ.yml index e276bb2ec94..b8eb84d16ae 100644 --- a/Resources/Prototypes/_Mono/Entities/Objects/Specific/Science/TechDisks/tech_disks_civ.yml +++ b/Resources/Prototypes/_Mono/Entities/Objects/Specific/Science/TechDisks/tech_disks_civ.yml @@ -266,4 +266,4 @@ - type: TechnologyDisk recipes: - NaniteApplicatorSyndicate - - ExperimentalPowerCellCombat \ No newline at end of file + # - ExperimentalPowerCellCombat \ No newline at end of file diff --git a/Resources/Prototypes/_Mono/Recipes/Lathes/Packs/Factions/phaethon_dynasty.yml b/Resources/Prototypes/_Mono/Recipes/Lathes/Packs/Factions/phaethon_dynasty.yml index 6061b1ce0c7..9a9c3a20a19 100644 --- a/Resources/Prototypes/_Mono/Recipes/Lathes/Packs/Factions/phaethon_dynasty.yml +++ b/Resources/Prototypes/_Mono/Recipes/Lathes/Packs/Factions/phaethon_dynasty.yml @@ -61,7 +61,6 @@ - HyposprayRogue - AccessBreakerRogue - EmagRogue - - NaniteApplicatorSyndicate - BasicBorgCombatModulePDV - AdvancedBorgCombatModulePDV - PrintableDirtyBomb diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/Packs/Deprecated/engineering_techfab.yml b/Resources/Prototypes/_NF/Recipes/Lathes/Packs/Deprecated/engineering_techfab.yml index b8dcc0c3337..3ccac085767 100644 --- a/Resources/Prototypes/_NF/Recipes/Lathes/Packs/Deprecated/engineering_techfab.yml +++ b/Resources/Prototypes/_NF/Recipes/Lathes/Packs/Deprecated/engineering_techfab.yml @@ -120,7 +120,6 @@ - JetpackVoid - PowerCellHigh - PowerCellMicroreactor - - ExperimentalPowerCellCombat # LuaM # Engineering techfab - NanoManipulatorStockPart - PicoManipulatorStockPart diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/Packs/Deprecated/hacked_mercenary_techfab.yml b/Resources/Prototypes/_NF/Recipes/Lathes/Packs/Deprecated/hacked_mercenary_techfab.yml index 45dae5f9c5d..7f2116bdf0f 100644 --- a/Resources/Prototypes/_NF/Recipes/Lathes/Packs/Deprecated/hacked_mercenary_techfab.yml +++ b/Resources/Prototypes/_NF/Recipes/Lathes/Packs/Deprecated/hacked_mercenary_techfab.yml @@ -90,6 +90,7 @@ - JetpackVoid - PowerCellHigh - PowerCellMicroreactor + - NaniteApplicatorSyndicate # LuaM - ExperimentalPowerCellCombat # LuaM # Mercenary techfab ## Armor diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/Packs/Deprecated/mercenary_techfab.yml b/Resources/Prototypes/_NF/Recipes/Lathes/Packs/Deprecated/mercenary_techfab.yml index 8df97d73c34..7830e676db1 100644 --- a/Resources/Prototypes/_NF/Recipes/Lathes/Packs/Deprecated/mercenary_techfab.yml +++ b/Resources/Prototypes/_NF/Recipes/Lathes/Packs/Deprecated/mercenary_techfab.yml @@ -109,7 +109,8 @@ - PowerCellHigh # - PowerCellHyperNF - PowerCellCombat # Mono edit - - ExperimentalPowerCellCombat # LuaM + - NaniteApplicatorSyndicate # LuaM + - ExperimentalPowerCellCombat # LuaM - PowerCellMicroreactor # Mercenary techfab ## Armor diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/Packs/Deprecated/nfsd_techfab.yml b/Resources/Prototypes/_NF/Recipes/Lathes/Packs/Deprecated/nfsd_techfab.yml index 3abec00ece0..6be9551ed35 100644 --- a/Resources/Prototypes/_NF/Recipes/Lathes/Packs/Deprecated/nfsd_techfab.yml +++ b/Resources/Prototypes/_NF/Recipes/Lathes/Packs/Deprecated/nfsd_techfab.yml @@ -49,6 +49,8 @@ - WeaponLaserCannon - WeaponLaserCarbine - WeaponXrayCannon + - NaniteApplicatorSyndicate # LuaM + - ExperimentalPowerCellCombat # LuaM - type: latheRecipePack id: NFNfsdTechfabDeprecatedEmag diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/Packs/Deprecated/salvage_techfab.yml b/Resources/Prototypes/_NF/Recipes/Lathes/Packs/Deprecated/salvage_techfab.yml index 8ab19472262..853b84545aa 100644 --- a/Resources/Prototypes/_NF/Recipes/Lathes/Packs/Deprecated/salvage_techfab.yml +++ b/Resources/Prototypes/_NF/Recipes/Lathes/Packs/Deprecated/salvage_techfab.yml @@ -83,6 +83,7 @@ - JetpackVoid - PowerCellHigh - PowerCellMicroreactor + - NaniteApplicatorSyndicate # LuaM - ExperimentalPowerCellCombat # LuaM # Salvage techfab - WeaponCrusher From 98a56913ed6a88b7a35e1965cdba06cb7b9a903c Mon Sep 17 00:00:00 2001 From: MrFolium Date: Wed, 15 Jul 2026 19:42:14 +0500 Subject: [PATCH 12/18] fix --- .../entities/objects/tools/nanite_applicator.ftl | 13 ++----------- .../_LuaM/Entities/Objects/Power/powercells.yml | 2 +- .../Specific/Science/TechDisks/tech_disks_civ.yml | 2 +- 3 files changed, 4 insertions(+), 13 deletions(-) diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_Mono/entities/objects/tools/nanite_applicator.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_Mono/entities/objects/tools/nanite_applicator.ftl index 59dfddc6d23..726c0a7c5b9 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_Mono/entities/objects/tools/nanite_applicator.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_Mono/entities/objects/tools/nanite_applicator.ftl @@ -1,15 +1,6 @@ -<<<<<<< HEAD ent-NaniteApplicator = аппликатор нанитов .desc = Продвинутый инструмент, использующий технологию нанитов для ремнота киборгов и КПБ. ent-NaniteApplicatorExperimental = экспериментальный аппликатор нанитов .desc = Экспериментальный аппликатор нанитов, способный самостоятельно пополнять заряд. -ent-NaniteApplicatorSyndicate = продвинутый аппликатор нанитов - .desc = Продвинутый аппликатор нанитов со значительно увеличенной ёмкостью, а также способный самостоятельно пополнять заряд. -======= -ent-NaniteApplicator = нанитный аппликатор - .desc = Продвинутый инструмент, использующий нанотехнологию для ремонта конструкций. -ent-NaniteApplicatorExperimental = экспериментальный нанитный аппликатор - .desc = Экспериментальный нанитный аппликатор с увеличенным запасом нанитов и способностью к самогенерации. -ent-NaniteApplicatorSyndicate = боевой нанитный аппликатор - .desc = Передовой аппликатор нанитов, разработанный для использования в боевых условиях, с самогенерацией наночастиц. ->>>>>>> 4466272dc4 (locale) +ent-NaniteApplicatorSyndicate = боевой аппликатор нанитов + .desc = Передовой аппликатор нанитов, разработанный для использования в боевых условиях, способный самостоятельно пополнять заряд. \ No newline at end of file diff --git a/Resources/Prototypes/_LuaM/Entities/Objects/Power/powercells.yml b/Resources/Prototypes/_LuaM/Entities/Objects/Power/powercells.yml index 4543194a396..6a9ece895d9 100644 --- a/Resources/Prototypes/_LuaM/Entities/Objects/Power/powercells.yml +++ b/Resources/Prototypes/_LuaM/Entities/Objects/Power/powercells.yml @@ -34,5 +34,5 @@ shader: unshaded visible: false - type: Battery - maxCharge: 1080 + maxCharge: 480 startingCharge: 0 \ No newline at end of file diff --git a/Resources/Prototypes/_Mono/Entities/Objects/Specific/Science/TechDisks/tech_disks_civ.yml b/Resources/Prototypes/_Mono/Entities/Objects/Specific/Science/TechDisks/tech_disks_civ.yml index b8eb84d16ae..e276bb2ec94 100644 --- a/Resources/Prototypes/_Mono/Entities/Objects/Specific/Science/TechDisks/tech_disks_civ.yml +++ b/Resources/Prototypes/_Mono/Entities/Objects/Specific/Science/TechDisks/tech_disks_civ.yml @@ -266,4 +266,4 @@ - type: TechnologyDisk recipes: - NaniteApplicatorSyndicate - # - ExperimentalPowerCellCombat \ No newline at end of file + - ExperimentalPowerCellCombat \ No newline at end of file From 2e7e351fa7b5239e44e3f9fae3c91328f240c864 Mon Sep 17 00:00:00 2001 From: MrFolium Date: Wed, 15 Jul 2026 23:04:37 +0500 Subject: [PATCH 13/18] review fix --- .../WeldingHealable/WeldingHealableSystem.cs | 6 ++++-- .../WeldingHealing/WeldingHealingComponent.cs | 7 ++++--- .../Tools/Systems/SharedToolSystem.cs | 4 ++-- .../Entities/Mobs/Player/admin_ghost.yml | 6 +++--- .../Entities/Structures/catwalk.yml | 1 + .../TechDisks_civ.yml/tech_disks_civ.yml | 19 +++++++++++++++++++ .../_Mono/Catalogs/pdv_uplink_catalog.yml | 6 +++--- .../_Mono/Catalogs/uplink_catalog.yml | 6 +++--- .../Science/TechDisks/tech_disks_civ.yml | 19 ------------------- .../Objects/Tools/nanite_applicator.yml | 6 +++--- .../Packs/Factions/phaethon_dynasty.yml | 1 + .../Prototypes/_Mono/Recipes/Lathes/tools.yml | 4 +++- .../_Mono/Research/Rogue/rogue_misc.yml | 1 + 13 files changed, 47 insertions(+), 39 deletions(-) create mode 100644 Resources/Prototypes/_LuaM/Entities/Objects/Specific/Science/TechDisks_civ.yml/tech_disks_civ.yml diff --git a/Content.Server/_EinsteinEngines/Silicon/WeldingHealable/WeldingHealableSystem.cs b/Content.Server/_EinsteinEngines/Silicon/WeldingHealable/WeldingHealableSystem.cs index adcf7727dc5..89e341e00be 100644 --- a/Content.Server/_EinsteinEngines/Silicon/WeldingHealable/WeldingHealableSystem.cs +++ b/Content.Server/_EinsteinEngines/Silicon/WeldingHealable/WeldingHealableSystem.cs @@ -137,7 +137,8 @@ private bool HasDamage(Entity damageable, WeldingHealingCom return false; foreach (var type in healable.Damage.DamageDict) - if (damageable.Comp.Damage.DamageDict.TryGetValue(type.Key, out var damage) && // LuaM: Prevent crash if damage type is absent. + // if (damageable.Comp.Damage.DamageDict[type.Key].Value > 0) + if (damageable.Comp.Damage.DamageDict.TryGetValue(type.Key, out var damage) && // LuaM: Safely handle missing damage types. damage.Value > 0) { return true; @@ -151,7 +152,8 @@ private bool HasDamage(Entity damageable, WeldingHealingCom foreach (var part in _bodySystem.GetBodyChildrenOfType(damageable, targetType, symmetry: targetSymmetry)) if (TryComp(part.Id, out var damageablePart)) foreach (var type in healable.Damage.DamageDict) - if (damageablePart.Damage.DamageDict.TryGetValue(type.Key, out var damage) // LuaM: Prevent crash if damage type is absent. + // if (damageablePart.Damage.DamageDict[type.Key].Value > 0) + if (damageablePart.Damage.DamageDict.TryGetValue(type.Key, out var damage) // LuaM: Safely handle missing damage types. && damage.Value > 0) { return true; diff --git a/Content.Server/_EinsteinEngines/Silicon/WeldingHealing/WeldingHealingComponent.cs b/Content.Server/_EinsteinEngines/Silicon/WeldingHealing/WeldingHealingComponent.cs index 965e0e421cf..fdf423abc01 100644 --- a/Content.Server/_EinsteinEngines/Silicon/WeldingHealing/WeldingHealingComponent.cs +++ b/Content.Server/_EinsteinEngines/Silicon/WeldingHealing/WeldingHealingComponent.cs @@ -26,18 +26,19 @@ public sealed partial class WeldingHealingComponent : Component /// [DataField] public int FuelCost = 5; - +// LuaM-start: /// /// Whether repairing is interrupted when the user moves /// - [DataField] //LuaM + [DataField] public bool BreakOnMove = true; /// /// Whether repairing is interrupted when the user takes damage /// - [DataField] //LuaM + [DataField] public bool BreakOnDamage = true; +// LuaM-end. [DataField] public int DoAfterDelay = 3; diff --git a/Content.Shared/Tools/Systems/SharedToolSystem.cs b/Content.Shared/Tools/Systems/SharedToolSystem.cs index 964defb3d28..dd05b6c84aa 100644 --- a/Content.Shared/Tools/Systems/SharedToolSystem.cs +++ b/Content.Shared/Tools/Systems/SharedToolSystem.cs @@ -186,8 +186,8 @@ public bool UseTool( var toolEvent = new ToolDoAfterEvent(fuel, doAfterEv, GetNetEntity(target)); var doAfterArgs = new DoAfterArgs(EntityManager, user, delay / toolComponent.SpeedModifier, toolEvent, tool, target: target, used: tool) { - BreakOnMove = breakOnMove, // LuaM - BreakOnDamage = breakOnDamage, // LuaM + BreakOnMove = breakOnMove, // LuaM true > breakOnMove, from fixed value to changeble value + BreakOnDamage = breakOnDamage, // LuaM true > breakOnDamage, from fixed value to changeble value BreakOnWeightlessMove = false, NeedHand = tool != user, AttemptFrequency = fuel > 0 ? AttemptFrequency.EveryTick : AttemptFrequency.Never diff --git a/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml b/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml index b004ea1ab20..ee51e8595ba 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml @@ -116,8 +116,8 @@ - Inorganic - type: ShowSyndicateIcons # Monolith - type: MovementSpeedModifier # LuaM - baseWalkSpeed: 35 - baseSprintSpeed: 15 + baseWalkSpeed: 35 # LuaM 10 > 35 + baseSprintSpeed: 15 # LuaM 35 > 15 - type: entity id: ActionAGhostShowSolar @@ -149,7 +149,7 @@ description: View a Mass Scanner Interface. components: - type: InstantAction - icon: { sprite: Interface/Actions/actions_ai.rsi, state: mass_scanner } + icon: { sprite: Interface/A9ctions/actions_ai.rsi, state: mass_scanner } iconOn: { sprite: Interface/Actions/actions_ai.rsi, state: mass_scanner } keywords: [ "AI", "console", "interface" ] priority: -6 diff --git a/Resources/Prototypes/Entities/Structures/catwalk.yml b/Resources/Prototypes/Entities/Structures/catwalk.yml index 48676e953c5..9028ae5c1db 100644 --- a/Resources/Prototypes/Entities/Structures/catwalk.yml +++ b/Resources/Prototypes/Entities/Structures/catwalk.yml @@ -9,6 +9,7 @@ - type: Anchorable flags: - Anchorable + # - type: Rotatable - type: Clickable - type: Sprite sprite: Structures/catwalk.rsi diff --git a/Resources/Prototypes/_LuaM/Entities/Objects/Specific/Science/TechDisks_civ.yml/tech_disks_civ.yml b/Resources/Prototypes/_LuaM/Entities/Objects/Specific/Science/TechDisks_civ.yml/tech_disks_civ.yml new file mode 100644 index 00000000000..b0304328efa --- /dev/null +++ b/Resources/Prototypes/_LuaM/Entities/Objects/Specific/Science/TechDisks_civ.yml/tech_disks_civ.yml @@ -0,0 +1,19 @@ +- type: entity # LuaM + parent: TechDiskBase + id: TechDiskCombatSilicon + name: combat silicon technology tech disk + description: A disk capable of adding advanced combat silicon technology to a server's recipes. + components: + - type: Sprite + layers: + - state: icon + map: ["enum.DamageStateVisualLayers.Base"] + color: "#2d6f8c" + - state: label + - state: protect + - state: design + shader: unshaded + - type: TechnologyDisk + recipes: + - NaniteApplicatorSyndicate + - ExperimentalPowerCellCombat \ No newline at end of file diff --git a/Resources/Prototypes/_Mono/Catalogs/pdv_uplink_catalog.yml b/Resources/Prototypes/_Mono/Catalogs/pdv_uplink_catalog.yml index 87b7879fc4b..709093205e9 100644 --- a/Resources/Prototypes/_Mono/Catalogs/pdv_uplink_catalog.yml +++ b/Resources/Prototypes/_Mono/Catalogs/pdv_uplink_catalog.yml @@ -475,13 +475,13 @@ tags: - PirateUplink -- type: listing # LuaM +- type: listing id: UplinkPirateSyndicateApplicator name: uplink-syndicate-applicator-name description: uplink-syndicate-applicator-desc - productEntity: NaniteApplicatorExperimental + productEntity: NaniteApplicatorExperimental # LuaM NaniteApplicatorSyndicate > NaniteApplicatorExperimental cost: - Doubloon: 15 + Doubloon: 15 # LuaM 35 > 15 categories: - UplinkPirateUtility conditions: diff --git a/Resources/Prototypes/_Mono/Catalogs/uplink_catalog.yml b/Resources/Prototypes/_Mono/Catalogs/uplink_catalog.yml index 4e05244bad3..422e58de4c5 100644 --- a/Resources/Prototypes/_Mono/Catalogs/uplink_catalog.yml +++ b/Resources/Prototypes/_Mono/Catalogs/uplink_catalog.yml @@ -78,12 +78,12 @@ categories: - UplinkDeception -- type: listing # LuaM +- type: listing id: UplinkSyndicateApplicator name: uplink-syndicate-applicator-name description: uplink-syndicate-applicator-desc - productEntity: NaniteApplicatorExperimental + productEntity: NaniteApplicatorExperimental # LuaM NaniteApplicatorSyndicate > NaniteApplicatorExperimental cost: - Telecrystal: 15 + Telecrystal: 15 # LuaM 35 > 15 categories: - UplinkDisruption diff --git a/Resources/Prototypes/_Mono/Entities/Objects/Specific/Science/TechDisks/tech_disks_civ.yml b/Resources/Prototypes/_Mono/Entities/Objects/Specific/Science/TechDisks/tech_disks_civ.yml index e276bb2ec94..eaf73ab3397 100644 --- a/Resources/Prototypes/_Mono/Entities/Objects/Specific/Science/TechDisks/tech_disks_civ.yml +++ b/Resources/Prototypes/_Mono/Entities/Objects/Specific/Science/TechDisks/tech_disks_civ.yml @@ -248,22 +248,3 @@ - RCDAmmo - NFBlueprintRCDAmmo -- type: entity # LuaM - parent: TechDiskBase - id: TechDiskCombatSilicon - name: combat silicon technology tech disk - description: A disk capable of adding advanced combat silicon technology to a server's recipes. - components: - - type: Sprite - layers: - - state: icon - map: ["enum.DamageStateVisualLayers.Base"] - color: "#2d6f8c" - - state: label - - state: protect - - state: design - shader: unshaded - - type: TechnologyDisk - recipes: - - NaniteApplicatorSyndicate - - ExperimentalPowerCellCombat \ No newline at end of file diff --git a/Resources/Prototypes/_Mono/Entities/Objects/Tools/nanite_applicator.yml b/Resources/Prototypes/_Mono/Entities/Objects/Tools/nanite_applicator.yml index 709499bfa15..c357ea32e2b 100644 --- a/Resources/Prototypes/_Mono/Entities/Objects/Tools/nanite_applicator.yml +++ b/Resources/Prototypes/_Mono/Entities/Objects/Tools/nanite_applicator.yml @@ -65,7 +65,7 @@ description: "An experimental nanite applicator with a heavily upgraded nanite capacity capable of self-nanite generation." components: - type: Sprite - sprite: _LuaM/Objects/Tools/nanite_applicator_experimental.rsi + sprite: _LuaM/Objects/Tools/nanite_applicator_experimental.rsi # LuaM _Mono > _LuaM layers: - state: icon - type: SolutionRegeneration @@ -76,10 +76,10 @@ Quantity: 2 - type: entity - name: combat nanite applicator + name: advanced nanite applicator parent: NaniteApplicatorExperimental id: NaniteApplicatorSyndicate - description: "Advanced nanite applicator designed for use in combat with self-nanite generation." + description: "Advanced nanite applicator with a heavily upgraded nanite capacity capable of self-nanite generation." components: - type: Sprite sprite: _Mono/Objects/Tools/nanite_applicator_syndicate.rsi diff --git a/Resources/Prototypes/_Mono/Recipes/Lathes/Packs/Factions/phaethon_dynasty.yml b/Resources/Prototypes/_Mono/Recipes/Lathes/Packs/Factions/phaethon_dynasty.yml index 9a9c3a20a19..5fccdc20461 100644 --- a/Resources/Prototypes/_Mono/Recipes/Lathes/Packs/Factions/phaethon_dynasty.yml +++ b/Resources/Prototypes/_Mono/Recipes/Lathes/Packs/Factions/phaethon_dynasty.yml @@ -61,6 +61,7 @@ - HyposprayRogue - AccessBreakerRogue - EmagRogue + # - NaniteApplicatorSyndicate - BasicBorgCombatModulePDV - AdvancedBorgCombatModulePDV - PrintableDirtyBomb diff --git a/Resources/Prototypes/_Mono/Recipes/Lathes/tools.yml b/Resources/Prototypes/_Mono/Recipes/Lathes/tools.yml index bb075bd9b9d..aebab84ca69 100644 --- a/Resources/Prototypes/_Mono/Recipes/Lathes/tools.yml +++ b/Resources/Prototypes/_Mono/Recipes/Lathes/tools.yml @@ -17,10 +17,12 @@ id: NaniteApplicatorSyndicate result: NaniteApplicatorSyndicate materials: # LuaM - Steel: 1000 + Steel: 1000 # LuaM 500 > 1000 + # LuaM-start: Plasma: 500 Gold: 500 UraniumFissile: 50 + # LuaM-end - type: latheRecipe diff --git a/Resources/Prototypes/_Mono/Research/Rogue/rogue_misc.yml b/Resources/Prototypes/_Mono/Research/Rogue/rogue_misc.yml index 65232e45b89..3886d688aa2 100644 --- a/Resources/Prototypes/_Mono/Research/Rogue/rogue_misc.yml +++ b/Resources/Prototypes/_Mono/Research/Rogue/rogue_misc.yml @@ -54,6 +54,7 @@ cost: 10000 recipeUnlocks: - JawsOfLifeRogue + # - NaniteApplicatorSyndicate technologyPrerequisites: - UniversalMaterialResearchT1 position: 12, -1 From 6468f7a92bec0f99c0773ee0a478cd952eaca6cc Mon Sep 17 00:00:00 2001 From: MrFolium Date: Wed, 15 Jul 2026 23:21:27 +0500 Subject: [PATCH 14/18] brainrot fix --- Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml b/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml index ee51e8595ba..8929f6552f1 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml @@ -149,7 +149,7 @@ description: View a Mass Scanner Interface. components: - type: InstantAction - icon: { sprite: Interface/A9ctions/actions_ai.rsi, state: mass_scanner } + icon: { sprite: Interface/Actions/actions_ai.rsi, state: mass_scanner } iconOn: { sprite: Interface/Actions/actions_ai.rsi, state: mass_scanner } keywords: [ "AI", "console", "interface" ] priority: -6 From 6432cf7244e4df397e2f0030413ac62e878d87e1 Mon Sep 17 00:00:00 2001 From: MrFolium Date: Thu, 16 Jul 2026 00:34:53 +0500 Subject: [PATCH 15/18] review fix --- .../Silicon/WeldingHealable/WeldingHealableSystem.cs | 9 +++++---- .../Prototypes/Entities/Mobs/Player/admin_ghost.yml | 4 ++-- Resources/Prototypes/Entities/Structures/catwalk.yml | 2 +- .../Science/TechDisks_civ.yml/tech_disks_civ.yml | 2 +- Resources/Prototypes/_Mono/Recipes/Lathes/tools.yml | 2 +- Resources/Prototypes/_Mono/Research/Rogue/rogue_misc.yml | 2 +- 6 files changed, 11 insertions(+), 10 deletions(-) diff --git a/Content.Server/_EinsteinEngines/Silicon/WeldingHealable/WeldingHealableSystem.cs b/Content.Server/_EinsteinEngines/Silicon/WeldingHealable/WeldingHealableSystem.cs index 89e341e00be..2613380daa4 100644 --- a/Content.Server/_EinsteinEngines/Silicon/WeldingHealable/WeldingHealableSystem.cs +++ b/Content.Server/_EinsteinEngines/Silicon/WeldingHealable/WeldingHealableSystem.cs @@ -137,9 +137,10 @@ private bool HasDamage(Entity damageable, WeldingHealingCom return false; foreach (var type in healable.Damage.DamageDict) - // if (damageable.Comp.Damage.DamageDict[type.Key].Value > 0) + // if (damageable.Comp.Damage.DamageDict[type.Key].Value > 0) // Commented by LuaM + if (damageable.Comp.Damage.DamageDict.TryGetValue(type.Key, out var damage) && // LuaM: Safely handle missing damage types. - damage.Value > 0) + damage.Value > 0) // LuaM { return true; } @@ -152,9 +153,9 @@ private bool HasDamage(Entity damageable, WeldingHealingCom foreach (var part in _bodySystem.GetBodyChildrenOfType(damageable, targetType, symmetry: targetSymmetry)) if (TryComp(part.Id, out var damageablePart)) foreach (var type in healable.Damage.DamageDict) - // if (damageablePart.Damage.DamageDict[type.Key].Value > 0) + // if (damageablePart.Damage.DamageDict[type.Key].Value > 0) // Commented by LuaM if (damageablePart.Damage.DamageDict.TryGetValue(type.Key, out var damage) // LuaM: Safely handle missing damage types. - && damage.Value > 0) + && damage.Value > 0) // LuaM { return true; } diff --git a/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml b/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml index 8929f6552f1..a2d215c7e93 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml @@ -116,8 +116,8 @@ - Inorganic - type: ShowSyndicateIcons # Monolith - type: MovementSpeedModifier # LuaM - baseWalkSpeed: 35 # LuaM 10 > 35 - baseSprintSpeed: 15 # LuaM 35 > 15 + baseWalkSpeed: 35 + baseSprintSpeed: 15 - type: entity id: ActionAGhostShowSolar diff --git a/Resources/Prototypes/Entities/Structures/catwalk.yml b/Resources/Prototypes/Entities/Structures/catwalk.yml index 9028ae5c1db..24f4d0ddff9 100644 --- a/Resources/Prototypes/Entities/Structures/catwalk.yml +++ b/Resources/Prototypes/Entities/Structures/catwalk.yml @@ -9,7 +9,7 @@ - type: Anchorable flags: - Anchorable - # - type: Rotatable + # - type: Rotatable Commented by LuaM - type: Clickable - type: Sprite sprite: Structures/catwalk.rsi diff --git a/Resources/Prototypes/_LuaM/Entities/Objects/Specific/Science/TechDisks_civ.yml/tech_disks_civ.yml b/Resources/Prototypes/_LuaM/Entities/Objects/Specific/Science/TechDisks_civ.yml/tech_disks_civ.yml index b0304328efa..85de28d1ec5 100644 --- a/Resources/Prototypes/_LuaM/Entities/Objects/Specific/Science/TechDisks_civ.yml/tech_disks_civ.yml +++ b/Resources/Prototypes/_LuaM/Entities/Objects/Specific/Science/TechDisks_civ.yml/tech_disks_civ.yml @@ -1,4 +1,4 @@ -- type: entity # LuaM +- type: entity parent: TechDiskBase id: TechDiskCombatSilicon name: combat silicon technology tech disk diff --git a/Resources/Prototypes/_Mono/Recipes/Lathes/tools.yml b/Resources/Prototypes/_Mono/Recipes/Lathes/tools.yml index aebab84ca69..39fdba6a546 100644 --- a/Resources/Prototypes/_Mono/Recipes/Lathes/tools.yml +++ b/Resources/Prototypes/_Mono/Recipes/Lathes/tools.yml @@ -16,7 +16,7 @@ parent: BaseToolRecipe id: NaniteApplicatorSyndicate result: NaniteApplicatorSyndicate - materials: # LuaM + materials: Steel: 1000 # LuaM 500 > 1000 # LuaM-start: Plasma: 500 diff --git a/Resources/Prototypes/_Mono/Research/Rogue/rogue_misc.yml b/Resources/Prototypes/_Mono/Research/Rogue/rogue_misc.yml index 3886d688aa2..e2b62332f1c 100644 --- a/Resources/Prototypes/_Mono/Research/Rogue/rogue_misc.yml +++ b/Resources/Prototypes/_Mono/Research/Rogue/rogue_misc.yml @@ -54,7 +54,7 @@ cost: 10000 recipeUnlocks: - JawsOfLifeRogue - # - NaniteApplicatorSyndicate + # - NaniteApplicatorSyndicate Commented by LuaM technologyPrerequisites: - UniversalMaterialResearchT1 position: 12, -1 From cd72900b698d34b2f56820c037474211d948a07c Mon Sep 17 00:00:00 2001 From: Pcol Date: Wed, 15 Jul 2026 22:50:17 +0300 Subject: [PATCH 16/18] Update phaethon_dynasty.yml --- .../_Mono/Recipes/Lathes/Packs/Factions/phaethon_dynasty.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_Mono/Recipes/Lathes/Packs/Factions/phaethon_dynasty.yml b/Resources/Prototypes/_Mono/Recipes/Lathes/Packs/Factions/phaethon_dynasty.yml index 5fccdc20461..86acb091d44 100644 --- a/Resources/Prototypes/_Mono/Recipes/Lathes/Packs/Factions/phaethon_dynasty.yml +++ b/Resources/Prototypes/_Mono/Recipes/Lathes/Packs/Factions/phaethon_dynasty.yml @@ -61,7 +61,7 @@ - HyposprayRogue - AccessBreakerRogue - EmagRogue - # - NaniteApplicatorSyndicate + # - NaniteApplicatorSyndicate # Commented by LuaM - BasicBorgCombatModulePDV - AdvancedBorgCombatModulePDV - PrintableDirtyBomb From a25940ec482089d42945ee8fa5bb27f457696638 Mon Sep 17 00:00:00 2001 From: MrFolium Date: Sun, 19 Jul 2026 10:25:02 +0500 Subject: [PATCH 17/18] fix mobs price --- Content.Server/Cargo/Systems/PricingSystem.cs | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/Content.Server/Cargo/Systems/PricingSystem.cs b/Content.Server/Cargo/Systems/PricingSystem.cs index 20ba4c04cd9..2a20f96409c 100644 --- a/Content.Server/Cargo/Systems/PricingSystem.cs +++ b/Content.Server/Cargo/Systems/PricingSystem.cs @@ -20,6 +20,9 @@ using Content.Server._Mono.VendingMachine; // Mono using System.Linq; using Content.Shared.Research.Prototypes; +using Content.Shared.Body.Organ; // LuaM +using Content.Shared.Body.Part; // LuaM + namespace Content.Server.Cargo.Systems; @@ -276,6 +279,10 @@ public double GetPrice(EntityUid uid, bool includeContents = true) { foreach (var ent in container.ContainedEntities) { + // LuaM-start: + if (HasComp(ent) && HasComp(uid)) // Skip organs + continue; + // LuaM-end price += GetPrice(ent); } } @@ -321,6 +328,10 @@ public double GetPriceWithVendingDiscount(EntityUid uid, EntityUid currentGrid, { foreach (var ent in container.ContainedEntities) { + // LuaM-start: + if (HasComp(ent) && HasComp(uid)) // Skip organs + continue; + // LuaM-end price += GetPriceWithVendingDiscount(ent, currentGrid); } } @@ -350,6 +361,10 @@ public double GetPriceConditional(EntityUid uid, bool includeContents = true, Fu { foreach (var ent in container.ContainedEntities) { + // LuaM-start: + if (HasComp(ent) && HasComp(uid)) // Skip organs + continue; + // LuaM-end: price += GetPriceConditional(ent, true, predicate); } } From f09a917972df4e68e3ba787f8def0077a2465224 Mon Sep 17 00:00:00 2001 From: MrFolium Date: Sun, 19 Jul 2026 10:25:48 +0500 Subject: [PATCH 18/18] added bonus cash --- .../Fills/Backpacks/npc_loot_cultists.yml | 8 +++++ .../Fills/Backpacks/npc_loot_explorers.yml | 5 +++ .../Fills/Backpacks/npc_loot_mercenaries.yml | 7 ++++ .../Fills/Backpacks/npc_loot_punks.yml | 5 +++ .../Fills/Backpacks/npc_loot_syndicate.yml | 36 +++++++++++++++++++ 5 files changed, 61 insertions(+) diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/npc_loot_cultists.yml b/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/npc_loot_cultists.yml index 85d1d00fdcc..c1ed95f1e3e 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/npc_loot_cultists.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/npc_loot_cultists.yml @@ -54,6 +54,7 @@ - id: ClothingBeltQuiverCrossbowFilledBolt - id: SpaceCash1000 # Bonus Loot T1 + - id: SpaceCash5000 # LuaM - id: SpaceCash500 prob: 0.9 - id: SpawnDungeonLootMaterialsBasicFull @@ -74,6 +75,7 @@ - id: ClothingBeltQuiverCrossbowFilledUranium - id: SpaceCash1000 # Bonus Loot T1 + - id: SpaceCash5000 # LuaM - id: SpaceCash500 prob: 0.9 - id: SpaceCash1000 @@ -93,6 +95,7 @@ - id: ClothingBeltQuiverCrossbowFilledPlasma - id: SpaceCash500 # Bonus Loot T1 + - id: SpaceCash5000 # LuaM - id: SpaceCash500 prob: 0.9 - id: SpawnDungeonLootMaterialsBasicFull @@ -111,6 +114,7 @@ items: - id: SpaceCash500 # Bonus Loot T1 + - id: SpaceCash5000 # LuaM - id: SpaceCash500 prob: 0.9 - id: SpaceCash1000 @@ -140,6 +144,7 @@ - id: MaterialBones prob: 0.2 # Bonus Loot T2 + - id: SpaceCash7500 # LuaM - id: SpaceCash1000 prob: 0.9 - id: SpawnDungeonLootMaterialsBasicFull @@ -175,6 +180,7 @@ - id: MaterialBones prob: 0.1 # Bonus Loot T3 + - id: SpaceCash10000 # LuaM - id: SpaceCash1000 prob: 0.9 - id: SpaceCash500 @@ -210,6 +216,7 @@ - id: MaterialBones1 prob: 0.1 # Bonus Loot T1 + - id: SpaceCash5000 # LuaM - id: SpaceCash500 prob: 0.9 - id: SpaceCash1000 @@ -236,6 +243,7 @@ - id: MaterialBones1 prob: 0.05 # Bonus Loot T1 + - id: SpaceCash5000 # LuaM - id: SpaceCash500 prob: 0.9 - id: SpawnDungeonLootMaterialsBasicFull diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/npc_loot_explorers.yml b/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/npc_loot_explorers.yml index 382fd666332..025b586ade5 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/npc_loot_explorers.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/npc_loot_explorers.yml @@ -103,6 +103,7 @@ - id: ClothingNeckIFFCyan prob: 0.1 # Bonus Loot T1 + - id: SpaceCash5000 # LuaM - id: SpaceCash500 prob: 0.9 - id: SpawnDungeonLootMaterialsBasicFull @@ -143,6 +144,7 @@ - id: ClothingNeckIFFCyan prob: 0.1 # Bonus Loot T1 + - id: SpaceCash5000 # LuaM - id: SpaceCash500 prob: 0.9 - id: SpaceCash1000 @@ -183,6 +185,7 @@ - id: ClothingNeckIFFCyan prob: 0.1 # Bonus Loot T2 + - id: SpaceCash7500 # LuaM - id: SpaceCash1000 prob: 0.9 - id: SpawnDungeonLootMaterialsBasicFull @@ -231,6 +234,7 @@ - id: ClothingNeckIFFCyan prob: 0.1 # Bonus Loot T2 + - id: SpaceCash7500 # LuaM - id: SpaceCash1000 prob: 0.9 - id: SpaceCash1000 @@ -283,6 +287,7 @@ - id: ClothingNeckIFFCyan prob: 0.1 # Bonus Loot T3 + - id: SpaceCash10000 # LuaM - id: SpaceCash1000 prob: 0.9 - id: SpaceCash500 diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/npc_loot_mercenaries.yml b/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/npc_loot_mercenaries.yml index b37650ed0f7..a2b03cbd2c0 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/npc_loot_mercenaries.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/npc_loot_mercenaries.yml @@ -65,6 +65,7 @@ - id: ClothingNeckIFFNeutral prob: 0.2 # Bonus Loot T1 + - id: SpaceCash5000 # LuaM - id: SpaceCash500 prob: 0.9 - id: SpaceCash1000 @@ -121,6 +122,7 @@ - id: ClothingNeckIFFNeutral prob: 0.2 # Bonus Loot T2 + - id: SpaceCash7500 # LuaM - id: SpaceCash1000 prob: 0.9 - id: SpawnDungeonLootMaterialsBasicFull @@ -182,6 +184,7 @@ - id: ClothingNeckIFFNeutral prob: 0.2 # Bonus Loot T2 + - id: SpaceCash7500 # LuaM - id: SpaceCash1000 prob: 0.9 - id: SpawnDungeonLootMaterialsBasicFull @@ -240,6 +243,7 @@ - id: ClothingNeckIFFNeutral prob: 0.2 # Bonus Loot T2 + - id: SpaceCash7500 # LuaM - id: SpaceCash1000 prob: 0.9 - id: SpaceCash1000 @@ -309,6 +313,7 @@ - id: ClothingNeckIFFNeutral prob: 0.2 # Bonus Loot T3 + - id: SpaceCash10000 # LuaM - id: SpaceCash1000 prob: 0.9 - id: SpaceCash500 @@ -384,6 +389,7 @@ - id: ClothingNeckIFFNeutral prob: 0.2 # Bonus Loot T3 + - id: SpaceCash10000 # LuaM - id: SpaceCash1000 prob: 0.9 - id: SpaceCash500 @@ -497,6 +503,7 @@ - id: AmmoTechFabCircuitboard prob: 0.1 # Bonus Loot T4 + - id: SpaceCash10000 # LuaM - id: SpaceCash2500 prob: 0.9 - id: SpawnDungeonLootFlatpacks diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/npc_loot_punks.yml b/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/npc_loot_punks.yml index f405ea6322a..3433a49e62e 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/npc_loot_punks.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/npc_loot_punks.yml @@ -71,6 +71,7 @@ amount: 1 prob: 0.05 # Bonus Loot T1 + - id: SpaceCash5000 # LuaM - id: SpaceCash500 prob: 0.9 - id: SpaceCash1000 @@ -114,6 +115,7 @@ amount: 1 prob: 0.05 # Bonus Loot T2 + - id: SpaceCash7500 # LuaM - id: SpaceCash1000 prob: 0.9 - id: SpaceCash1000 @@ -161,6 +163,7 @@ amount: 1 prob: 0.05 # Bonus Loot T3 + - id: SpaceCash10000 # LuaM - id: SpaceCash1000 prob: 0.9 - id: SpaceCash500 @@ -216,6 +219,7 @@ amount: 1 prob: 0.45 # Bonus Loot T3 + - id: SpaceCash10000 # LuaM - id: SpaceCash1000 prob: 0.9 - id: SpaceCash500 @@ -274,6 +278,7 @@ prob: 0.1 amount: 1 # Bonus Loot T4 + - id: SpaceCash10000 # LuaM - id: SpaceCash2500 prob: 0.9 - id: SpaceCash1000 diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/npc_loot_syndicate.yml b/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/npc_loot_syndicate.yml index ca9d09d079e..ddb33f4c8a4 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/npc_loot_syndicate.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/npc_loot_syndicate.yml @@ -78,6 +78,7 @@ - id: SpeedLoader45_magnumAP - id: SpaceCash5000 # Bonus Loot T3 + - id: SpaceCash10000 # LuaM - id: SpaceCash1000 prob: 0.9 - id: SpaceCash500 @@ -108,6 +109,7 @@ - id: SpeedLoader45_magnumFMJ - id: SpaceCash2500 # Bonus Loot T3 + - id: SpaceCash10000 # LuaM - id: SpaceCash1000 prob: 0.9 - id: SpaceCash500 @@ -136,6 +138,7 @@ - id: SpeedLoader45_magnumFMJ - id: SpaceCash2500 # Bonus Loot T3 + - id: SpaceCash10000 # LuaM - id: SpaceCash1000 prob: 0.9 - id: SpaceCash500 @@ -163,6 +166,7 @@ items: - id: SpaceCash2500 # Bonus Loot T3 + - id: SpaceCash10000 # LuaM - id: SpaceCash1000 prob: 0.9 - id: SpaceCash500 @@ -194,6 +198,7 @@ - id: PowerCellHyperPrinted - id: SpaceCash2500 # Bonus Loot T3 + - id: SpaceCash10000 # LuaM - id: SpaceCash1000 prob: 0.9 - id: SpaceCash500 @@ -223,6 +228,7 @@ - id: PowerCellHighPrinted - id: SpaceCash2500 # Bonus Loot T3 + - id: SpaceCash10000 # LuaM - id: SpaceCash1000 prob: 0.9 - id: SpaceCash500 @@ -251,6 +257,7 @@ - id: PowerCellHighPrinted - id: SpaceCash2500 # Bonus Loot T3 + - id: SpaceCash10000 # LuaM - id: SpaceCash1000 prob: 0.9 - id: SpaceCash500 @@ -279,6 +286,7 @@ - id: SpaceCash1000 - id: SpaceCash500 # Bonus Loot T3 + - id: SpaceCash10000 # LuaM - id: SpaceCash1000 prob: 0.9 - id: SpaceCash500 @@ -311,6 +319,7 @@ - id: ClothingShoesBootsMagSyndie - id: SpaceCash10000 # Bonus Loot T4 + - id: SpaceCash10000 # LuaM - id: SpaceCash2500 prob: 0.9 - id: SpawnDungeonLootFlatpacks @@ -340,6 +349,7 @@ - id: ClothingShoesBootsMagSyndie - id: SpaceCash10000 # Bonus Loot T4 + - id: SpaceCash10000 # LuaM - id: SpaceCash2500 prob: 0.9 - id: SpawnDungeonLootFlatpacks @@ -368,6 +378,7 @@ - id: ClothingShoesBootsMagSyndie - id: SpaceCash10000 # Bonus Loot T4 + - id: SpaceCash10000 # LuaM - id: SpaceCash2500 prob: 0.9 - id: SpawnDungeonLootFlatpacks @@ -393,6 +404,7 @@ items: - id: SpaceCash10000 # Bonus Loot T4 + - id: SpaceCash10000 # LuaM - id: SpaceCash2500 prob: 0.9 - id: SpawnDungeonLootFlatpacks @@ -423,6 +435,7 @@ - id: SpaceCash1000 - id: SpaceCash1000 # Bonus Loot T3 + - id: SpaceCash10000 # LuaM - id: SpaceCash1000 prob: 0.9 - id: SpaceCash500 @@ -455,6 +468,7 @@ - id: SpaceCash1000 - id: SpaceCash500 # Bonus Loot T3 + - id: SpaceCash10000 # LuaM - id: SpaceCash1000 prob: 0.9 - id: SpaceCash500 @@ -487,6 +501,7 @@ - id: SpaceCash1000 - id: SpaceCash500 # Bonus Loot T3 + - id: SpaceCash10000 # LuaM - id: SpaceCash1000 prob: 0.9 - id: SpaceCash500 @@ -517,6 +532,7 @@ - id: SpaceCash1000 - id: SpaceCash500 # Bonus Loot T3 + - id: SpaceCash10000 # LuaM - id: SpaceCash1000 prob: 0.9 - id: SpaceCash500 @@ -548,6 +564,7 @@ - id: Magazine9x19mmPistolFMJ - id: SpaceCash1000 # Bonus Loot T1 + - id: SpaceCash5000 # LuaM - id: SpaceCash500 prob: 0.9 - id: SpaceCash1000 @@ -568,6 +585,7 @@ - id: Magazine9x19mmPistolFMJ - id: SpaceCash1000 # Bonus Loot T1 + - id: SpaceCash5000 # LuaM - id: SpaceCash500 prob: 0.9 - id: SpaceCash1000 @@ -588,6 +606,7 @@ - id: Magazine9x19mmPistolFMJ - id: SpaceCash1000 # Bonus Loot T1 + - id: SpaceCash5000 # LuaM - id: SpaceCash500 prob: 0.9 - id: SpaceCash1000 @@ -606,6 +625,7 @@ items: - id: SpaceCash1000 # Bonus Loot T1 + - id: SpaceCash5000 # LuaM - id: SpaceCash500 prob: 0.9 - id: SpaceCash1000 @@ -654,6 +674,7 @@ - id: Stimpack - id: SpaceCash1000 # Bonus Loot T1 + - id: SpaceCash5000 # LuaM - id: SpaceCash500 prob: 0.9 - id: SpaceCash1000 @@ -676,6 +697,7 @@ - id: MedicatedSuture - id: SpaceCash1000 # Bonus Loot T1 + - id: SpaceCash5000 # LuaM - id: SpaceCash500 prob: 0.9 - id: SpaceCash1000 @@ -697,6 +719,7 @@ - id: MedicatedSuture - id: SpaceCash1000 # Bonus Loot T1 + - id: SpaceCash5000 # LuaM - id: SpaceCash500 prob: 0.9 - id: SpaceCash1000 @@ -717,6 +740,7 @@ - id: MedicatedSuture - id: SpaceCash1000 # Bonus Loot T1 + - id: SpaceCash5000 # LuaM - id: SpaceCash500 prob: 0.9 - id: SpaceCash1000 @@ -743,6 +767,7 @@ - id: SpaceCash1000 - id: SpaceCash1000 # Bonus Loot T2 + - id: SpaceCash7500 # LuaM - id: SpaceCash1000 prob: 0.9 - id: SpawnDungeonLootMaterialsBasicFull @@ -770,6 +795,7 @@ - id: JawsOfLife - id: SpaceCash1000 # Bonus Loot T2 + - id: SpaceCash7500 # LuaM - id: SpaceCash1000 prob: 0.9 - id: SpaceCash1000 @@ -796,6 +822,7 @@ - id: JawsOfLife - id: SpaceCash1000 # Bonus Loot T2 + - id: SpaceCash7500 # LuaM - id: SpaceCash1000 prob: 0.9 - id: SpawnDungeonLootMaterialsBasicFull @@ -821,6 +848,7 @@ items: - id: SpaceCash1000 # Bonus Loot T2 + - id: SpaceCash7500 # LuaM - id: SpaceCash1000 prob: 0.9 - id: SpaceCash1000 @@ -853,6 +881,7 @@ - id: Stimpack - id: SpaceCash2500 # Bonus Loot T2 + - id: SpaceCash7500 # LuaM - id: SpaceCash1000 prob: 0.9 - id: SpawnDungeonLootMaterialsBasicFull @@ -880,6 +909,7 @@ - id: Stimpack - id: SpaceCash2500 # Bonus Loot T2 + - id: SpaceCash7500 # LuaM - id: SpaceCash1000 prob: 0.9 - id: SpaceCash1000 @@ -906,6 +936,7 @@ - id: WeaponWaterBlaster - id: SpaceCash2500 # Bonus Loot T2 + - id: SpaceCash7500 # LuaM - id: SpaceCash1000 prob: 0.9 - id: SpawnDungeonLootMaterialsBasicFull @@ -932,6 +963,7 @@ - id: WeaponWaterPistol - id: SpaceCash2500 # Bonus Loot T2 + - id: SpaceCash7500 # LuaM - id: SpaceCash1000 prob: 0.9 - id: SpaceCash1000 @@ -960,6 +992,7 @@ amount: 4 - id: SpaceCash5000 # Bonus Loot T2 + - id: SpaceCash7500 # LuaM - id: SpaceCash1000 prob: 0.9 - id: SpawnDungeonLootMaterialsBasicFull @@ -987,6 +1020,7 @@ amount: 2 - id: SpaceCash2500 # Bonus Loot T2 + - id: SpaceCash7500 # LuaM - id: SpaceCash1000 prob: 0.9 - id: SpaceCash1000 @@ -1014,6 +1048,7 @@ amount: 4 - id: SpaceCash2500 # Bonus Loot T2 + - id: SpaceCash7500 # LuaM - id: SpaceCash1000 prob: 0.9 - id: SpawnDungeonLootMaterialsBasicFull @@ -1041,6 +1076,7 @@ amount: 2 - id: SpaceCash2500 # Bonus Loot T2 + - id: SpaceCash7500 # LuaM - id: SpaceCash1000 prob: 0.9 - id: SpaceCash1000