Flipped caps real (#24961)

* Flipped caps real

* oops

* whoops

* flip not fold

* fix formatting

* cargosoft formatting
This commit is contained in:
themias
2024-02-10 03:44:19 -05:00
committed by GitHub
parent b07e8abedb
commit f7a3ea6dcf
100 changed files with 389 additions and 529 deletions

View File

@@ -17,4 +17,17 @@ public sealed partial class FoldableClothingComponent : Component
/// </summary>
[DataField]
public SlotFlags? UnfoldedSlots;
/// <summary>
/// What equipped prefix does this have while in folded form?
/// </summary>
[DataField]
public string? FoldedEquippedPrefix;
/// <summary>
/// What held prefix does this have while in folded form?
/// </summary>
[DataField]
public string? FoldedHeldPrefix;
}

View File

@@ -1,6 +1,7 @@
using Content.Shared.Clothing.Components;
using Content.Shared.Foldable;
using Content.Shared.Inventory;
using Content.Shared.Item;
namespace Content.Shared.Clothing.EntitySystems;
@@ -8,6 +9,7 @@ public sealed class FoldableClothingSystem : EntitySystem
{
[Dependency] private readonly ClothingSystem _clothingSystem = default!;
[Dependency] private readonly InventorySystem _inventorySystem = default!;
[Dependency] private readonly SharedItemSystem _itemSystem = default!;
public override void Initialize()
{
@@ -31,12 +33,32 @@ public sealed class FoldableClothingSystem : EntitySystem
private void OnFolded(Entity<FoldableClothingComponent> ent, ref FoldedEvent args)
{
if (TryComp<ClothingComponent>(ent.Owner, out var clothingComp))
if (TryComp<ClothingComponent>(ent.Owner, out var clothingComp) &&
TryComp<ItemComponent>(ent.Owner, out var itemComp))
{
if (args.IsFolded && ent.Comp.FoldedSlots.HasValue)
if (args.IsFolded)
{
if (ent.Comp.FoldedSlots.HasValue)
_clothingSystem.SetSlots(ent.Owner, ent.Comp.FoldedSlots.Value, clothingComp);
else if (!args.IsFolded && ent.Comp.UnfoldedSlots.HasValue)
if (ent.Comp.FoldedEquippedPrefix != null)
_clothingSystem.SetEquippedPrefix(ent.Owner, ent.Comp.FoldedEquippedPrefix, clothingComp);
if (ent.Comp.FoldedHeldPrefix != null)
_itemSystem.SetHeldPrefix(ent.Owner, ent.Comp.FoldedHeldPrefix, false, itemComp);
}
else
{
if (ent.Comp.UnfoldedSlots.HasValue)
_clothingSystem.SetSlots(ent.Owner, ent.Comp.UnfoldedSlots.Value, clothingComp);
if (ent.Comp.FoldedEquippedPrefix != null)
_clothingSystem.SetEquippedPrefix(ent.Owner, null, clothingComp);
if (ent.Comp.FoldedHeldPrefix != null)
_itemSystem.SetHeldPrefix(ent.Owner, null, false, itemComp);
}
}
}
}

View File

@@ -17,4 +17,10 @@ public sealed partial class FoldableComponent : Component
[DataField]
public bool CanFoldInsideContainer = false;
[DataField]
public LocId UnfoldVerbText = "unfold-verb";
[DataField]
public LocId FoldVerbText = "fold-verb";
}

View File

