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 } } 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/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/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/_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 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 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 56a4ad81d4c..0fa74811dc2 100644 Binary files a/Resources/Textures/_Mono/Objects/Weapons/Guns/Rifles/annie.rsi/base.png and b/Resources/Textures/_Mono/Objects/Weapons/Guns/Rifles/annie.rsi/base.png differ diff --git a/Resources/Textures/_Mono/Objects/Weapons/Guns/Rifles/annie.rsi/bolt-open.png b/Resources/Textures/_Mono/Objects/Weapons/Guns/Rifles/annie.rsi/bolt-open.png index c04f249a778..59f19717d13 100644 Binary files a/Resources/Textures/_Mono/Objects/Weapons/Guns/Rifles/annie.rsi/bolt-open.png and b/Resources/Textures/_Mono/Objects/Weapons/Guns/Rifles/annie.rsi/bolt-open.png differ 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 2e7eeadc042..ec470ffa635 100644 Binary files a/Resources/Textures/_Mono/Objects/Weapons/Guns/Rifles/annie.rsi/icon.png and b/Resources/Textures/_Mono/Objects/Weapons/Guns/Rifles/annie.rsi/icon.png differ 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 653ecdc11c1..1d0942e927a 100644 Binary files a/Resources/Textures/_Mono/Objects/Weapons/Guns/Rifles/annie.rsi/mag-0.png and b/Resources/Textures/_Mono/Objects/Weapons/Guns/Rifles/annie.rsi/mag-0.png differ