tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SKREEEEEE (#3706)

Browse Source 
* Import bird sprites and define basic mob.

* SKREEEEEEEEE

* Move hair styles to new sprite accessory prototypes.

Basic stuff, no multi-species stuff yet.

* Vox hair styles and clothes

* Make HumanoidCharacterProfile.Default() a static default to fix tests.

Usages that wanted the previous random behavior now call Random().

* Remove names from hair style prototypes.

(They're in localization files)

* Update Content.Shared/Actions/ActionType.cs

(sk)reeee github

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
This commit is contained in:
Pieter-Jan Briers
2021-03-28 08:26:32 +02:00
committed by GitHub
parent 5ed935f30a
commit 0ac4c0e85c
101 changed files with 2440 additions and 505 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
Content.Shared/GameObjects/Components/SharedMagicMirrorComponent.cs
View File

@@ -1,5 +1,6 @@
#nullable enable
using System;
using Content.Shared.Preferences.Appearance;
using Robust.Shared.GameObjects;
using Robust.Shared.Maths;
using Robust.Shared.Serialization;
@@ -19,12 +20,12 @@ namespace Content.Shared.GameObjects.Components
[Serializable, NetSerializable]
public class HairSelectedMessage : BoundUserInterfaceMessage
{
public readonly string HairName;
public readonly string HairId;
public readonly bool IsFacialHair;
public HairSelectedMessage(string name, bool isFacialHair)
public HairSelectedMessage(string id, bool isFacialHair)
{
HairName = name;
HairId = id;
IsFacialHair = isFacialHair;
}
}
@@ -58,17 +59,25 @@ namespace Content.Shared.GameObjects.Components
{
public readonly Color HairColor;
public readonly Color FacialHairColor;
public readonly string HairName;
public readonly string FacialHairName;
public readonly string HairId;
public readonly string FacialHairId;
public readonly Color EyeColor;
public readonly SpriteAccessoryCategories CategoriesHair;
public readonly SpriteAccessoryCategories CategoriesFacialHair;
public readonly bool CanColorHair;
public readonly bool CanColorFacialHair;
public MagicMirrorInitialDataMessage(Color hairColor, Color facialHairColor, string hairName, string facialHairName, Color eyeColor)
public MagicMirrorInitialDataMessage(Color hairColor, Color facialHairColor, string hairId, string facialHairId, Color eyeColor, SpriteAccessoryCategories categoriesHair, SpriteAccessoryCategories categoriesFacialHair, bool canColorHair, bool canColorFacialHair)
{
HairColor = hairColor;
FacialHairColor = facialHairColor;
HairName = hairName;
FacialHairName = facialHairName;
HairId = hairId;
FacialHairId = facialHairId;
EyeColor = eyeColor;
CategoriesHair = categoriesHair;
CategoriesFacialHair = categoriesFacialHair;
CanColorHair = canColorHair;
CanColorFacialHair = canColorFacialHair;
}
}
}