@@ -134,7 +134,7 @@ public sealed class FoldableSystem : EntitySystem
AlternativeVerb verb = new()
{
Act = () => TryToggleFold(uid, component),
Text = component.IsFolded ? Loc.GetString("unfold-verb") : Loc.GetString("fold-verb"),
Text = component.IsFolded ? Loc.GetString(component.UnfoldVerbText) : Loc.GetString(component.FoldVerbText),
Icon = new SpriteSpecifier.Texture(new ("/Textures/Interface/VerbIcons/fold.svg.192dpi.png")),
// If the object is unfolded and they click it, they want to fold it, if it's folded, they want to pick it up

View File

@@ -3,3 +3,5 @@
foldable-deploy-fail = You can't deploy the {$object} here.
fold-verb = Fold
unfold-verb = Unfold
fold-flip-verb = Flip

View File

@@ -1,5 +1,47 @@
- type: entity
parent: ClothingHeadBaseButcherable
parent: [ClothingHeadBaseButcherable, BaseFoldable]
id: ClothingHeadHeadHatBaseFlippable
abstract: true
components:
- type: Appearance
- type: Foldable
canFoldInsideContainer: true
unfoldVerbText: fold-flip-verb
foldVerbText: fold-flip-verb
- type: FoldableClothing
foldedEquippedPrefix: flipped
foldedHeldPrefix: flipped
- type: Sprite
layers:
- state: icon
map: [ "unfoldedLayer" ]
- state: icon_flipped
map: ["foldedLayer"]
visible: false
- type: entity
parent: ClothingHeadHeadHatBaseFlippable
id: ClothingHeadHeadHatBaseFlipped
suffix: flipped
abstract: true
components:
- type: Foldable
folded: true
- type: Clothing
equippedPrefix: flipped
- type: Item
heldPrefix: flipped
- type: Sprite
layers:
- state: icon
map: [ "unfoldedLayer" ]
visible: false
- state: icon_flipped
map: ["foldedLayer"]
visible: true
- type: entity
parent: ClothingHeadHeadHatBaseFlippable
id: ClothingHeadHatBluesoft
name: blue cap
description: "It's a baseball hat in a tasteless blue colour."
@@ -10,18 +52,12 @@
sprite: Clothing/Head/Soft/bluesoft.rsi
- type: entity
parent: ClothingHeadBaseButcherable
parent: [ClothingHeadHeadHatBaseFlipped, ClothingHeadHatBluesoft]
id: ClothingHeadHatBluesoftFlipped
name: blue cap flipped
description: "It's a baseball hat in a tasteless blue colour. Flipped."
components:
- type: Sprite
sprite: Clothing/Head/Soft/bluesoft_flipped.rsi
- type: Clothing
sprite: Clothing/Head/Soft/bluesoft_flipped.rsi
name: blue cap
- type: entity
parent: ClothingHeadBaseButcherable
parent: ClothingHeadHeadHatBaseFlippable
id: ClothingHeadHatCargosoft
name: cargo cap
description: "It's a baseball hat painted in Cargo colours."
@@ -37,18 +73,18 @@
- WhitelistChameleon
- type: entity
parent: ClothingHeadBaseButcherable
parent: [ClothingHeadHeadHatBaseFlipped, ClothingHeadHatCargosoft]
id: ClothingHeadHatCargosoftFlipped
name: cargo cap flipped
description: "It's a baseball hat painted in Cargo colours. Flipped."
name: cargo cap
components:
- type: Sprite
sprite: Clothing/Head/Soft/cargosoft_flipped.rsi
- type: Clothing
sprite: Clothing/Head/Soft/cargosoft_flipped.rsi
- type: Tag
tags:
- ClothMade
- HamsterWearable
- WhitelistChameleon
- type: entity
parent: ClothingHeadBaseButcherable
parent: ClothingHeadHeadHatBaseFlippable
id: ClothingHeadHatQMsoft
name: quartermaster's cap
description: "It's a baseball hat painted in the Quartermaster's colors."
@@ -59,18 +95,12 @@
sprite: Clothing/Head/Soft/qmsoft.rsi
- type: entity
parent: ClothingHeadBaseButcherable
parent: [ClothingHeadHeadHatBaseFlipped, ClothingHeadHatQMsoft]
id: ClothingHeadHatQMsoftFlipped
name: quartermaster's cap flipped
description: "It's a baseball hat painted in the Quartermaster's colors. Flipped."
components:
- type: Sprite
sprite: Clothing/Head/Soft/qmsoft_flipped.rsi
- type: Clothing
sprite: Clothing/Head/Soft/qmsoft_flipped.rsi
name: quartermaster's cap
- type: entity
parent: ClothingHeadBaseButcherable
parent: ClothingHeadHeadHatBaseFlippable
id: ClothingHeadHatCorpsoft
name: corporate cap
description: A baseball bat in corporation colors.
@@ -81,18 +111,12 @@
sprite: Clothing/Head/Soft/corpsoft.rsi
- type: entity
parent: ClothingHeadBaseButcherable
parent: [ClothingHeadHeadHatBaseFlipped, ClothingHeadHatCorpsoft]
id: ClothingHeadHatCorpsoftFlipped
name: corporate cap flipped
description: A baseball bat in corporation colors. Flipped.
components:
- type: Sprite
sprite: Clothing/Head/Soft/corpsoft_flipped.rsi
- type: Clothing
sprite: Clothing/Head/Soft/corpsoft_flipped.rsi
name: corporate cap
- type: entity
parent: ClothingHeadBaseButcherable
parent: ClothingHeadHeadHatBaseFlippable
id: ClothingHeadHatGreensoft
name: green cap
description: "It's a baseball hat in a tasteless green colour."
@@ -103,18 +127,12 @@
sprite: Clothing/Head/Soft/greensoft.rsi
- type: entity
parent: ClothingHeadBaseButcherable
parent: [ClothingHeadHeadHatBaseFlipped, ClothingHeadHatGreensoft]
id: ClothingHeadHatGreensoftFlipped
name: green cap flipped
description: "It's a baseball hat in a tasteless green colour. Flipped."
components:
- type: Sprite
sprite: Clothing/Head/Soft/greensoft_flipped.rsi
- type: Clothing
sprite: Clothing/Head/Soft/greensoft_flipped.rsi
name: green cap
- type: entity
parent: ClothingHeadBaseButcherable
parent: ClothingHeadHeadHatBaseFlippable
id: ClothingHeadHatBlacksoft
name: black cap
description: "It's a baseball hat in a tasteless black colour."
@@ -125,18 +143,12 @@
sprite: Clothing/Head/Soft/blacksoft.rsi
- type: entity
parent: ClothingHeadBaseButcherable
parent: [ClothingHeadHeadHatBaseFlipped, ClothingHeadHatBlacksoft]
id: ClothingHeadHatBlacksoftFlipped
name: black cap flipped
description: "It's a baseball hat in a tasteless black colour. Flipped."
components:
- type: Sprite
sprite: Clothing/Head/Soft/blacksoft_flipped.rsi
- type: Clothing
sprite: Clothing/Head/Soft/blacksoft_flipped.rsi
name: black cap
- type: entity
parent: ClothingHeadBaseButcherable
parent: ClothingHeadHeadHatBaseFlippable
id: ClothingHeadHatGreysoft
name: grey cap
description: "It's a baseball hat in a tasteless grey colour."
@@ -147,18 +159,12 @@
sprite: Clothing/Head/Soft/greysoft.rsi
- type: entity
parent: ClothingHeadBaseButcherable
parent: [ClothingHeadHeadHatBaseFlipped, ClothingHeadHatGreysoft]
id: ClothingHeadHatGreysoftFlipped
name: grey cap flipped
description: "It's a baseball hat in a tasteless grey colour. Flipped."
components:
- type: Sprite
sprite: Clothing/Head/Soft/greysoft_flipped.rsi
- type: Clothing
sprite: Clothing/Head/Soft/greysoft_flipped.rsi
name: grey cap
- type: entity
parent: ClothingHeadBaseButcherable
parent: ClothingHeadHeadHatBaseFlippable
id: ClothingHeadHatMimesoft
name: mime cap
description: "It's a baseball hat in a tasteless white colour."
@@ -169,18 +175,12 @@
sprite: Clothing/Head/Soft/mimesoft.rsi
- type: entity
parent: ClothingHeadBaseButcherable
parent: [ClothingHeadHeadHatBaseFlipped, ClothingHeadHatMimesoft]
id: ClothingHeadHatMimesoftFlipped
name: mime cap flipped
description: It's a baseball hat in a tasteless white colour. Flipped.
components:
- type: Sprite
sprite: Clothing/Head/Soft/mimesoft_flipped.rsi
- type: Clothing
sprite: Clothing/Head/Soft/mimesoft_flipped.rsi
name: mime cap
- type: entity
parent: ClothingHeadBaseButcherable
parent: ClothingHeadHeadHatBaseFlippable
id: ClothingHeadHatOrangesoft
name: orange cap
description: It's a baseball hat in a good-looking orange colour.
@@ -191,18 +191,12 @@
sprite: Clothing/Head/Soft/orangesoft.rsi
- type: entity
parent: ClothingHeadBaseButcherable
parent: [ClothingHeadHeadHatBaseFlipped, ClothingHeadHatOrangesoft]
id: ClothingHeadHatOrangesoftFlipped
name: orange cap flipped
description: It's a baseball hat in a good-looking orange colour. Flipped.
components:
- type: Sprite
sprite: Clothing/Head/Soft/orangesoft_flipped.rsi
- type: Clothing
sprite: Clothing/Head/Soft/orangesoft_flipped.rsi
name: orange cap
- type: entity
parent: ClothingHeadBaseButcherable
parent: ClothingHeadHeadHatBaseFlippable
id: ClothingHeadHatPurplesoft
name: purple cap
description: It's a baseball hat in a tasteless purple colour.
@@ -218,18 +212,18 @@
- WhitelistChameleon
- type: entity
parent: ClothingHeadBaseButcherable
parent: [ClothingHeadHeadHatBaseFlipped, ClothingHeadHatPurplesoft]
id: ClothingHeadHatPurplesoftFlipped
name: purple cap flipped
description: It's a baseball hat in a tasteless purple colour. Flipped.
name: purple cap
components:
- type: Sprite
sprite: Clothing/Head/Soft/purplesoft_flipped.rsi
- type: Clothing
sprite: Clothing/Head/Soft/purplesoft_flipped.rsi
- type: Tag
tags:
- ClothMade
- HamsterWearable
- WhitelistChameleon
- type: entity
parent: ClothingHeadBaseButcherable
parent: ClothingHeadHeadHatBaseFlippable
id: ClothingHeadHatRedsoft
name: red cap
description: It's a baseball hat in a tasteless red colour.
@@ -240,18 +234,12 @@
sprite: Clothing/Head/Soft/redsoft.rsi
- type: entity
parent: ClothingHeadBaseButcherable
parent: [ClothingHeadHeadHatBaseFlipped, ClothingHeadHatRedsoft]
id: ClothingHeadHatRedsoftFlipped
name: red cap flipped
description: It's a baseball hat in a tasteless purple colour. Flipped.
components:
- type: Sprite
sprite: Clothing/Head/Soft/redsoft_flipped.rsi
- type: Clothing
sprite: Clothing/Head/Soft/redsoft_flipped.rsi
name: red cap
- type: entity
parent: ClothingHeadBaseButcherable
parent: ClothingHeadHeadHatBaseFlippable
id: ClothingHeadHatSecsoft
name: security cap
description: It's a robust baseball hat in tasteful red colour.
@@ -262,18 +250,12 @@
sprite: Clothing/Head/Soft/secsoft.rsi
- type: entity
parent: ClothingHeadBaseButcherable
parent: [ClothingHeadHeadHatBaseFlipped, ClothingHeadHatSecsoft]
id: ClothingHeadHatSecsoftFlipped
name: security cap flipped
description: It's a robust baseball hat in tasteful red colour. Flipped.
components:
- type: Sprite
sprite: Clothing/Head/Soft/secsoft_flipped.rsi
- type: Clothing
sprite: Clothing/Head/Soft/secsoft_flipped.rsi
name: security cap
- type: entity
parent: ClothingHeadBaseButcherable
parent: ClothingHeadHeadHatBaseFlippable
id: ClothingHeadHatYellowsoft
name: yellow cap
description: A yellow baseball hat.
@@ -284,20 +266,14 @@
sprite: Clothing/Head/Soft/yellowsoft.rsi
- type: entity
parent: ClothingHeadBaseButcherable
parent: [ClothingHeadHeadHatBaseFlipped, ClothingHeadHatYellowsoft]
id: ClothingHeadHatYellowsoftFlipped
name: yellow cap flipped
description: A yellow flipped baseball hat.
components:
- type: Sprite
sprite: Clothing/Head/Soft/yellowsoft_flipped.rsi
- type: Clothing
sprite: Clothing/Head/Soft/yellowsoft_flipped.rsi
name: yellow cap
- type: entity
parent: ClothingHeadBaseButcherable
parent: ClothingHeadHeadHatBaseFlippable
id: ClothingHeadHatBizarreSoft
name: troublemaker's soft
name: troublemaker's cap
description: A truly.. bizarre accessory.
components:
- type: Sprite
@@ -306,18 +282,12 @@
sprite: Clothing/Head/Soft/bizarresoft.rsi
- type: entity
parent: ClothingHeadBaseButcherable
parent: [ClothingHeadHeadHatBaseFlipped, ClothingHeadHatBizarreSoft]
id: ClothingHeadHatBizarreSoftFlipped
name: troublemaker's soft flipped
description: A truly.. bizarre accessory, flipped.
components:
- type: Sprite
sprite: Clothing/Head/Soft/bizarresoft_flipped.rsi
- type: Clothing
sprite: Clothing/Head/Soft/bizarresoft_flipped.rsi
name: troublemaker's cap
- type: entity
parent: ClothingHeadBaseButcherable
parent: ClothingHeadHeadHatBaseFlippable
id: ClothingHeadHatParamedicsoft
name: paramedic cap
description: "It's a paramedic's baseball hat with a medical logo."
@@ -333,12 +303,12 @@
- WhitelistChameleon
- type: entity
parent: ClothingHeadBaseButcherable
parent: [ClothingHeadHeadHatBaseFlipped, ClothingHeadHatParamedicsoft]
id: ClothingHeadHatParamedicsoftFlipped
name: paramedic cap flipped
description: "It's a paramedic's baseball hat with a medical logo. Flipped."
name: paramedic cap
components:
- type: Sprite
sprite: Clothing/Head/Soft/paramedicsoft_flipped.rsi
- type: Clothing
sprite: Clothing/Head/Soft/paramedicsoft_flipped.rsi
- type: Tag
tags:
- ClothMade
- HamsterWearable
- WhitelistChameleon

View File

@@ -10,6 +10,9 @@
{
"name": "icon"
},
{
"name": "icon_flipped"
},
{
"name": "equipped-HELMET",
"directions": 4
@@ -21,6 +24,18 @@
{
"name": "inhand-right",
"directions": 4
},
{
"name": "flipped-equipped-HELMET",
"directions": 4
},
{
"name": "flipped-inhand-left",
"directions": 4
},
{
"name": "flipped-inhand-right",
"directions": 4
}
]
}

