From 14c002e5b8f7064544deeb7d6c19892fb1ca8296 Mon Sep 17 00:00:00 2001 From: kasature90 Date: Fri, 17 Jul 2026 04:58:00 -0400 Subject: [PATCH 1/4] Fix Wielding + Attachments Making Gun Spread Go Negative (#4301) Co-authored-by: starch --- .../Wieldable/SharedWieldableSystem.cs | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/Content.Shared/Wieldable/SharedWieldableSystem.cs b/Content.Shared/Wieldable/SharedWieldableSystem.cs index 3caa9cd44d3..2e1f0aa1781 100644 --- a/Content.Shared/Wieldable/SharedWieldableSystem.cs +++ b/Content.Shared/Wieldable/SharedWieldableSystem.cs @@ -134,10 +134,19 @@ private void OnGunRefreshModifiers(Entity bonus, ref Gun noWieldNeeded.GetBonus) ) { - args.MinAngle += bonus.Comp.MinAngle; - args.MaxAngle += bonus.Comp.MaxAngle; - args.AngleDecay += bonus.Comp.AngleDecay; - args.AngleIncrease += bonus.Comp.AngleIncrease; + // Mono start - do all this stupid bullshit because i'm too lazy to make attachments modify the wieldcomp + if (TryComp(args.Gun, out var gunComp)) + { + var minAngleAdd = bonus.Comp.MinAngle * (gunComp.MinAngleModified / gunComp.MinAngle); + var maxAngleAdd = bonus.Comp.MaxAngle * (gunComp.MaxAngleModified / gunComp.MaxAngle); + var angleDecayAdd = bonus.Comp.AngleDecay * (gunComp.AngleDecayModified / gunComp.AngleDecay); + var angleIncreaseAdd = bonus.Comp.AngleIncrease * (gunComp.AngleIncreaseModified / gunComp.AngleIncrease); + args.MinAngle += minAngleAdd; + args.MaxAngle += maxAngleAdd; + args.AngleDecay += angleDecayAdd; + args.AngleIncrease += angleIncreaseAdd; + } + // Mono end } } From 934d8cf8a98fe20c9103471db3bc155b0b40250a Mon Sep 17 00:00:00 2001 From: kasature90 Date: Wed, 15 Jul 2026 19:30:46 -0400 Subject: [PATCH 2/4] Annoying (#4283) Co-authored-by: starch --- .../_Mono/ShipRepair/Components/ShipRepairToolComponent.cs | 3 +++ .../_Mono/ShipRepair/SharedShipRepairSystem.Tool.cs | 4 ++-- Resources/Prototypes/Entities/Structures/Walls/walls.yml | 3 ++- Resources/Prototypes/_Mono/Entities/Objects/Tools/repair.yml | 1 + 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Content.Shared/_Mono/ShipRepair/Components/ShipRepairToolComponent.cs b/Content.Shared/_Mono/ShipRepair/Components/ShipRepairToolComponent.cs index 5b647398e0b..c804094b625 100644 --- a/Content.Shared/_Mono/ShipRepair/Components/ShipRepairToolComponent.cs +++ b/Content.Shared/_Mono/ShipRepair/Components/ShipRepairToolComponent.cs @@ -18,6 +18,9 @@ public sealed partial class ShipRepairToolComponent : Component [DataField, AutoNetworkedField] public bool EnableEntityRepair = true; + [DataField, AutoNetworkedField] + public bool CheckPreExistingEntities = true; + /// /// Multiplier of time the repair doafter should take. /// diff --git a/Content.Shared/_Mono/ShipRepair/SharedShipRepairSystem.Tool.cs b/Content.Shared/_Mono/ShipRepair/SharedShipRepairSystem.Tool.cs index cf3867eff88..dcf3449155d 100644 --- a/Content.Shared/_Mono/ShipRepair/SharedShipRepairSystem.Tool.cs +++ b/Content.Shared/_Mono/ShipRepair/SharedShipRepairSystem.Tool.cs @@ -151,7 +151,7 @@ private void OnAfterInteract(Entity ent, ref AfterInter } if (notEnoughCharges) _popup.PopupClient(Loc.GetString("ship-repair-tool-insufficient-ammo"), ent, args.User); - else if (alreadyExists && _net.IsServer) // else we show it once or twice depending on whether it's in PVS + else if (alreadyExists && _net.IsServer && ent.Comp.CheckPreExistingEntities) // else we show it once or twice depending on whether it's in PVS _popup.PopupEntity(Loc.GetString("ship-repair-tool-entity-exists"), ent, args.User, PopupType.SmallCaution); } @@ -212,7 +212,7 @@ private void OnRepairDoAfter(Entity ent, ref ShipRepair // this is technically copypaste code but it's different each time var origUid = spec.OriginalEntity == null ? (EntityUid?)null : GetEntity(spec.OriginalEntity.Value); - if (origUid != null && !TerminatingOrDeleted(origUid.Value)) + if (origUid != null && !TerminatingOrDeleted(origUid.Value) && ent.Comp.CheckPreExistingEntities) { var ev = new ShipRepairReinstateQueryEvent(true); RaiseLocalEvent(origUid.Value, ref ev); diff --git a/Resources/Prototypes/Entities/Structures/Walls/walls.yml b/Resources/Prototypes/Entities/Structures/Walls/walls.yml index 60d4cd4f214..3842504b3fb 100644 --- a/Resources/Prototypes/Entities/Structures/Walls/walls.yml +++ b/Resources/Prototypes/Entities/Structures/Walls/walls.yml @@ -10,7 +10,7 @@ - Wall components: - type: Anchorable - flags: + flags: - Anchorable - type: Rotatable - type: RangedDamageSound @@ -26,6 +26,7 @@ tags: - Wall - type: IsRoof + - type: RequiresGrid # Mono - type: Sprite drawdepth: Walls - type: Icon diff --git a/Resources/Prototypes/_Mono/Entities/Objects/Tools/repair.yml b/Resources/Prototypes/_Mono/Entities/Objects/Tools/repair.yml index eda4ba9dcae..f53bfcc2eef 100644 --- a/Resources/Prototypes/_Mono/Entities/Objects/Tools/repair.yml +++ b/Resources/Prototypes/_Mono/Entities/Objects/Tools/repair.yml @@ -66,6 +66,7 @@ components: - type: ShipRepairTool repairTimeMultiplier: 0 + checkPreExistingEntities: false - type: Tag tags: - ShipRepairTool From 46032ba97a78bb5a2a8ce0da58f2d5dd864d9fa8 Mon Sep 17 00:00:00 2001 From: kasature90 Date: Wed, 8 Jul 2026 16:51:11 -0400 Subject: [PATCH 3/4] Annie Sprite Tweak (#4243) Co-authored-by: starch --- .../Weapons/Guns/Rifles/annie.rsi/base.png | Bin 7886 -> 8437 bytes .../Guns/Rifles/annie.rsi/bolt-open.png | Bin 7874 -> 8429 bytes .../Weapons/Guns/Rifles/annie.rsi/icon.png | Bin 8201 -> 8839 bytes .../Weapons/Guns/Rifles/annie.rsi/mag-0.png | Bin 621 -> 5265 bytes 4 files changed, 0 insertions(+), 0 deletions(-) diff --git a/Resources/Textures/_Mono/Objects/Weapons/Guns/Rifles/annie.rsi/base.png b/Resources/Textures/_Mono/Objects/Weapons/Guns/Rifles/annie.rsi/base.png index 56a4ad81d4cf68b70231bf5be0edbd8d543e0a24..0fa74811dc2fe0002b1b474a894172632e77bd47 100644 GIT binary patch delta 4583 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 RLjV8(2>?k&PDHLkV1oX)fK&hg delta 4548 zcmV;#5j*bnLC!spBYzB*dQ@0+Qek%>aB^>EX>4U6ba`-PAZ2)IW&i+q+U=QJax2LV zME`3QUP8T4C@iO*5#E89?}H|#8A*4-aczG&OorHGce5TyATvRQ^N+vZ@HZYsB!(*5 zo3$2sRI8Q;Z+d(^#`BtDeO{kOd0*o5m-8WiT*#a%f85#I`+xqA^XYSd*J1EZ{xncu z?+f$m1*`Az`?rDKGZ$Zxzu)hH>^)G)uM6otz<6ydHtYK5EzI*e?vI`H*I)3L+P^OQ z$7dyaTbQThd`c>j*HZFp0mc7XD1$e`YbwHxu{7Qb$5Cqe*eU_}Rh&K_#)_^lwf^#^ zFQ|OJ`-av>2!FzNv}%6eQoaSbeI9>#J|y{ep?uDt|2%W;?|1p@`F`Vit>|0y{qNr0 z@3UuiF=`{!?Y*gwEk5tKZ!(2X-2+Q&QTY>w(C2A9J6XL*h0T1E=Sr3`aNShXP9xoP zp5sc3CDwdGR^H^ia(PbnqS^8SwFGKB)6H6}?9u^wJ%6y*l0Vmyo@p(v@XXekc_(ho ziNO+I`R!-;-7nnhu}#TiImQz!)|Imdn`Jn1{>p72lI}aG@&x$f`TgOz77!GVvX_Vv z*!db_O8SEd$^&%aM&bCX!KC{=03l*(VKJ$I0H{$LsimknYf1#N1JGdUxzs#CAc^G7 zB6BUJfqzZUJ~dy_^xT>yb2@MyGV{8k$`ov@48W>Y$RDkp92!!jibxZcE+(UuR-3fe zv^gmbEn0($HdXCvI(q4~OK)9!@79N9E0CsGGqrAJV=(7n9FcaaQ$Xh~#u4jv0XEP!ou&LqI}j$1L_#Yj)%uvuK&Bkjx^* zG26)z1HpPymYY7X3;BhpBljQS7PNlBE&sd71&8i8k^70;uTb00!RtZnRfQhZSg1a( zpMO4bA1-!3j^VE^{O<98WuRT!j^m&Sby>Wp=?x2b?@Svclzg*C*} zb1+F&+{^rj$MCOj6zX6#vB9qL#LMWeHlT|ZXS>&k?sdm@)38(erlMo-B~nQ49dA{3 zd~$954oZzWCR}nEYW37jD;$#`_E~gpwQ$aux)WtG;P|yFEQla?%A_gUrMC_~;C~^s z-rWF=(dyV^@a-+P_giKx7No(4<)ZVX19dv%m=ZVeRN$!4g$}9Z$heS6uWeGN((QDM zjltk61|1{dUZIe(E}~6(K`-!4F4VvDF3B$WwEbqNPTL&tkUAZdl%a;5oEOSMvTgM; z`vqi{f}NRK?!JBAQtp90XETi9M1Kko>t6SEY3tg!XZjMO?WLK?knEP$ZJK2c)|LmU z)=%8Ez_r$-_N^RqVkP^`)?imT=s;&}he)Ba+$rdqurOa2-le(AI!h+hbC+B*kR5%` zItXm<8R>Z!5n6e7Dd)m1_v;e9!<8XmT_`is?xIz%;^)eLI_AS$ohz<=q$l7smf zsLfqxWiFzNt%}R|)cQDelXw&_vZBOqmV8i+b& z2nP9(D1Kukq=j$}%D%6aBs-rIzBw!GKR3806*dw0xNb>S&snE5BiRNRmf>qq6r>pV zY;oE#2!`B= zv$^}(Xu1tqyB>e@^rAc+QpTdMI8WM;Mp_S_sfVjjr3TxOlTLQzUzzbD|IceFYc=2G z>j3rGNsX+6*ba4)CuKP2Wq-Sj9MC*jmZ+UbNGS-o7lNZrt9+PLg?}TH&N7sbcW^@l za7qIr#yK;rW$Z*~`;sBg%@6=v#v3q>^NeWn^Sam^EAi@DH#5cB%)Hpdb#vjRI%{BP zWf9l|WV@vU*p=bfESt^{`B`u|w8E0*sV5so{p52fZ{S|)T+_pDvez*ySOSeCFv`*J zGo%gvw5Agqe8XaQC4U>mRvJKo%ioO!zlb7_R00gK8cYDtQ24a73xS>s*NX8e%C_i$ z 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%0Ay5!Ix#$`oEwv9smb&Gn(zIpx z4+g_zOqZra+K$Q$)c%U)Kzq+avoW{2>TbP4>78pYu+A5EgOe#ve-wprlr@rwnSxOw zMNUFQXwGA8sD!Y>oC{EYqD;$2q12;$2D=ab+Jo?EgFfw0KP%vODKPFoND%j(Ab(DO zJ)934(is4H>3daiK?KWx356Pe(`bGrDxQDsSK2)>E$NUMP)-1gEK5^o|$h zWvy*gwl`?}%vJohzL>J7y7O|9Fn=;q6Wy@V7y?N2sVL`@@# zo$}SdWumL_@PF&TJ<>yQtj<4Bb6bIownydN)KdhpeWsos?GC}G)2}Vf zw6}#>lA|KJF!t=3cp%L5oPN99I+MB$CURcR=)|qV*_>Dqa&RoXeqCVkeLqY=lP?aO zuw3!}=(_QAjvuEkx%(|)KaSxugH7F(p>6~TGEbi@x)WXa5CC*_VSg(dO98h}PI1u2 zCwgp8lpO3o^t;dh2l}rMgro8Q8~q!*{u$Qc;!9ommzA zukfK40~kh^#7sSwTuhEWq^KI@3u%`X&Rd+- zQiV0{$zK@AYAZ>u(;Pt*ONb#35i%+$q67M*IyEplH8zub z5g`pVIx#g=Fg7|hFgi6hv#Ajc0kcyTU$GjLF`jpcazB- zAAbc83Nkn&ZDd;j00OB=L_t(o!|j&MO5;!%hM%N0Z34>CkhV~vn3aoyi`jN9cnP!h z0_GCL>+l9CdNhZ?YLyAYYtXf$O&Rn@ucZ*OnWH0{mj)a!KsE-x?NXJArjMifN= z^m;u2I-O48`q9x5K@iYtwWfYO&totc&}cMfm(AZ`WLc@#>pVX{1K|6<@~VMJ!GD%z z<>P+8Us!Z^cSp0?#Ih`cAOPTpY4ZF2o||vq*xlXb5`uaK_-`w2fV}Ll0>GgVep2zw5Il8VB$1wo9uCu(njO)5ebrI3o!b!p~1mNJ{ z0M~W-xxdeM)0`4ttyXbe7l3xVjeqa^42Q#9EWpaj3P2ulfU~o+f+@o=FbsnvNoHrj zvaDSAxai?s5BU*Usn!k~?EnA(07*qoM6N<$g4kH7y8r+H diff --git a/Resources/Textures/_Mono/Objects/Weapons/Guns/Rifles/annie.rsi/icon.png b/Resources/Textures/_Mono/Objects/Weapons/Guns/Rifles/annie.rsi/icon.png index 2e7eeadc042fe2d125839e485d3279fca6e868cc..ec470ffa635a9981a1b8ca2001a8230e75be1346 100644 GIT binary patch delta 4991 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 P00000NkvXXu0mjfZ~GW; diff --git a/Resources/Textures/_Mono/Objects/Weapons/Guns/Rifles/annie.rsi/mag-0.png b/Resources/Textures/_Mono/Objects/Weapons/Guns/Rifles/annie.rsi/mag-0.png index 653ecdc11c1eaeac1c3d4851dcef5c0d13cb1e22..1d0942e927a6c1e3dc5e0e93ea0def3024ae9c03 100644 GIT binary patch literal 5265 zcmeHKX;c&05)Og{5Ew)h5Y$X?0U`SWi3y4%lBf~Xh^R2yNjeZE3rQdd4-^#z2Ng%1 z#SM4CVN(!f5mc6-gO2PlM^FJlWrT5gpd$Ki0wSI_=e*-NZ~ocoPWslZ`fk-%b*s~f ze#?9;%%++l5C{t{hqVIy;=zS7F$UlK`awqo!f0_6KR~?#(x4PdxmXekqtu%fFba;8 zh!Kd$Kc1~#m*+Ic{9W+mH4B$;IBq`0cWzoaFSSQ~;uv2iXnn8MG7=Gtp_Q?bJXB;0lukub-dZpwX4=*@${oD0#p1k1)h#r2Okx zbR~A7Szu5vkC_+Qk7~*;|L%`TuMU;{wJJ3`hi{`z>-8|}cAARi1ACi-R^Bgq`la>-;HLw zp`-YxO4mi_on3_IvSQLW1Fj1hi4P)O)MpZHJsP?hbdQL(XZUES{KDzo+HI9y_ap z-1P6KH_s}uYONZwk=^Vxl)XD$b=IQwNL5VbGuQgct_QK`h}Ij=>YY0Jq1dQwtz|^Y zAFozV>dPy&8CvnG)W3da6fVBl!MWFi{5D~^!<+1uiUD5e34`nzO3z_+O z8~574_xqpjwYpDPy*|A$`Ot+1wDz8+SzuFRX?^*)wDxJupO5XI*M~}s>{I=BBo`z# zdZ|gFs6Fg=QPJ`z$Ya)=;%oa9>|7zQjNev5qbzR*{0`Bdm56>@*9kQ{xLM8Plg}L-Sxg~ zw|R}`!=AU3TDsNo6szye5eS2LiMO{O*W3GJR{_1`Xw3erOUf45Ri>O<%${rc4Aq`| zl71OIx7~S_+qU>x|B#03owc}-+T=4=Jj^o3Bj-=~)e?KBkbcE%+XH06maQHxg`C8` zS@BZ{ZDIHJb+>gt>}4(p@&9FG|5C&SvHcTPVD+Qb71vzHk-ZZHfr4|#tKGy8X(hc6 zI|hT2f;Tq}(TopnyNO8QFtqA2bQ|h;ORoCPU^(RfqfNW2J=M#0W^8BSpD!G`e<&OG zySYQlD@NGQ0dCYZudgadSG2XK`}d^B_`bif!E4=3#j!>c>wtyU zE(yuYea5c}NT|u&FF^CU!@l{D-Ql}`$?VnRlN=|cdc}9XzW(8XMt-}!{>%}ZB*Uw? zydi>_QAC`7SzhTrX;JvN*C}zX868=axE9}9hiMq4k-5y!wrLu#%@C{EdU8$>ai-6U zI_ur+2SZ6EF5m2s#l5HG%b%%^dLq_5ZFpg!P?#hga*l58XpL!&8O%S|S~{azuKbO- zk)Z+YKSBc9d;o7LT_~4gA(31FVMMhW0xiHwQvD=I~!BqAny zHHC-gDZJqj2`5SkuZ&v87e;Lo(nRR_o@R_lIslNuY6ul64V9_rkxaB6mk#cAVjLQ! zS5a?bq62t-C~vtEMv<{(EFQy-ltd8Go@OY9QY5CYU@aPf03#+kM6FiPaX5`egVm6* za%C`%K%>!ccp{ES!~hM9YO_oYMPg(sCmqBv1`AdRl@f(oBA20bn2^0+ zKdFMp8-5Ag15w2! z8kLGCx(i5pD3Or9NUoGZAe|B^6b$1OvS9s$j&Qn{AD4+HV)36OexZ}06sD*Tu z3IOzS5Dnd12}5eRk}sEsGSNDxP&&)eX&%^6B1jFfATPjphLpp5L8eE zEYkZ4u!g6EA&@K>2K{5CU_Z(we^U$sAz3ISi3u2zyE_Exi42lQBoHy~L;-~a;i*&s zp7J@mN-kDwASLV-40r@wfdbWYg>oKAmCNV)nh;o*2S6DH?+(sU%FwuxU~#&R@iAHk z?!Wk8=oQAa7+^On1FZ{mLfmL89N|mXbpF9(BoF`K3IO`+B45PsSGvB^^+gPPk@DB- z`byUqG4MsoU#si?Mwi*Amnm2V{sC#gt5RK6>Hk}v1*GR cKe0yZ@Gi{L(lDr^5(I$YvX`+k7jD@0ANLmd2mk;8 delta 597 zcmV-b0;>IyDeVN1BYy#XX+uL$Nkc;*aB^>EX>4Tx04R}tkv&L4Q5c4wdo7GmByxyo zxPvt%L`5`)MG_Q<8mKjNf6@f+Rqj<<9D~-Np`WF{p{2RjhSnem`hjQZ# z7PH#-{aJov)zLvxfGNFXmqA(qCf3U(!Mi|EUsDZ`&VXS%mCk_lAat$HuYz+mmc`7V zos3U|90ZhH3u`T`uh}NZ<3PwTEd%6KoejZN!DgYNH{K~W^sQQp384c6M44lO7z!E{ z@)Rf&CXa=JLw}qokv9JRnmzC=$KZK_ORMQG9>U}Yc($5a=l}v6aDLU)v>mwEgucg;YO6KL1IXDdyq$tS z4ZSzey;RSwanH#;B&#rg4SV}Al!L%>o4vbQbNjcak$>M047PH9qW*)a00021NklyAFde429vps35@*AqJRv|L0;L0|NtBDeY3Esu&_+C8AD2jrV5_z5zLNL#8oj^*7vMd2O z&y#K2%uX|0ClEqlU03#fr|UZEx;D>noxnWL^nDM&IF2qm;MzdbGz`N4z;PTd8LkaX j(*&<&wmzRCBLCqDoTe{3cc4I#00000NkvXXu0mjfOk)}! From 26598f16171d180c5e37f6bb23aa73402c0ea6cd Mon Sep 17 00:00:00 2001 From: fox76055 Date: Sat, 18 Jul 2026 10:31:17 +0500 Subject: [PATCH 4/4] phoenix fix --- .../_LuaM/Shuttles/Expedition/Phoenix.yml | 20 +++++++++---------- .../_LuaM/shipyard/Expedition/Phoenix.yml | 1 - 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/Resources/Maps/_LuaM/Shuttles/Expedition/Phoenix.yml b/Resources/Maps/_LuaM/Shuttles/Expedition/Phoenix.yml index 98ad0c3fb73..42d3fd21dde 100644 --- a/Resources/Maps/_LuaM/Shuttles/Expedition/Phoenix.yml +++ b/Resources/Maps/_LuaM/Shuttles/Expedition/Phoenix.yml @@ -4,7 +4,7 @@ meta: engineVersion: 277.0.0 forkId: "" forkVersion: "" - time: 07/15/2026 13:27:20 + time: 07/18/2026 05:26:06 entityCount: 3374 maps: [] grids: @@ -175,8 +175,8 @@ entities: - type: SpreaderGrid spreadQueues: Smoke: [] - MetalFoam: [] Kudzu: [] + MetalFoam: [] Puddle: [] - type: Shuttle dampingModifier: 0.25 @@ -7303,6 +7303,13 @@ entities: rot: -1.5707963267948966 rad pos: 12.5,-21.5 parent: 1 +- proto: CarbonDioxideCanister + entities: + - uid: 1945 + components: + - type: Transform + pos: 19.5,-19.5 + parent: 1 - proto: CarpetBlack entities: - uid: 980 @@ -13820,15 +13827,6 @@ entities: - type: Transform pos: -0.5,-19.5 parent: 1 -- proto: Paper - entities: - - uid: 1945 - components: - - type: Transform - pos: 12.530091,-23.486595 - parent: 1 - - type: Paper - content: Нажми кнопку, поставь потребление турбины 500, нагрузку не трогай, стержни на 50%, топливные стержни вставь, меняй каждые 30 - 45 минут. Остальное думай сам, не глупый. - proto: PaperBin20 entities: - uid: 1946 diff --git a/Resources/Prototypes/_LuaM/shipyard/Expedition/Phoenix.yml b/Resources/Prototypes/_LuaM/shipyard/Expedition/Phoenix.yml index 8f44a93645e..16520324525 100644 --- a/Resources/Prototypes/_LuaM/shipyard/Expedition/Phoenix.yml +++ b/Resources/Prototypes/_LuaM/shipyard/Expedition/Phoenix.yml @@ -17,7 +17,6 @@ shuttlePath: /Maps/_LuaM/Shuttles/Expedition/Phoenix.yml guidebookPage: Null class: - - Capital - Medical - Chemistry - Pursuit