Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

FIXXX

Browse Source
This commit is contained in:
Aviu00
2024-01-18 09:09:22 +03:00
parent 496aeda60e
commit 466992e6da
6 changed files with 29 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Content.Client/StationRecords/GeneralStationRecordConsoleWindow.xaml.cs
View File

@@ -1,4 +1,5 @@
using System.Linq; using System.Linq;
using System.Numerics;
using Content.Client.Humanoid; using Content.Client.Humanoid;
using Content.Client.Inventory; using Content.Client.Inventory;
using Content.Shared.GameTicking; using Content.Shared.GameTicking;
@@ -215,10 +216,10 @@ public sealed partial class GeneralStationRecordConsoleWindow : DefaultWindow
GiveDummyJobClothes(_previewDummy, record.JobPrototype, profile); GiveDummyJobClothes(_previewDummy, record.JobPrototype, profile);
var spriteViewBox = new BoxContainer(); var spriteViewBox = new BoxContainer();
var sprite = entityManager.GetComponent<SpriteComponent>(_previewDummy); // var sprite = entityManager.GetComponent<SpriteComponent>(_previewDummy);
spriteViewBox.AddChild(new SpriteView() { Sprite = sprite, Scale = (5, 5)}); spriteViewBox.AddChild(new SpriteView(_previewDummy, entityManager) { Scale = new Vector2(5, 5)});
spriteViewBox.AddChild(new SpriteView() { Sprite = sprite, Scale = (5, 5), OverrideDirection = Direction.East}); spriteViewBox.AddChild(new SpriteView(_previewDummy, entityManager) { Scale = new Vector2(5, 5), OverrideDirection = Direction.East});
return spriteViewBox; return spriteViewBox;
} }

5
Content.Server/Body/Systems/RespiratorSystem.cs
View File

@@ -235,9 +235,10 @@ namespace Content.Server.Body.Systems
// WD start // WD start
private void OnHandInteract(EntityUid uid, RespiratorComponent component, InteractHandEvent args) private void OnHandInteract(EntityUid uid, RespiratorComponent component, InteractHandEvent args)
{ {
if (CanCPR(uid, component, args.User)) if (!CanCPR(uid, component, args.User))
DoCPR(uid, component, args.User); return;
DoCPR(uid, component, args.User);
args.Handled = true; args.Handled = true;
} }

2
Content.Server/White/AntiCringeSystem/AntiCringeComponent.cs
View File

@@ -1,7 +1,7 @@
namespace Content.Server.White.AntiCringeSystem; namespace Content.Server.White.AntiCringeSystem;
[RegisterComponent] [RegisterComponent]
public sealed class AntiCringeComponent : Component public sealed partial class AntiCringeComponent : Component
{ {
} }

1
Content.Server/White/Other/OnDeath.cs
View File

@@ -63,6 +63,7 @@ public sealed class OnDeath : EntitySystem
} }
var newStream = _audio.PlayEntity(HeartSounds, uid, uid, AudioParams.Default.WithLoop(true)); var newStream = _audio.PlayEntity(HeartSounds, uid, uid, AudioParams.Default.WithLoop(true));
if (newStream != null)
_playingStreams[uid] = newStream.Value.Entity; _playingStreams[uid] = newStream.Value.Entity;
} }

9
Resources/Prototypes/White/Actions/emotes.yml
View File

@@ -3,6 +3,9 @@
id: EmoteActionFlip id: EmoteActionFlip
name: emote-flip-action-name name: emote-flip-action-name
description: emote-flip-action-description description: emote-flip-action-description
nospawn: true
components:
- type: InstantAction
icon: White/Actions/EmoteFlip.png icon: White/Actions/EmoteFlip.png
event: !type:EmoteActionEvent event: !type:EmoteActionEvent
emote: EmoteFlip emote: EmoteFlip
@@ -12,6 +15,9 @@
id: EmoteActionJump id: EmoteActionJump
name: emote-jump-action-name name: emote-jump-action-name
description: emote-jump-action-description description: emote-jump-action-description
nospawn: true
components:
- type: InstantAction
icon: White/Actions/EmoteJump.png icon: White/Actions/EmoteJump.png
event: !type:EmoteActionEvent event: !type:EmoteActionEvent
emote: EmoteJump emote: EmoteJump
@@ -21,6 +27,9 @@
id: EmoteActionTurn id: EmoteActionTurn
name: emote-turn-action-name name: emote-turn-action-name
description: emote-turn-action-description description: emote-turn-action-description
nospawn: true
components:
- type: InstantAction
icon: White/Actions/EmoteTurn.png icon: White/Actions/EmoteTurn.png
event: !type:EmoteActionEvent event: !type:EmoteActionEvent
emote: EmoteTurn emote: EmoteTurn

1
Resources/Prototypes/White/Species/felinid.yml
View File

@@ -3,6 +3,7 @@
name: species-name-felinid name: species-name-felinid
roundStart: true roundStart: true
prototype: MobFelinid prototype: MobFelinid
sprites: MobHumanSprites
markingLimits: MobFelinidMarkingLimits markingLimits: MobFelinidMarkingLimits
dollPrototype: MobFelinidDummy dollPrototype: MobFelinidDummy
skinColoration: HumanToned skinColoration: HumanToned