From f7a3ea6dcfb0f43b136cef74ea7115bec63cbfd3 Mon Sep 17 00:00:00 2001
From: themias <89101928+themias@users.noreply.github.com>
Date: Sat, 10 Feb 2024 03:44:19 -0500
Subject: [PATCH] Flipped caps real (#24961)
* Flipped caps real
* oops
* whoops
* flip not fold
* fix formatting
* cargosoft formatting
---
.../Components/FoldableClothingComponent.cs | 13 +
.../EntitySystems/FoldableClothingSystem.cs | 32 ++-
Content.Shared/Foldable/FoldableComponent.cs | 6 +
Content.Shared/Foldable/FoldableSystem.cs | 2 +-
.../components/foldable-component.ftl | 2 +
.../Entities/Clothing/Head/soft.yml | 236 ++++++++----------
.../flipped-equipped-HELMET.png} | Bin
.../flipped-inhand-left.png} | Bin
.../flipped-inhand-right.png} | Bin
.../icon_flipped.png} | Bin
.../Head/Soft/bizarresoft.rsi/meta.json | 15 ++
.../Soft/bizarresoft_flipped.rsi/meta.json | 26 --
.../flipped-equipped-HELMET.png} | Bin
.../flipped-inhand-left.png} | Bin
.../flipped-inhand-right.png} | Bin
.../icon_flipped.png} | Bin
.../Head/Soft/blacksoft.rsi/meta.json | 15 ++
.../Head/Soft/blacksoft_flipped.rsi/meta.json | 26 --
.../flipped-equipped-HELMET.png} | Bin
.../flipped-inhand-left.png} | Bin
.../flipped-inhand-right.png} | Bin
.../icon_flipped.png} | Bin
.../Clothing/Head/Soft/bluesoft.rsi/meta.json | 15 ++
.../Head/Soft/bluesoft_flipped.rsi/meta.json | 26 --
.../flipped-equipped-HELMET-hamster.png | Bin 0 -> 375 bytes
.../flipped-equipped-HELMET.png} | Bin
.../flipped-inhand-left.png} | Bin
.../flipped-inhand-right.png} | Bin
.../icon_flipped.png} | Bin
.../Head/Soft/cargosoft.rsi/meta.json | 19 ++
.../Head/Soft/cargosoft_flipped.rsi/meta.json | 26 --
.../flipped-equipped-HELMET.png} | Bin
.../flipped-inhand-left.png} | Bin
.../flipped-inhand-right.png} | Bin
.../icon_flipped.png} | Bin
.../Clothing/Head/Soft/corpsoft.rsi/meta.json | 15 ++
.../Head/Soft/corpsoft_flipped.rsi/meta.json | 26 --
.../flipped-equipped-HELMET.png} | Bin
.../flipped-inhand-left.png} | Bin
.../flipped-inhand-right.png} | Bin
.../icon_flipped.png} | Bin
.../Head/Soft/greensoft.rsi/meta.json | 15 ++
.../Head/Soft/greensoft_flipped.rsi/meta.json | 26 --
.../flipped-equipped-HELMET.png} | Bin
.../flipped-inhand-left.png} | Bin
.../flipped-inhand-right.png} | Bin
.../icon_flipped.png} | Bin
.../Clothing/Head/Soft/greysoft.rsi/meta.json | 15 ++
.../Head/Soft/greysoft_flipped.rsi/meta.json | 26 --
.../flipped-equipped-HELMET.png} | Bin
.../flipped-inhand-left.png} | Bin
.../flipped-inhand-right.png} | Bin
.../icon_flipped.png} | Bin
.../Clothing/Head/Soft/mimesoft.rsi/meta.json | 15 ++
.../Head/Soft/mimesoft_flipped.rsi/meta.json | 26 --
.../flipped-equipped-HELMET.png} | Bin
.../flipped-inhand-left.png} | Bin
.../flipped-inhand-right.png} | Bin
.../icon_flipped.png} | Bin
.../Head/Soft/orangesoft.rsi/meta.json | 15 ++
.../Soft/orangesoft_flipped.rsi/meta.json | 26 --
.../equipped-HELMET-hamster.png | Bin 20825 -> 388 bytes
.../flipped-equipped-HELMET-hamster.png | Bin 0 -> 399 bytes
.../flipped-equipped-HELMET.png} | Bin
.../flipped-inhand-left.png} | Bin
.../flipped-inhand-right.png} | Bin
.../icon_flipped.png} | Bin
.../Head/Soft/paramedicsoft.rsi/meta.json | 19 ++
.../Soft/paramedicsoft_flipped.rsi/meta.json | 26 --
.../flipped-equipped-HELMET-hamster.png | Bin 0 -> 406 bytes
.../flipped-equipped-HELMET.png} | Bin
.../flipped-inhand-left.png} | Bin
.../flipped-inhand-right.png} | Bin
.../icon_flipped.png} | Bin
.../Head/Soft/purplesoft.rsi/meta.json | 19 ++
.../Soft/purplesoft_flipped.rsi/meta.json | 26 --
.../flipped-equipped-HELMET.png} | Bin
.../flipped-inhand-left.png} | Bin
.../flipped-inhand-right.png} | Bin
.../icon.png => qmsoft.rsi/icon_flipped.png} | Bin
.../Clothing/Head/Soft/qmsoft.rsi/meta.json | 15 ++
.../Head/Soft/qmsoft_flipped.rsi/meta.json | 26 --
.../flipped-equipped-HELMET.png} | Bin
.../flipped-inhand-left.png} | Bin
.../flipped-inhand-right.png} | Bin
.../icon.png => redsoft.rsi/icon_flipped.png} | Bin
.../Clothing/Head/Soft/redsoft.rsi/meta.json | 15 ++
.../Head/Soft/redsoft_flipped.rsi/meta.json | 26 --
.../flipped-equipped-HELMET.png} | Bin
.../flipped-inhand-left.png} | Bin
.../flipped-inhand-right.png} | Bin
.../icon.png => secsoft.rsi/icon_flipped.png} | Bin
.../Clothing/Head/Soft/secsoft.rsi/meta.json | 15 ++
.../Head/Soft/secsoft_flipped.rsi/meta.json | 26 --
.../flipped-equipped-HELMET.png} | Bin
.../flipped-inhand-left.png} | Bin
.../flipped-inhand-right.png} | Bin
.../icon_flipped.png} | Bin
.../Head/Soft/yellowsoft.rsi/meta.json | 15 ++
.../Soft/yellowsoft_flipped.rsi/meta.json | 26 --
100 files changed, 389 insertions(+), 529 deletions(-)
rename Resources/Textures/Clothing/Head/Soft/{bizarresoft_flipped.rsi/equipped-HELMET.png => bizarresoft.rsi/flipped-equipped-HELMET.png} (100%)
rename Resources/Textures/Clothing/Head/Soft/{bizarresoft_flipped.rsi/inhand-left.png => bizarresoft.rsi/flipped-inhand-left.png} (100%)
rename Resources/Textures/Clothing/Head/Soft/{bizarresoft_flipped.rsi/inhand-right.png => bizarresoft.rsi/flipped-inhand-right.png} (100%)
rename Resources/Textures/Clothing/Head/Soft/{bizarresoft_flipped.rsi/icon.png => bizarresoft.rsi/icon_flipped.png} (100%)
delete mode 100644 Resources/Textures/Clothing/Head/Soft/bizarresoft_flipped.rsi/meta.json
rename Resources/Textures/Clothing/Head/Soft/{blacksoft_flipped.rsi/equipped-HELMET.png => blacksoft.rsi/flipped-equipped-HELMET.png} (100%)
rename Resources/Textures/Clothing/Head/Soft/{blacksoft_flipped.rsi/inhand-left.png => blacksoft.rsi/flipped-inhand-left.png} (100%)
rename Resources/Textures/Clothing/Head/Soft/{blacksoft_flipped.rsi/inhand-right.png => blacksoft.rsi/flipped-inhand-right.png} (100%)
rename Resources/Textures/Clothing/Head/Soft/{blacksoft_flipped.rsi/icon.png => blacksoft.rsi/icon_flipped.png} (100%)
delete mode 100644 Resources/Textures/Clothing/Head/Soft/blacksoft_flipped.rsi/meta.json
rename Resources/Textures/Clothing/Head/Soft/{bluesoft_flipped.rsi/equipped-HELMET.png => bluesoft.rsi/flipped-equipped-HELMET.png} (100%)
rename Resources/Textures/Clothing/Head/Soft/{bluesoft_flipped.rsi/inhand-left.png => bluesoft.rsi/flipped-inhand-left.png} (100%)
rename Resources/Textures/Clothing/Head/Soft/{bluesoft_flipped.rsi/inhand-right.png => bluesoft.rsi/flipped-inhand-right.png} (100%)
rename Resources/Textures/Clothing/Head/Soft/{bluesoft_flipped.rsi/icon.png => bluesoft.rsi/icon_flipped.png} (100%)
delete mode 100644 Resources/Textures/Clothing/Head/Soft/bluesoft_flipped.rsi/meta.json
create mode 100644 Resources/Textures/Clothing/Head/Soft/cargosoft.rsi/flipped-equipped-HELMET-hamster.png
rename Resources/Textures/Clothing/Head/Soft/{cargosoft_flipped.rsi/equipped-HELMET.png => cargosoft.rsi/flipped-equipped-HELMET.png} (100%)
rename Resources/Textures/Clothing/Head/Soft/{cargosoft_flipped.rsi/inhand-left.png => cargosoft.rsi/flipped-inhand-left.png} (100%)
rename Resources/Textures/Clothing/Head/Soft/{cargosoft_flipped.rsi/inhand-right.png => cargosoft.rsi/flipped-inhand-right.png} (100%)
rename Resources/Textures/Clothing/Head/Soft/{cargosoft_flipped.rsi/icon.png => cargosoft.rsi/icon_flipped.png} (100%)
delete mode 100644 Resources/Textures/Clothing/Head/Soft/cargosoft_flipped.rsi/meta.json
rename Resources/Textures/Clothing/Head/Soft/{corpsoft_flipped.rsi/equipped-HELMET.png => corpsoft.rsi/flipped-equipped-HELMET.png} (100%)
rename Resources/Textures/Clothing/Head/Soft/{corpsoft_flipped.rsi/inhand-left.png => corpsoft.rsi/flipped-inhand-left.png} (100%)
rename Resources/Textures/Clothing/Head/Soft/{corpsoft_flipped.rsi/inhand-right.png => corpsoft.rsi/flipped-inhand-right.png} (100%)
rename Resources/Textures/Clothing/Head/Soft/{corpsoft_flipped.rsi/icon.png => corpsoft.rsi/icon_flipped.png} (100%)
delete mode 100644 Resources/Textures/Clothing/Head/Soft/corpsoft_flipped.rsi/meta.json
rename Resources/Textures/Clothing/Head/Soft/{greensoft_flipped.rsi/equipped-HELMET.png => greensoft.rsi/flipped-equipped-HELMET.png} (100%)
rename Resources/Textures/Clothing/Head/Soft/{greensoft_flipped.rsi/inhand-left.png => greensoft.rsi/flipped-inhand-left.png} (100%)
rename Resources/Textures/Clothing/Head/Soft/{greensoft_flipped.rsi/inhand-right.png => greensoft.rsi/flipped-inhand-right.png} (100%)
rename Resources/Textures/Clothing/Head/Soft/{greensoft_flipped.rsi/icon.png => greensoft.rsi/icon_flipped.png} (100%)
delete mode 100644 Resources/Textures/Clothing/Head/Soft/greensoft_flipped.rsi/meta.json
rename Resources/Textures/Clothing/Head/Soft/{greysoft_flipped.rsi/equipped-HELMET.png => greysoft.rsi/flipped-equipped-HELMET.png} (100%)
rename Resources/Textures/Clothing/Head/Soft/{greysoft_flipped.rsi/inhand-left.png => greysoft.rsi/flipped-inhand-left.png} (100%)
rename Resources/Textures/Clothing/Head/Soft/{greysoft_flipped.rsi/inhand-right.png => greysoft.rsi/flipped-inhand-right.png} (100%)
rename Resources/Textures/Clothing/Head/Soft/{greysoft_flipped.rsi/icon.png => greysoft.rsi/icon_flipped.png} (100%)
delete mode 100644 Resources/Textures/Clothing/Head/Soft/greysoft_flipped.rsi/meta.json
rename Resources/Textures/Clothing/Head/Soft/{mimesoft_flipped.rsi/equipped-HELMET.png => mimesoft.rsi/flipped-equipped-HELMET.png} (100%)
rename Resources/Textures/Clothing/Head/Soft/{mimesoft_flipped.rsi/inhand-left.png => mimesoft.rsi/flipped-inhand-left.png} (100%)
rename Resources/Textures/Clothing/Head/Soft/{mimesoft_flipped.rsi/inhand-right.png => mimesoft.rsi/flipped-inhand-right.png} (100%)
rename Resources/Textures/Clothing/Head/Soft/{mimesoft_flipped.rsi/icon.png => mimesoft.rsi/icon_flipped.png} (100%)
delete mode 100644 Resources/Textures/Clothing/Head/Soft/mimesoft_flipped.rsi/meta.json
rename Resources/Textures/Clothing/Head/Soft/{orangesoft_flipped.rsi/equipped-HELMET.png => orangesoft.rsi/flipped-equipped-HELMET.png} (100%)
rename Resources/Textures/Clothing/Head/Soft/{orangesoft_flipped.rsi/inhand-left.png => orangesoft.rsi/flipped-inhand-left.png} (100%)
rename Resources/Textures/Clothing/Head/Soft/{orangesoft_flipped.rsi/inhand-right.png => orangesoft.rsi/flipped-inhand-right.png} (100%)
rename Resources/Textures/Clothing/Head/Soft/{orangesoft_flipped.rsi/icon.png => orangesoft.rsi/icon_flipped.png} (100%)
delete mode 100644 Resources/Textures/Clothing/Head/Soft/orangesoft_flipped.rsi/meta.json
create mode 100644 Resources/Textures/Clothing/Head/Soft/paramedicsoft.rsi/flipped-equipped-HELMET-hamster.png
rename Resources/Textures/Clothing/Head/Soft/{paramedicsoft_flipped.rsi/equipped-HELMET.png => paramedicsoft.rsi/flipped-equipped-HELMET.png} (100%)
rename Resources/Textures/Clothing/Head/Soft/{paramedicsoft_flipped.rsi/inhand-left.png => paramedicsoft.rsi/flipped-inhand-left.png} (100%)
rename Resources/Textures/Clothing/Head/Soft/{paramedicsoft_flipped.rsi/inhand-right.png => paramedicsoft.rsi/flipped-inhand-right.png} (100%)
rename Resources/Textures/Clothing/Head/Soft/{paramedicsoft_flipped.rsi/icon.png => paramedicsoft.rsi/icon_flipped.png} (100%)
delete mode 100644 Resources/Textures/Clothing/Head/Soft/paramedicsoft_flipped.rsi/meta.json
create mode 100644 Resources/Textures/Clothing/Head/Soft/purplesoft.rsi/flipped-equipped-HELMET-hamster.png
rename Resources/Textures/Clothing/Head/Soft/{purplesoft_flipped.rsi/equipped-HELMET.png => purplesoft.rsi/flipped-equipped-HELMET.png} (100%)
rename Resources/Textures/Clothing/Head/Soft/{purplesoft_flipped.rsi/inhand-left.png => purplesoft.rsi/flipped-inhand-left.png} (100%)
rename Resources/Textures/Clothing/Head/Soft/{purplesoft_flipped.rsi/inhand-right.png => purplesoft.rsi/flipped-inhand-right.png} (100%)
rename Resources/Textures/Clothing/Head/Soft/{purplesoft_flipped.rsi/icon.png => purplesoft.rsi/icon_flipped.png} (100%)
delete mode 100644 Resources/Textures/Clothing/Head/Soft/purplesoft_flipped.rsi/meta.json
rename Resources/Textures/Clothing/Head/Soft/{qmsoft_flipped.rsi/equipped-HELMET.png => qmsoft.rsi/flipped-equipped-HELMET.png} (100%)
rename Resources/Textures/Clothing/Head/Soft/{qmsoft_flipped.rsi/inhand-left.png => qmsoft.rsi/flipped-inhand-left.png} (100%)
rename Resources/Textures/Clothing/Head/Soft/{qmsoft_flipped.rsi/inhand-right.png => qmsoft.rsi/flipped-inhand-right.png} (100%)
rename Resources/Textures/Clothing/Head/Soft/{qmsoft_flipped.rsi/icon.png => qmsoft.rsi/icon_flipped.png} (100%)
delete mode 100644 Resources/Textures/Clothing/Head/Soft/qmsoft_flipped.rsi/meta.json
rename Resources/Textures/Clothing/Head/Soft/{redsoft_flipped.rsi/equipped-HELMET.png => redsoft.rsi/flipped-equipped-HELMET.png} (100%)
rename Resources/Textures/Clothing/Head/Soft/{redsoft_flipped.rsi/inhand-left.png => redsoft.rsi/flipped-inhand-left.png} (100%)
rename Resources/Textures/Clothing/Head/Soft/{redsoft_flipped.rsi/inhand-right.png => redsoft.rsi/flipped-inhand-right.png} (100%)
rename Resources/Textures/Clothing/Head/Soft/{redsoft_flipped.rsi/icon.png => redsoft.rsi/icon_flipped.png} (100%)
delete mode 100644 Resources/Textures/Clothing/Head/Soft/redsoft_flipped.rsi/meta.json
rename Resources/Textures/Clothing/Head/Soft/{secsoft_flipped.rsi/equipped-HELMET.png => secsoft.rsi/flipped-equipped-HELMET.png} (100%)
rename Resources/Textures/Clothing/Head/Soft/{secsoft_flipped.rsi/inhand-left.png => secsoft.rsi/flipped-inhand-left.png} (100%)
rename Resources/Textures/Clothing/Head/Soft/{secsoft_flipped.rsi/inhand-right.png => secsoft.rsi/flipped-inhand-right.png} (100%)
rename Resources/Textures/Clothing/Head/Soft/{secsoft_flipped.rsi/icon.png => secsoft.rsi/icon_flipped.png} (100%)
delete mode 100644 Resources/Textures/Clothing/Head/Soft/secsoft_flipped.rsi/meta.json
rename Resources/Textures/Clothing/Head/Soft/{yellowsoft_flipped.rsi/equipped-HELMET.png => yellowsoft.rsi/flipped-equipped-HELMET.png} (100%)
rename Resources/Textures/Clothing/Head/Soft/{yellowsoft_flipped.rsi/inhand-left.png => yellowsoft.rsi/flipped-inhand-left.png} (100%)
rename Resources/Textures/Clothing/Head/Soft/{yellowsoft_flipped.rsi/inhand-right.png => yellowsoft.rsi/flipped-inhand-right.png} (100%)
rename Resources/Textures/Clothing/Head/Soft/{yellowsoft_flipped.rsi/icon.png => yellowsoft.rsi/icon_flipped.png} (100%)
delete mode 100644 Resources/Textures/Clothing/Head/Soft/yellowsoft_flipped.rsi/meta.json
diff --git a/Content.Shared/Clothing/Components/FoldableClothingComponent.cs b/Content.Shared/Clothing/Components/FoldableClothingComponent.cs
index 61237b2283..1a40d1dca1 100644
--- a/Content.Shared/Clothing/Components/FoldableClothingComponent.cs
+++ b/Content.Shared/Clothing/Components/FoldableClothingComponent.cs
@@ -17,4 +17,17 @@ public sealed partial class FoldableClothingComponent : Component
///
[DataField]
public SlotFlags? UnfoldedSlots;
+
+
+ ///
+ /// What equipped prefix does this have while in folded form?
+ ///
+ [DataField]
+ public string? FoldedEquippedPrefix;
+
+ ///
+ /// What held prefix does this have while in folded form?
+ ///
+ [DataField]
+ public string? FoldedHeldPrefix;
}
diff --git a/Content.Shared/Clothing/EntitySystems/FoldableClothingSystem.cs b/Content.Shared/Clothing/EntitySystems/FoldableClothingSystem.cs
index d0611c5851..27ea168018 100644
--- a/Content.Shared/Clothing/EntitySystems/FoldableClothingSystem.cs
+++ b/Content.Shared/Clothing/EntitySystems/FoldableClothingSystem.cs
@@ -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 ent, ref FoldedEvent args)
{
- if (TryComp(ent.Owner, out var clothingComp))
+ if (TryComp(ent.Owner, out var clothingComp) &&
+ TryComp(ent.Owner, out var itemComp))
{
- if (args.IsFolded && ent.Comp.FoldedSlots.HasValue)
- _clothingSystem.SetSlots(ent.Owner, ent.Comp.FoldedSlots.Value, clothingComp);
- else if (!args.IsFolded && ent.Comp.UnfoldedSlots.HasValue)
- _clothingSystem.SetSlots(ent.Owner, ent.Comp.UnfoldedSlots.Value, clothingComp);
+ if (args.IsFolded)
+ {
+ if (ent.Comp.FoldedSlots.HasValue)
+ _clothingSystem.SetSlots(ent.Owner, ent.Comp.FoldedSlots.Value, clothingComp);
+
+ 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);
+
+ }
}
}
}
diff --git a/Content.Shared/Foldable/FoldableComponent.cs b/Content.Shared/Foldable/FoldableComponent.cs
index c22095f3f2..74f6a20913 100644
--- a/Content.Shared/Foldable/FoldableComponent.cs
+++ b/Content.Shared/Foldable/FoldableComponent.cs
@@ -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";
}
diff --git a/Content.Shared/Foldable/FoldableSystem.cs b/Content.Shared/Foldable/FoldableSystem.cs
index 374aba44c5..10baf8165b 100644
--- a/Content.Shared/Foldable/FoldableSystem.cs
+++ b/Content.Shared/Foldable/FoldableSystem.cs
@@ -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
diff --git a/Resources/Locale/en-US/foldable/components/foldable-component.ftl b/Resources/Locale/en-US/foldable/components/foldable-component.ftl
index d3e4ecefb5..539b4fd9e7 100644
--- a/Resources/Locale/en-US/foldable/components/foldable-component.ftl
+++ b/Resources/Locale/en-US/foldable/components/foldable-component.ftl
@@ -3,3 +3,5 @@
foldable-deploy-fail = You can't deploy the {$object} here.
fold-verb = Fold
unfold-verb = Unfold
+
+fold-flip-verb = Flip
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Clothing/Head/soft.yml b/Resources/Prototypes/Entities/Clothing/Head/soft.yml
index 50be724c41..d063b8e853 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/soft.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/soft.yml
@@ -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
diff --git a/Resources/Textures/Clothing/Head/Soft/bizarresoft_flipped.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Soft/bizarresoft.rsi/flipped-equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/bizarresoft_flipped.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Soft/bizarresoft.rsi/flipped-equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/Soft/bizarresoft_flipped.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Soft/bizarresoft.rsi/flipped-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/bizarresoft_flipped.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Soft/bizarresoft.rsi/flipped-inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/Soft/bizarresoft_flipped.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Soft/bizarresoft.rsi/flipped-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/bizarresoft_flipped.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Soft/bizarresoft.rsi/flipped-inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Soft/bizarresoft_flipped.rsi/icon.png b/Resources/Textures/Clothing/Head/Soft/bizarresoft.rsi/icon_flipped.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/bizarresoft_flipped.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Soft/bizarresoft.rsi/icon_flipped.png
diff --git a/Resources/Textures/Clothing/Head/Soft/bizarresoft.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/bizarresoft.rsi/meta.json
index b3513bb5cd..adf7e7620a 100644
--- a/Resources/Textures/Clothing/Head/Soft/bizarresoft.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Soft/bizarresoft.rsi/meta.json
@@ -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
}
]
}
diff --git a/Resources/Textures/Clothing/Head/Soft/bizarresoft_flipped.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/bizarresoft_flipped.rsi/meta.json
deleted file mode 100644
index b3513bb5cd..0000000000
--- a/Resources/Textures/Clothing/Head/Soft/bizarresoft_flipped.rsi/meta.json
+++ /dev/null
@@ -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
- }
- ]
-}
diff --git a/Resources/Textures/Clothing/Head/Soft/blacksoft_flipped.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Soft/blacksoft.rsi/flipped-equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/blacksoft_flipped.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Soft/blacksoft.rsi/flipped-equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/Soft/blacksoft_flipped.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Soft/blacksoft.rsi/flipped-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/blacksoft_flipped.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Soft/blacksoft.rsi/flipped-inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/Soft/blacksoft_flipped.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Soft/blacksoft.rsi/flipped-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/blacksoft_flipped.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Soft/blacksoft.rsi/flipped-inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Soft/blacksoft_flipped.rsi/icon.png b/Resources/Textures/Clothing/Head/Soft/blacksoft.rsi/icon_flipped.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/blacksoft_flipped.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Soft/blacksoft.rsi/icon_flipped.png
diff --git a/Resources/Textures/Clothing/Head/Soft/blacksoft.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/blacksoft.rsi/meta.json
index a470e00944..a29360acd8 100644
--- a/Resources/Textures/Clothing/Head/Soft/blacksoft.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Soft/blacksoft.rsi/meta.json
@@ -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
}
]
}
diff --git a/Resources/Textures/Clothing/Head/Soft/blacksoft_flipped.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/blacksoft_flipped.rsi/meta.json
deleted file mode 100644
index a470e00944..0000000000
--- a/Resources/Textures/Clothing/Head/Soft/blacksoft_flipped.rsi/meta.json
+++ /dev/null
@@ -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
- }
- ]
-}
diff --git a/Resources/Textures/Clothing/Head/Soft/bluesoft_flipped.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Soft/bluesoft.rsi/flipped-equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/bluesoft_flipped.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Soft/bluesoft.rsi/flipped-equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/Soft/bluesoft_flipped.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Soft/bluesoft.rsi/flipped-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/bluesoft_flipped.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Soft/bluesoft.rsi/flipped-inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/Soft/bluesoft_flipped.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Soft/bluesoft.rsi/flipped-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/bluesoft_flipped.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Soft/bluesoft.rsi/flipped-inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Soft/bluesoft_flipped.rsi/icon.png b/Resources/Textures/Clothing/Head/Soft/bluesoft.rsi/icon_flipped.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/bluesoft_flipped.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Soft/bluesoft.rsi/icon_flipped.png
diff --git a/Resources/Textures/Clothing/Head/Soft/bluesoft.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/bluesoft.rsi/meta.json
index a470e00944..a29360acd8 100644
--- a/Resources/Textures/Clothing/Head/Soft/bluesoft.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Soft/bluesoft.rsi/meta.json
@@ -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
}
]
}
diff --git a/Resources/Textures/Clothing/Head/Soft/bluesoft_flipped.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/bluesoft_flipped.rsi/meta.json
deleted file mode 100644
index a470e00944..0000000000
--- a/Resources/Textures/Clothing/Head/Soft/bluesoft_flipped.rsi/meta.json
+++ /dev/null
@@ -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
- }
- ]
-}
diff --git a/Resources/Textures/Clothing/Head/Soft/cargosoft.rsi/flipped-equipped-HELMET-hamster.png b/Resources/Textures/Clothing/Head/Soft/cargosoft.rsi/flipped-equipped-HELMET-hamster.png
new file mode 100644
index 0000000000000000000000000000000000000000..f5372ea5a3b66f97015499e4944ab8ec114c6ee3
GIT binary patch
literal 375
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%z4Lw~PLn`LH
zy=Cur*g)j?$9REkBllP>wpAQ?O_#D$PI4SSaf;zO$1C41B_o$erLb4bGgxnFT
zpYY)K%th%p&sS~SW8=-h@L>O^7`0T-gxwo=AD^54R`E@xpEv)h_nX4rdqxV~cr&PH#F=lz+BE6nz6YVSH_i_iAE?jb5`Qyv2
zpYy#hcfPM$Z~n@1?rT1e$5Z!4$kaJqZP`^{HS;;2Md~^xpl6`qujTjk`(9u4epmbJ
z{;AhjPx$K1oDDRCt{2+P!T8F&M`2=g>_6g=tuT
zf?EI(6)j&QK*J2w%s`W@kYt7^3y^{dQs9V_7$A|;gad^TiI*Hv;Qy1ZIG^mte&wrd
z2><|GtH{#H^@hPYr}=EEWIU1gUjF{pG?qo&?1pN!n!PU;3%!3mKA7^4?i4q>p;Rhq
zd3TewmHQ*5X=GjnE(I)07*qo
IM6N<$g8ihQ-2eap
literal 20825
zcmeHPeT-aH6@RTomTD0wri6e@h9D*QcJ90H`!PFZKU&+ul-h2?wn*W=d+*zQurqI%
zdE1>D)s2mMt^KS~s*J><<3xOON?}$;xCVCntL+SOf{N
zvbE@ws#vU?T?c944DkvryCvWCim3pX*xrQSmre&AHDBSp3Z-U8#Y)H>u$ZZmQby`U
znNCWKHg!r9-6k7|rl;Uf@N)0(w$Mz0#QHdzCS7hAx|rXY3eklFv8$?l|5;p<~w-
zfB6=mAf&XTW@UJ5iD%aFiZ@ZFeEAlb%GsS}U-8%RmUU(U1>zlneAk%)CwMX=3B2mg
zpcXu-tJQp}Zt5(MW(}4(@xAh}=Z)v;?z*;Ni`3v?%{@~~FLjH|o2;Cd&9tku9H)iG
zhltN}7=bTJNJMy8QY~4vB>j9OSqMcy>XL03d5^iy)&_)*}_s3BO=+3
z0Sl24pUes+DjUIJ)N;IXf%rMMKt_3{R2iWO8Uuq;KOX4UR82+w{icRj
z7}-p))q*op%sD|atIeq1@jQvk+JAVHenbk93iDkXw|SKL&Heq
zx}wbOsC6bY*_H@EQ#It813y$Zbb_%%WC?dUYLijUk%ob5uFvhLP0nP;22`7yb_mTS
zNwjqabHTFdsNI^8N{Xr)8ifs04hbPxQ$(;X+m>5prA#+U#m$76kz_p`>
z9zuwYMWS+r7|d`asoQwX9j>XSLPS|7VNf+q1Bs?VOcesI!3pcqLmVt&*#HkwG$6dT
z6%gbAKMvxmEK{u8T|=uFBN@UI3@}{i@kc%CLMl_=ziMA0^bmt+nkcK9BPzC{i6$~+
z(U2G?6mvr{j=l*%uG7n4N3?BZQ|3q_akwcmRdGbqw1HR6MihX!A*n~@wE^a+5;GOZ
zX|Qb&Q6;dEz=mgt8rCR7)S$X)&K`^ykY!Ox)Ibe}7r2$KNTMSn>`;V(0mwr-ZT|Jv
zsYyjNV>wbv5@dS$ytS%W@d;!stA=vH8Sy!k0dMH)Jda@4lvWYTImL<-PWl&SS__%
z#%<+Dh$eMOulJD?BJc`qGUWq*>L~^SCgZtCcbqp+R|6
z8Dwf|oEWBvRfsyerXbOvOcgbV%BrH-lFsyonIl$gpJFhX2*FUF!Sa!U`YbqjP&PFn
z-Vgd)W20lFILcWr(-=;pp?y04%N8?q14594MH`!ns3VAj27@%#;E3w7?NHNk8uRPI
zV)8ITR$w$KF`D0ucV2M|FUN^^5LXGD*m0=0ow8R*HOu^z@1;noH11Logwo8GA`8#I
zn#FO$dJ&BOqJuJCcH;z<$S7%prql;)&c_@^p=f8A%8m#p7pkZ_3Y4viq>E5LX@;qq
z$U%^tbg`S&!)UT7YZ*nj#e_-7F&hobu+wRnh&p9Z{4+?G;j96Pnu2wzUu@3%a#QP0b}{acnx96r=^;*z(@bJ+K)k8cQOy=**-Y_tGUUS5RV6ra
z(BR0WrqlkQqvFPy6eABp#rm>|++EiUQ*VWvak!MvG;if2Hml_$@6B6lM(+)N4K?W`
z7P$#s30<)mh$WnOS3*}T24V>(-j&c5i-B0eiFYM*#bO|qaN=DFU9lL5C7gIyLRTyX
zVhJbSmCzN7fmp(ccO`ViVjz}q;#~<{u^5OYoOoA4S1bl%2`Ao_&=re;Si*^SC3MAN
zAeM0AT?t*W7>FgDcvnJKECyl;C*GCN6^nsb!ije!bj4yImT=--30<)mh$WnOS3*}T
z24V>(-j&c5i-B0eNA#|Rt>3xhMfh>MN%$4Jw{CyzHTVU*6kWM4F9_St5rpf$Bnba}
z7e45>{%fQ^PXEZ)IVI^_r|`*E}H+DGmbxeXz`f~AOG!5
zm79Auo#7WAeeR(R=k(nF$;;naa>~9pt|&eBP|po(_df9A>6;3r69#tv@bI%Az3Sz6
z)E9Q7Pn`Vy`A;7D*#6QpKYn%pp${GU^X|{B9y)Na=h=h(!u*r26BZn^^_1EK?^x)pF-`RKT>;3n=`NU~AUBBg<
z*`F-O<}bf@YyZ;^_@^#=WY-rj+py`5>k7Zx&dQ7Ty#D1~#nFe|%jW;=r<7S>hs>&d-&}|2fVKc3sS)?rkumaz>|M0;LHxWVD
zcl+b7%)i$@VdLh{-t}VU#^x%`SfyEpeNd4AC)!bvAzTFBn^wcX2}8O!F5
t|NeKk_nex!sB%{42^`q>kb?-@ga10|j4?92+&enNIa<2Jc$8K%j!136#vs4_e4f?jer#A7t{U~za<%e}Ow|PU`b60Uzo_n3hum8$ylBWw2@D*Mu<84(u
zi}#cG%I$SneG8~WyUbFk$i`TCi*1%Ds&DQ%l%{pR+~8Hro8ze)eg68C%>H-B**J
iFHc*?BnSh4E#>3xP2By>#lIXF!VI3SelF{r5}E+2%d8Cm
literal 0
HcmV?d00001
diff --git a/Resources/Textures/Clothing/Head/Soft/paramedicsoft_flipped.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Soft/paramedicsoft.rsi/flipped-equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/paramedicsoft_flipped.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Soft/paramedicsoft.rsi/flipped-equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/Soft/paramedicsoft_flipped.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Soft/paramedicsoft.rsi/flipped-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/paramedicsoft_flipped.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Soft/paramedicsoft.rsi/flipped-inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/Soft/paramedicsoft_flipped.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Soft/paramedicsoft.rsi/flipped-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/paramedicsoft_flipped.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Soft/paramedicsoft.rsi/flipped-inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Soft/paramedicsoft_flipped.rsi/icon.png b/Resources/Textures/Clothing/Head/Soft/paramedicsoft.rsi/icon_flipped.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/paramedicsoft_flipped.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Soft/paramedicsoft.rsi/icon_flipped.png
diff --git a/Resources/Textures/Clothing/Head/Soft/paramedicsoft.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/paramedicsoft.rsi/meta.json
index 2b73b340e6..b60639b265 100644
--- a/Resources/Textures/Clothing/Head/Soft/paramedicsoft.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Soft/paramedicsoft.rsi/meta.json
@@ -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
}
]
}
diff --git a/Resources/Textures/Clothing/Head/Soft/paramedicsoft_flipped.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/paramedicsoft_flipped.rsi/meta.json
deleted file mode 100644
index 8089773135..0000000000
--- a/Resources/Textures/Clothing/Head/Soft/paramedicsoft_flipped.rsi/meta.json
+++ /dev/null
@@ -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
- }
- ]
-}
diff --git a/Resources/Textures/Clothing/Head/Soft/purplesoft.rsi/flipped-equipped-HELMET-hamster.png b/Resources/Textures/Clothing/Head/Soft/purplesoft.rsi/flipped-equipped-HELMET-hamster.png
new file mode 100644
index 0000000000000000000000000000000000000000..140bf71b782a83bf8cc38024c82e74777fbe031d
GIT binary patch
literal 406
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%z13Xltui9SrsLMb8`xZ1-^A!|ND^_J-_z=%Jt^J+;yw~%S`{lPg#^$#-A29j4;K#I`
zezo#5{KdYS%=y}P`iGPgqU0H$d>GAHIdIzDMj&`v$`N}a#YrE5=`l_uObT@W+<
z?auBwJK1_>Jzd!KV1|z=(63P7e&WvlSFbO6f3y1=f7G^0#%2G#HqZEFq1YLJMhtDnm{r-UW|nzyg(
literal 0
HcmV?d00001
diff --git a/Resources/Textures/Clothing/Head/Soft/purplesoft_flipped.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Soft/purplesoft.rsi/flipped-equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/purplesoft_flipped.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Soft/purplesoft.rsi/flipped-equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/Soft/purplesoft_flipped.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Soft/purplesoft.rsi/flipped-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/purplesoft_flipped.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Soft/purplesoft.rsi/flipped-inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/Soft/purplesoft_flipped.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Soft/purplesoft.rsi/flipped-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/purplesoft_flipped.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Soft/purplesoft.rsi/flipped-inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Soft/purplesoft_flipped.rsi/icon.png b/Resources/Textures/Clothing/Head/Soft/purplesoft.rsi/icon_flipped.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/purplesoft_flipped.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Soft/purplesoft.rsi/icon_flipped.png
diff --git a/Resources/Textures/Clothing/Head/Soft/purplesoft.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/purplesoft.rsi/meta.json
index ade65863af..3fb7add363 100644
--- a/Resources/Textures/Clothing/Head/Soft/purplesoft.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Soft/purplesoft.rsi/meta.json
@@ -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
}
]
}
diff --git a/Resources/Textures/Clothing/Head/Soft/purplesoft_flipped.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/purplesoft_flipped.rsi/meta.json
deleted file mode 100644
index a470e00944..0000000000
--- a/Resources/Textures/Clothing/Head/Soft/purplesoft_flipped.rsi/meta.json
+++ /dev/null
@@ -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
- }
- ]
-}
diff --git a/Resources/Textures/Clothing/Head/Soft/qmsoft_flipped.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Soft/qmsoft.rsi/flipped-equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/qmsoft_flipped.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Soft/qmsoft.rsi/flipped-equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/Soft/qmsoft_flipped.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Soft/qmsoft.rsi/flipped-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/qmsoft_flipped.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Soft/qmsoft.rsi/flipped-inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/Soft/qmsoft_flipped.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Soft/qmsoft.rsi/flipped-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/qmsoft_flipped.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Soft/qmsoft.rsi/flipped-inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Soft/qmsoft_flipped.rsi/icon.png b/Resources/Textures/Clothing/Head/Soft/qmsoft.rsi/icon_flipped.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/qmsoft_flipped.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Soft/qmsoft.rsi/icon_flipped.png
diff --git a/Resources/Textures/Clothing/Head/Soft/qmsoft.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/qmsoft.rsi/meta.json
index a470e00944..a29360acd8 100644
--- a/Resources/Textures/Clothing/Head/Soft/qmsoft.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Soft/qmsoft.rsi/meta.json
@@ -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
}
]
}
diff --git a/Resources/Textures/Clothing/Head/Soft/qmsoft_flipped.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/qmsoft_flipped.rsi/meta.json
deleted file mode 100644
index a470e00944..0000000000
--- a/Resources/Textures/Clothing/Head/Soft/qmsoft_flipped.rsi/meta.json
+++ /dev/null
@@ -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
- }
- ]
-}
diff --git a/Resources/Textures/Clothing/Head/Soft/redsoft_flipped.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Soft/redsoft.rsi/flipped-equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/redsoft_flipped.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Soft/redsoft.rsi/flipped-equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/Soft/redsoft_flipped.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Soft/redsoft.rsi/flipped-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/redsoft_flipped.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Soft/redsoft.rsi/flipped-inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/Soft/redsoft_flipped.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Soft/redsoft.rsi/flipped-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/redsoft_flipped.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Soft/redsoft.rsi/flipped-inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Soft/redsoft_flipped.rsi/icon.png b/Resources/Textures/Clothing/Head/Soft/redsoft.rsi/icon_flipped.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/redsoft_flipped.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Soft/redsoft.rsi/icon_flipped.png
diff --git a/Resources/Textures/Clothing/Head/Soft/redsoft.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/redsoft.rsi/meta.json
index a470e00944..a29360acd8 100644
--- a/Resources/Textures/Clothing/Head/Soft/redsoft.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Soft/redsoft.rsi/meta.json
@@ -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
}
]
}
diff --git a/Resources/Textures/Clothing/Head/Soft/redsoft_flipped.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/redsoft_flipped.rsi/meta.json
deleted file mode 100644
index a470e00944..0000000000
--- a/Resources/Textures/Clothing/Head/Soft/redsoft_flipped.rsi/meta.json
+++ /dev/null
@@ -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
- }
- ]
-}
diff --git a/Resources/Textures/Clothing/Head/Soft/secsoft_flipped.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Soft/secsoft.rsi/flipped-equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/secsoft_flipped.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Soft/secsoft.rsi/flipped-equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/Soft/secsoft_flipped.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Soft/secsoft.rsi/flipped-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/secsoft_flipped.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Soft/secsoft.rsi/flipped-inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/Soft/secsoft_flipped.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Soft/secsoft.rsi/flipped-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/secsoft_flipped.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Soft/secsoft.rsi/flipped-inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Soft/secsoft_flipped.rsi/icon.png b/Resources/Textures/Clothing/Head/Soft/secsoft.rsi/icon_flipped.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/secsoft_flipped.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Soft/secsoft.rsi/icon_flipped.png
diff --git a/Resources/Textures/Clothing/Head/Soft/secsoft.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/secsoft.rsi/meta.json
index a470e00944..a29360acd8 100644
--- a/Resources/Textures/Clothing/Head/Soft/secsoft.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Soft/secsoft.rsi/meta.json
@@ -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
}
]
}
diff --git a/Resources/Textures/Clothing/Head/Soft/secsoft_flipped.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/secsoft_flipped.rsi/meta.json
deleted file mode 100644
index a470e00944..0000000000
--- a/Resources/Textures/Clothing/Head/Soft/secsoft_flipped.rsi/meta.json
+++ /dev/null
@@ -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
- }
- ]
-}
diff --git a/Resources/Textures/Clothing/Head/Soft/yellowsoft_flipped.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Soft/yellowsoft.rsi/flipped-equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/yellowsoft_flipped.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Soft/yellowsoft.rsi/flipped-equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/Soft/yellowsoft_flipped.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Soft/yellowsoft.rsi/flipped-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/yellowsoft_flipped.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Soft/yellowsoft.rsi/flipped-inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/Soft/yellowsoft_flipped.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Soft/yellowsoft.rsi/flipped-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/yellowsoft_flipped.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Soft/yellowsoft.rsi/flipped-inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Soft/yellowsoft_flipped.rsi/icon.png b/Resources/Textures/Clothing/Head/Soft/yellowsoft.rsi/icon_flipped.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/yellowsoft_flipped.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Soft/yellowsoft.rsi/icon_flipped.png
diff --git a/Resources/Textures/Clothing/Head/Soft/yellowsoft.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/yellowsoft.rsi/meta.json
index a470e00944..a29360acd8 100644
--- a/Resources/Textures/Clothing/Head/Soft/yellowsoft.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Soft/yellowsoft.rsi/meta.json
@@ -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
}
]
}
diff --git a/Resources/Textures/Clothing/Head/Soft/yellowsoft_flipped.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/yellowsoft_flipped.rsi/meta.json
deleted file mode 100644
index a470e00944..0000000000
--- a/Resources/Textures/Clothing/Head/Soft/yellowsoft_flipped.rsi/meta.json
+++ /dev/null
@@ -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
- }
- ]
-}
--
2.52.0