View File

@@ -1,26 +0,0 @@
{
"version": 1,
"license": "CC-BY-NC-SA-3.0",
"copyright": "Taken from civstation at commit https://github.com/Civ13/Civ13/commit/ec52cbb95d59b717d4d8c480b35ac133e5b58088#diff-fba188fb2db5d16e5d41985147336a8f96085f761b903e016fffd869b63e497d",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-HELMET",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}

View File

@@ -10,6 +10,9 @@
{
"name": "icon"
},
{
"name": "icon_flipped"
},
{
"name": "equipped-HELMET",
"directions": 4
@@ -21,6 +24,18 @@
{
"name": "inhand-right",
"directions": 4
},
{
"name": "flipped-equipped-HELMET",
"directions": 4
},
{
"name": "flipped-inhand-left",
"directions": 4
},
{
"name": "flipped-inhand-right",
"directions": 4
}
]
}

View File

@@ -1,26 +0,0 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-HELMET",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}

View File

Before

Width:  |  Height:  |  Size: 390 B

After

Width:  |  Height:  |  Size: 390 B

View File

@@ -10,6 +10,9 @@
{
"name": "icon"
},
{
"name": "icon_flipped"
},
{
"name": "equipped-HELMET",
"directions": 4
@@ -21,6 +24,18 @@
{
"name": "inhand-right",
"directions": 4
},
{
"name": "flipped-equipped-HELMET",
"directions": 4
},
{
"name": "flipped-inhand-left",
"directions": 4
},
{
"name": "flipped-inhand-right",
"directions": 4
}
]
}

View File

@@ -1,26 +0,0 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-HELMET",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 375 B

View File

@@ -10,21 +10,40 @@
{
"name": "icon"
},
{
"name": "icon_flipped"
},
{
"name": "equipped-HELMET",
"directions": 4
},
{
"name": "flipped-equipped-HELMET",
"directions": 4
},
{
"name": "equipped-HELMET-hamster",
"directions": 4
},
{
"name": "flipped-equipped-HELMET-hamster",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "flipped-inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
},
{
"name": "flipped-inhand-right",
"directions": 4
}
]
}

View File

@@ -1,26 +0,0 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, repaletted for Space Station 14",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-HELMET",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}

View File

Before

Width:  |  Height:  |  Size: 424 B

After

Width:  |  Height:  |  Size: 424 B

View File

@@ -10,6 +10,9 @@
{
"name": "icon"
},
{
"name": "icon_flipped"
},
{
"name": "equipped-HELMET",
"directions": 4
@@ -21,6 +24,18 @@
{
"name": "inhand-right",
"directions": 4
},
{
"name": "flipped-equipped-HELMET",
"directions": 4
},
{
"name": "flipped-inhand-left",
"directions": 4
},
{
"name": "flipped-inhand-right",
"directions": 4
}
]
}

View File

@@ -1,26 +0,0 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-HELMET",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}

View File

@@ -10,6 +10,9 @@
{
"name": "icon"
},
{
"name": "icon_flipped"
},
{
"name": "equipped-HELMET",
"directions": 4
@@ -21,6 +24,18 @@
{
"name": "inhand-right",
"directions": 4
},
{
"name": "flipped-equipped-HELMET",
"directions": 4
},
{
"name": "flipped-inhand-left",
"directions": 4
},
{
"name": "flipped-inhand-right",
"directions": 4
}
]
}

View File

@@ -1,26 +0,0 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-HELMET",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}

View File

Before

Width:  |  Height:  |  Size: 365 B

After

Width:  |  Height:  |  Size: 365 B

View File

@@ -10,6 +10,9 @@
{
"name": "icon"
},
{
"name": "icon_flipped"
},
{
"name": "equipped-HELMET",
"directions": 4
@@ -21,6 +24,18 @@
{
"name": "inhand-right",
"directions": 4
},
{
"name": "flipped-equipped-HELMET",
"directions": 4
},
{
"name": "flipped-inhand-left",
"directions": 4
},
{
"name": "flipped-inhand-right",
"directions": 4
}
]
}

View File

@@ -1,26 +0,0 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-HELMET",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}

View File

Before

Width:  |  Height:  |  Size: 217 B

After

Width:  |  Height:  |  Size: 217 B

View File

@@ -10,6 +10,9 @@
{
"name": "icon"
},
{
"name": "icon_flipped"
},
{
"name": "equipped-HELMET",
"directions": 4
@@ -21,6 +24,18 @@
{
"name": "inhand-right",
"directions": 4
},
{
"name": "flipped-equipped-HELMET",
"directions": 4
},
{
"name": "flipped-inhand-left",
"directions": 4
},
{
"name": "flipped-inhand-right",
"directions": 4
}
]
}

View File

@@ -1,26 +0,0 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-HELMET",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}

View File

@@ -10,6 +10,9 @@
{
"name": "icon"
},
{
"name": "icon_flipped"
},
{
"name": "equipped-HELMET",
"directions": 4
@@ -21,6 +24,18 @@
{
"name": "inhand-right",
"directions": 4
},
{
"name": "flipped-equipped-HELMET",
"directions": 4
},
{
"name": "flipped-inhand-left",
"directions": 4
},
{
"name": "flipped-inhand-right",
"directions": 4
}
]
}

View File

@@ -1,26 +0,0 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-HELMET",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 388 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 399 B

View File

@@ -10,21 +10,40 @@
{
"name": "icon"
},
{
"name": "icon_flipped"
},
{
"name": "equipped-HELMET",
"directions": 4
},
{
"name": "flipped-equipped-HELMET",
"directions": 4
},
{
"name": "equipped-HELMET-hamster",
"directions": 4
},
{
"name": "flipped-equipped-HELMET-hamster",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "flipped-inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
},
{
"name": "flipped-inhand-right",
"directions": 4
}
]
}

