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

Goes in-game now

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-12-06 15:34:46 +01:00
parent af4eb3c7cd
commit c57b07a4d0
43 changed files with 129 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Content.Server/Body/Commands/AddHandCommand.cs
View File

@@ -44,13 +44,13 @@ namespace Content.Server.Body.Commands
return;
}
if (player.AttachedEntity == default)
if (player.AttachedEntity == null)
{
shell.WriteLine("You don't have an entity to add a hand to.");
return;
}
entity = player.AttachedEntity;
entity = player.AttachedEntity.Value;
hand = entityManager.SpawnEntity(DefaultHandPrototype, entityManager.GetComponent<TransformComponent>(entity).Coordinates);
break;
}
@@ -75,13 +75,13 @@ namespace Content.Server.Body.Commands
return;
}
if (player.AttachedEntity == default)
if (player.AttachedEntity == null)
{
shell.WriteLine("You don't have an entity to add a hand to.");
return;
}
entity = player.AttachedEntity;
entity = player.AttachedEntity.Value;
hand = entityManager.SpawnEntity(args[0], entityManager.GetComponent<TransformComponent>(entity).Coordinates);
}

2
Content.Server/Body/Commands/AttachBodyPartCommand.cs
View File

@@ -44,7 +44,7 @@ namespace Content.Server.Body.Commands
return;
}
entity = player.AttachedEntity;
entity = player.AttachedEntity.Value;
break;
case 2:

4
Content.Server/Body/Commands/DestroyMechanismCommand.cs
View File

@@ -31,13 +31,13 @@ namespace Content.Server.Body.Commands
return;
}
if (player.AttachedEntity == default)
if (player.AttachedEntity is not {} attached)
{
shell.WriteLine("You have no entity.");
return;
}
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(player.AttachedEntity, out SharedBodyComponent? body))
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(attached, out SharedBodyComponent? body))
{
var random = IoCManager.Resolve<IRobustRandom>();
var text = $"You have no body{(random.Prob(0.2f) ? " and you must scream." : ".")}";