Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Engine Update & EE Surgery #481

Merged
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
029b763
Shitmed: Implementing Existing Newmed Code Into SS14 (#1159)
gluesniffler Nov 17, 2024
ea9a076
Automatic Changelog Update (#1159)
SimpleStation14 Nov 17, 2024
bdbc394
Update Credits (#1235)
github-actions[bot] Nov 17, 2024
f95774b
Mass Engine Update (#1220)
sleepyyapril Nov 17, 2024
bf6019f
Pirate Radio Heisentest Fix (#1225)
VMSolidus Nov 17, 2024
2eea0f7
Fix Loadout Subcategories Not Being Found (#1233)
DEATHB4DEFEAT Nov 17, 2024
bea5f13
Hotfix Stamina System (#1245)
sleepyyapril Nov 18, 2024
3f8194a
Automatic Changelog Update (#1245)
SimpleStation14 Nov 18, 2024
ab0fa7c
Day/Night Time Cycle For Maps (#1234)
DocNITE Nov 18, 2024
460f444
Automatic Changelog Update (#1234)
SimpleStation14 Nov 18, 2024
860d7c6
Shitmed Update 1 (#1240)
gluesniffler Nov 18, 2024
eb0121f
Automatic Changelog Update (#1240)
SimpleStation14 Nov 18, 2024
aec89a5
Fix Self-Aware Crashing Client (#1247)
angelofallars Nov 18, 2024
ddee61c
Automatic Changelog Update (#1247)
SimpleStation14 Nov 18, 2024
bb13e39
Shitmed Surgery Popups (#1241)
angelofallars Nov 18, 2024
59d2695
AlertsComponentTest Fix (#1246)
sleepyyapril Nov 18, 2024
4fe41ef
Automatic Changelog Update (#1241)
SimpleStation14 Nov 18, 2024
1170399
Merge commit 'ea9a07616fb2b419e89811fa2f753a19aee0da73' into floof/ch…
Mnemotechnician Jan 13, 2025
0fd837f
Merge commit 'bdbc394a8ee4599ab783e83047abf9fa4db6bec8' into floof/ch…
Mnemotechnician Jan 13, 2025
8a64e87
Merge commit 'f95774b3ce4300012b8dbaa60829499ba6a68203' into floof/ch…
Mnemotechnician Jan 13, 2025
d2f8b9d
Migrate Floofstation rules to the new format
Mnemotechnician Jan 13, 2025
3ee02e9
Migrate old StorageFills to the new EntityTableContainerFill
Mnemotechnician Jan 13, 2025
36df059
-- Marker: compiles & runs with a few bugs --
Mnemotechnician Jan 13, 2025
6a511ab
Merge commit '3f8194a879035866199771121262e7ffca3ae2ae' into floof/ch…
Mnemotechnician Jan 13, 2025
0d7d3ce
Merge commit '4fe41eff5edd756aea6899e94f8637607dfec456' into floof/ch…
Mnemotechnician Jan 13, 2025
4d3ecb6
Mass Bug Fixing (#1256)
sleepyyapril Nov 22, 2024
ad3f4dd
Buff Medical Due to Shitmed Changes Cherry-Pick (#1259)
Tmanzxd Nov 22, 2024
1cf936b
Fix ointment caustic healing amount
Mnemotechnician Jan 13, 2025
ddb5ffa
Shitmed Update 2 - [Insert Snarky Remark] (#1271)
gluesniffler Nov 30, 2024
df96cdb
Fix Lobotomy (#1306)
angelofallars Dec 3, 2024
40cadff
Fix health analyzer and RehydratableSystem improper Dirty() call
Mnemotechnician Jan 13, 2025
5e3a62c
Ok apparently I cannot insert xaml comments inside a guidebook entery.
Mnemotechnician Jan 13, 2025
2a85f55
Fix rules formatting and naming
Mnemotechnician Jan 13, 2025
5b02182
Fix test fail caused by component modification on ComponentInit
Mnemotechnician Jan 13, 2025
5d4988d
Fuck you heisentest.
Mnemotechnician Jan 13, 2025
a616fe2
Made the rules tab collapsed by default (let's hope I don't cause a s…
Mnemotechnician Jan 13, 2025
8a4cca4
Fix pirate radio spawn
Mnemotechnician Jan 15, 2025
423bc3c
Fix standing state/buckle conflict
Mnemotechnician Jan 16, 2025
02360be
Remove collision fixtures from footprint entities
Mnemotechnician Jan 16, 2025
e7f4651
Fix incorrect dragging print orientation
Mnemotechnician Jan 16, 2025
f5837d3
Merge branch 'master' of https://github.com/Fansana/floofstation1 int…
Mnemotechnician Jan 17, 2025
493ee52
Separate spray paints into their own loot table and add them back int…
Mnemotechnician Jan 17, 2025
541190e
Minor syntax error
Mnemotechnician Jan 17, 2025
ed3d59e
Merge branch 'master' into floof/cherrypick/ee-surgery
Mnemotechnician Jan 18, 2025
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
Prev Previous commit
Next Next commit
Fix health analyzer and RehydratableSystem improper Dirty() call
  • Loading branch information
Mnemotechnician committed Jan 13, 2025
commit 40cadff77c541a84e2e3e76ed58364107a4eecf2
3 changes: 2 additions & 1 deletion Content.Server/Forensics/Systems/ForensicsSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,6 @@ private void OnMeleeHit(EntityUid uid, ForensicsComponent component, MeleeHitEve
private void OnRehydrated(Entity<ForensicsComponent> ent, ref GotRehydratedEvent args)
{
CopyForensicsFrom(ent.Comp, args.Target);
Dirty(args.Target, ent.Comp);
}

/// <summary>
Expand All @@ -127,6 +126,8 @@ public void CopyForensicsFrom(ForensicsComponent src, EntityUid target)
{
dest.Fingerprints.Add(print);
}

Dirty(target, dest);
}

private void OnAfterInteract(EntityUid uid, CleansForensicsComponent component, AfterInteractEvent args)
Expand Down
2 changes: 0 additions & 2 deletions Content.Server/Medical/HealthAnalyzerSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,9 @@
using Content.Server.Temperature.Components;
using Content.Server.Traits.Assorted;
using Content.Shared.Chemistry.EntitySystems;
// Shitmed Start
using Content.Shared.Body.Part;
using Content.Shared.Body.Systems;
using Content.Shared.Targeting;
// Shitmed End
using Content.Shared.Damage;
using Content.Shared.DoAfter;
using Content.Shared.Interaction;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public sealed class HealthAnalyzerScannedUserMessage : BoundUserInterfaceMessage
public Dictionary<TargetBodyPart, TargetIntegrity>? Body; // Shitmed
public NetEntity? Part; // Shitmed

public HealthAnalyzerScannedUserMessage(NetEntity? targetEntity, float temperature, float mass, float bloodLevel, bool? scanMode, bool? bleeding, bool? unrevivable, Dictionary<TargetBodyPart, TargetIntegrity>? body, NetEntity? part = null)
public HealthAnalyzerScannedUserMessage(NetEntity? targetEntity, float mass, float temperature, float bloodLevel, bool? scanMode, bool? bleeding, bool? unrevivable, Dictionary<TargetBodyPart, TargetIntegrity>? body, NetEntity? part = null)
{
TargetEntity = targetEntity;
Mass = mass; // Floof: Health scanners show body mass
Expand Down
Loading