View File

@@ -1,26 +0,0 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Made by MagnusCrowe (Github) for SS14",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-HELMET",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 406 B

View File

@@ -10,21 +10,40 @@
{
"name": "icon"
},
{
"name": "icon_flipped"
},
{
"name": "equipped-HELMET",
"directions": 4
},
{
"name": "flipped-equipped-HELMET",
"directions": 4
},
{
"name": "equipped-HELMET-hamster",
"directions": 4
},
{
"name": "flipped-equipped-HELMET-hamster",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "flipped-inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
},
{
"name": "flipped-inhand-right",
"directions": 4
}
]
}

View File

@@ -1,26 +0,0 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-HELMET",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}

View File

Before

Width:  |  Height:  |  Size: 258 B

After

Width:  |  Height:  |  Size: 258 B

View File

@@ -10,6 +10,9 @@
{
"name": "icon"
},
{
"name": "icon_flipped"
},
{
"name": "equipped-HELMET",
"directions": 4
@@ -21,6 +24,18 @@
{
"name": "inhand-right",
"directions": 4
},
{
"name": "flipped-equipped-HELMET",
"directions": 4
},
{
"name": "flipped-inhand-left",
"directions": 4
},
{
"name": "flipped-inhand-right",
"directions": 4
}
]
}

View File

@@ -1,26 +0,0 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-HELMET",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}

View File

Before

Width:  |  Height:  |  Size: 402 B

After

Width:  |  Height:  |  Size: 402 B

View File

@@ -10,6 +10,9 @@
{
"name": "icon"
},
{
"name": "icon_flipped"
},
{
"name": "equipped-HELMET",
"directions": 4
@@ -21,6 +24,18 @@
{
"name": "inhand-right",
"directions": 4
},
{
"name": "flipped-equipped-HELMET",
"directions": 4
},
{
"name": "flipped-inhand-left",
"directions": 4
},
{
"name": "flipped-inhand-right",
"directions": 4
}
]
}

View File

@@ -1,26 +0,0 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-HELMET",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}

View File

Before

Width:  |  Height:  |  Size: 402 B

After

Width:  |  Height:  |  Size: 402 B

View File

@@ -10,6 +10,9 @@
{
"name": "icon"
},
{
"name": "icon_flipped"
},
{
"name": "equipped-HELMET",
"directions": 4
@@ -21,6 +24,18 @@
{
"name": "inhand-right",
"directions": 4
},
{
"name": "flipped-equipped-HELMET",
"directions": 4
},
{
"name": "flipped-inhand-left",
"directions": 4
},
{
"name": "flipped-inhand-right",
"directions": 4
}
]
}

View File

@@ -1,26 +0,0 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-HELMET",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}

View File

@@ -10,6 +10,9 @@
{
"name": "icon"
},
{
"name": "icon_flipped"
},
{
"name": "equipped-HELMET",
"directions": 4
@@ -21,6 +24,18 @@
{
"name": "inhand-right",
"directions": 4
},
{
"name": "flipped-equipped-HELMET",
"directions": 4
},
{
"name": "flipped-inhand-left",
"directions": 4
},
{
"name": "flipped-inhand-right",
"directions": 4
}
]
}

View File

@@ -1,26 +0,0 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-HELMET",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}