Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 13 additions & 4 deletions Content.Shared/Wieldable/SharedWieldableSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -134,10 +134,19 @@ private void OnGunRefreshModifiers(Entity<GunWieldBonusComponent> 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<GunComponent>(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
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ public sealed partial class ShipRepairToolComponent : Component
[DataField, AutoNetworkedField]
public bool EnableEntityRepair = true;

[DataField, AutoNetworkedField]
public bool CheckPreExistingEntities = true;

/// <summary>
/// Multiplier of time the repair doafter should take.
/// </summary>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ private void OnAfterInteract(Entity<ShipRepairToolComponent> 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);
}

Expand Down Expand Up @@ -212,7 +212,7 @@ private void OnRepairDoAfter(Entity<ShipRepairToolComponent> 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);
Expand Down
20 changes: 9 additions & 11 deletions Resources/Maps/_LuaM/Shuttles/Expedition/Phoenix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -175,8 +175,8 @@ entities:
- type: SpreaderGrid
spreadQueues:
Smoke: []
MetalFoam: []
Kudzu: []
MetalFoam: []
Puddle: []
- type: Shuttle
dampingModifier: 0.25
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion Resources/Prototypes/Entities/Structures/Walls/walls.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
- Wall
components:
- type: Anchorable
flags:
flags:
- Anchorable
- type: Rotatable
- type: RangedDamageSound
Expand All @@ -26,6 +26,7 @@
tags:
- Wall
- type: IsRoof
- type: RequiresGrid # Mono
- type: Sprite
drawdepth: Walls
- type: Icon
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
shuttlePath: /Maps/_LuaM/Shuttles/Expedition/Phoenix.yml
guidebookPage: Null
class:
- Capital
- Medical
- Chemistry
- Pursuit
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@
components:
- type: ShipRepairTool
repairTimeMultiplier: 0
checkPreExistingEntities: false
- type: Tag
tags:
- ShipRepairTool
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading