diff --git a/Content.Client/_White/CoinDice/CoinDiceSystem.cs b/Content.Client/_White/CoinDice/CoinDiceSystem.cs new file mode 100644 index 0000000000..a2d4279f5b --- /dev/null +++ b/Content.Client/_White/CoinDice/CoinDiceSystem.cs @@ -0,0 +1,21 @@ +using Content.Shared._White.CoinDice; +using Robust.Client.GameObjects; + +namespace Content.Client._White.CoinDice; + +public sealed class CoinDiceSystem : SharedCoinDiceSystem +{ + protected override void UpdateVisuals(EntityUid uid, CoinDiceComponent? die = null) + { + if (!Resolve(uid, ref die) || !TryComp(uid, out SpriteComponent? sprite)) + return; + + var state = sprite.LayerGetState(0).Name; + if (state == null) + return; + + var prefix = state.Substring(0, state.IndexOf('_')); + sprite.LayerSetState(0, $"{prefix}_{die.CurrentValue}"); + } + +} diff --git a/Content.Server/_White/CoinDice/CoinDiceSystem.cs b/Content.Server/_White/CoinDice/CoinDiceSystem.cs new file mode 100644 index 0000000000..7b3ce46a72 --- /dev/null +++ b/Content.Server/_White/CoinDice/CoinDiceSystem.cs @@ -0,0 +1,41 @@ +using Content.Shared._White.CoinDice; +using Content.Shared.Popups; +using JetBrains.Annotations; +using Robust.Shared.Audio; +using Robust.Shared.Audio.Systems; +using Robust.Shared.Random; + +namespace Content.Server._White.CoinDice; + +[UsedImplicitly] +public sealed class CoinDiceSystem : SharedCoinDiceSystem +{ + [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private readonly SharedAudioSystem _audio = default!; + [Dependency] private readonly SharedPopupSystem _popup = default!; + + public override void Roll(EntityUid uid, CoinDiceComponent? die = null) + { + if (!Resolve(uid, ref die)) + return; + + var roll = _random.Next(1, die.Sides + 1); + SetCurrentSide(uid, roll, die); + var coindiceResult = ""; + switch (die.CurrentValue) + { + case 1: + coindiceResult = "орёл"; + break; + case 2: + coindiceResult = "решка"; + break; + default: + coindiceResult = "ребро"; + break; + } + + _popup.PopupEntity(Loc.GetString("coindice-component-on-roll-land", ("die", uid), ("currentSide", coindiceResult)), uid); + _audio.PlayPvs(die.Sound, uid); + } +} diff --git a/Content.Shared/_White/CoinDice/CoinDiceComponent.cs b/Content.Shared/_White/CoinDice/CoinDiceComponent.cs new file mode 100644 index 0000000000..5101ae5417 --- /dev/null +++ b/Content.Shared/_White/CoinDice/CoinDiceComponent.cs @@ -0,0 +1,36 @@ +using Robust.Shared.Audio; +using Robust.Shared.GameStates; + +namespace Content.Shared._White.CoinDice; + +[RegisterComponent, NetworkedComponent, Access(typeof(SharedCoinDiceSystem))] +[AutoGenerateComponentState(true)] +public sealed partial class CoinDiceComponent : Component +{ + [DataField] + public SoundSpecifier Sound { get; private set; } = new SoundCollectionSpecifier("Dice"); + + /// + /// Multiplier for the value of a die. Applied after the . + /// + [DataField] + public int Multiplier { get; private set; } = 1; + + /// + /// Quantity that is subtracted from the value of a die. Can be used to make dice that start at "0". Applied + /// before the + /// + [DataField] + public int Offset { get; private set; } = 0; + + [DataField] + public int Sides { get; private set; } = 20; + + /// + /// The currently displayed value. + /// + [DataField] + [AutoNetworkedField] + public int CurrentValue { get; set; } = 20; + +} diff --git a/Content.Shared/_White/CoinDice/SharedCoinDiceSystem.cs b/Content.Shared/_White/CoinDice/SharedCoinDiceSystem.cs new file mode 100644 index 0000000000..fc563960cc --- /dev/null +++ b/Content.Shared/_White/CoinDice/SharedCoinDiceSystem.cs @@ -0,0 +1,104 @@ +using Content.Shared.Examine; +using Content.Shared.Interaction.Events; +using Content.Shared.Throwing; +using Robust.Shared.Timing; + +namespace Content.Shared._White.CoinDice; + +public abstract class SharedCoinDiceSystem : EntitySystem +{ + [Dependency] private readonly IGameTiming _gameTiming = default!; + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(OnUseInHand); + SubscribeLocalEvent(OnLand); + SubscribeLocalEvent(OnExamined); + SubscribeLocalEvent(OnDiceAfterHandleState); + } + + private void OnDiceAfterHandleState(EntityUid uid, CoinDiceComponent component, ref AfterAutoHandleStateEvent args) + { + UpdateVisuals(uid, component); + } + + private void OnUseInHand(EntityUid uid, CoinDiceComponent component, UseInHandEvent args) + { + if (args.Handled) + return; + + args.Handled = true; + Roll(uid, component); + } + + private void OnLand(EntityUid uid, CoinDiceComponent component, ref LandEvent args) + { + Roll(uid, component); + } + + private void OnExamined(EntityUid uid, CoinDiceComponent dice, ExaminedEvent args) + { + //No details check, since the sprite updates to show the side. + using (args.PushGroup(nameof(CoinDiceComponent))) + { + args.PushMarkup(Loc.GetString("coindice-component-on-examine-message-part-1")); + var coindiceResult = ""; + switch (dice.CurrentValue) + { + case 1: + coindiceResult = "орёл"; + break; + case 2: + coindiceResult = "решка"; + break; + default: + coindiceResult = "ребро"; + break; + } + args.PushMarkup(Loc.GetString("coindice-component-on-examine-message-part-2", + ("currentSide", coindiceResult))); + } + } + + public void SetCurrentSide(EntityUid uid, int side, CoinDiceComponent? die = null) + { + if (!Resolve(uid, ref die)) + return; + + if (side < 1 || side > die.Sides) + { + Log.Error($"Attempted to set die {ToPrettyString(uid)} to an invalid side ({side})."); + return; + } + + die.CurrentValue = (side - die.Offset) * die.Multiplier; + Dirty(uid, die); + UpdateVisuals(uid, die); + } + + public void SetCurrentValue(EntityUid uid, int value, CoinDiceComponent? die = null) + { + if (!Resolve(uid, ref die)) + return; + + if (value % die.Multiplier != 0 || value / die.Multiplier + die.Offset < 1) + { + Log.Error($"Attempted to set die {ToPrettyString(uid)} to an invalid value ({value})."); + return; + } + + SetCurrentSide(uid, value / die.Multiplier + die.Offset, die); + } + + protected virtual void UpdateVisuals(EntityUid uid, CoinDiceComponent? die = null) + { + // See client system. + } + + public virtual void Roll(EntityUid uid, CoinDiceComponent? die = null) + { + // See the server system, client cannot predict rolling. + } + +} diff --git a/Resources/Locale/ru-RU/dice/dice-component.ftl b/Resources/Locale/ru-RU/dice/dice-component.ftl index 0c0ddb6e88..483f50e92b 100644 --- a/Resources/Locale/ru-RU/dice/dice-component.ftl +++ b/Resources/Locale/ru-RU/dice/dice-component.ftl @@ -1,3 +1,9 @@ dice-component-on-examine-message-part-1 = Кость c [color=lightgray]{ $sidesAmount }[/color] сторонами. dice-component-on-examine-message-part-2 = Она приземлилась на [color=white]{ $currentSide }[/color]. dice-component-on-roll-land = { CAPITALIZE($die) } приземляется на { $currentSide }. + +# CoinDice + +coindice-component-on-examine-message-part-1 = Как и любая другая монетка, имеет две стороны. +coindice-component-on-examine-message-part-2 = Сейчас на вас смотрит - [color=white]{ $currentSide }[/color]. +coindice-component-on-roll-land = { CAPITALIZE($die) } приземляется и вам выпадает - { $currentSide }. diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml index a31089ea95..dc9edf45c0 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml @@ -87,6 +87,7 @@ foldVerbText: fold-verb-clothing-jacket - type: FoldableClothing foldedEquippedPrefix: folded + foldedHeldPrefix: folded - type: Sprite layers: - state: icon diff --git a/Resources/Prototypes/_White/Fluff/fluff.yml b/Resources/Prototypes/_White/Fluff/fluff.yml index 55a27e5b4e..297fd4a048 100644 --- a/Resources/Prototypes/_White/Fluff/fluff.yml +++ b/Resources/Prototypes/_White/Fluff/fluff.yml @@ -584,11 +584,11 @@ - type: EyeProtection - type: entity - parent: ClothingUniformBase + parent: [ClothingUniformBase, ClothingUniformFoldableBase] id: ClothingUniformJumpsuitSerafimSalvageSpecialist - name: комбинезон специалиста по утилизации + name: экспедиторская униформа suffix: fluff - description: Удобный прочный комбинезон. Особенно грязный. + description: Нестандартная форма экспедитора, специалиста сопровождающего рабочие процессы Карго и РНД отделов. На вороте имеется примечательная нашивка "corp.Embryo-Evolt". components: - type: Sprite sprite: White/Fluff/Serafim547/salvage.rsi @@ -596,20 +596,23 @@ sprite: White/Fluff/Serafim547/salvage.rsi - type: entity - parent: BaseDice + parent: BaseItem id: VulpCoin name: Золотая монета suffix: fluff description: Коллекционная чеканная монета с родины вульпканин, редкая находка обладающая не столь реальной, сколько символической ценностью. components: - - type: Dice + - type: UseDelay + - type: CoinDice sound: collection: CoinDrop sides: 2 - currentValue: 2 + currentValue: 1 - type: Sprite sprite: White/Fluff/Serafim547/vulp_coin.rsi - state: coin_2 + state: coin_1 + - type: Item + size: Tiny # Skrimex diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/folded-inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/folded-inhand-left.png new file mode 100644 index 0000000000..5f31602b18 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/folded-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/folded-inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/folded-inhand-right.png new file mode 100644 index 0000000000..c5df8b73fb Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/folded-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/meta.json index edec0ee0c2..7bf039baf1 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/meta.json @@ -36,6 +36,14 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "folded-inhand-left", + "directions": 4 + }, + { + "name": "folded-inhand-right", + "directions": 4 } ] } \ No newline at end of file diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos_casual.rsi/folded-inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos_casual.rsi/folded-inhand-left.png new file mode 100644 index 0000000000..a9f940b4d0 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos_casual.rsi/folded-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos_casual.rsi/folded-inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos_casual.rsi/folded-inhand-right.png new file mode 100644 index 0000000000..8ab7f969dc Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos_casual.rsi/folded-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos_casual.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos_casual.rsi/meta.json index a1a0a09909..cd2ca7f024 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos_casual.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos_casual.rsi/meta.json @@ -32,6 +32,14 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "folded-inhand-left", + "directions": 4 + }, + { + "name": "folded-inhand-right", + "directions": 4 } ] } \ No newline at end of file diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/bartender.rsi/folded-inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/bartender.rsi/folded-inhand-left.png new file mode 100644 index 0000000000..7e54e85c9a Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/bartender.rsi/folded-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/bartender.rsi/folded-inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/bartender.rsi/folded-inhand-right.png new file mode 100644 index 0000000000..9498ad18c5 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/bartender.rsi/folded-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/bartender.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/bartender.rsi/meta.json index f740ad384c..b2e274d874 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/bartender.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/bartender.rsi/meta.json @@ -32,6 +32,14 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "folded-inhand-left", + "directions": 4 + }, + { + "name": "folded-inhand-right", + "directions": 4 } ] } \ No newline at end of file diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/folded-inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/folded-inhand-left.png new file mode 100644 index 0000000000..a221cc4eb4 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/folded-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/folded-inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/folded-inhand-right.png new file mode 100644 index 0000000000..3e569369b3 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/folded-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/meta.json index dfd98903d9..8a3d76c6ae 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/meta.json @@ -36,6 +36,14 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "folded-inhand-left", + "directions": 4 + }, + { + "name": "folded-inhand-right", + "directions": 4 } ] -} +} \ No newline at end of file diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/folded-inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/folded-inhand-left.png new file mode 100644 index 0000000000..2e6a5e61db Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/folded-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/folded-inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/folded-inhand-right.png new file mode 100644 index 0000000000..7061517515 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/folded-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/meta.json index 97c36cbada..1882ba080f 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/meta.json @@ -32,6 +32,14 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "folded-inhand-left", + "directions": 4 + }, + { + "name": "folded-inhand-right", + "directions": 4 } ] } \ No newline at end of file diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/folded-inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/folded-inhand-left.png new file mode 100644 index 0000000000..94d9ed8605 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/folded-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/folded-inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/folded-inhand-right.png new file mode 100644 index 0000000000..560879a0f2 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/folded-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/meta.json index 9b3c1f8318..b333872be7 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/meta.json @@ -47,6 +47,14 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "folded-inhand-left", + "directions": 4 + }, + { + "name": "folded-inhand-right", + "directions": 4 } ] } \ No newline at end of file diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/chef.rsi/folded-inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/chef.rsi/folded-inhand-left.png new file mode 100644 index 0000000000..7f22a4bb37 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/chef.rsi/folded-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/chef.rsi/folded-inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/chef.rsi/folded-inhand-right.png new file mode 100644 index 0000000000..581766f585 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/chef.rsi/folded-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/chef.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/chef.rsi/meta.json index 8485bc2cf9..87f39dd33b 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/chef.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/chef.rsi/meta.json @@ -32,6 +32,14 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "folded-inhand-left", + "directions": 4 + }, + { + "name": "folded-inhand-right", + "directions": 4 } ] -} +} \ No newline at end of file diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/chemistry.rsi/folded-inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/chemistry.rsi/folded-inhand-left.png new file mode 100644 index 0000000000..bad4e867d6 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/chemistry.rsi/folded-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/chemistry.rsi/folded-inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/chemistry.rsi/folded-inhand-right.png new file mode 100644 index 0000000000..e6544dfb69 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/chemistry.rsi/folded-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/chemistry.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/chemistry.rsi/meta.json index 7ad132f8af..05c6bef3e0 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/chemistry.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/chemistry.rsi/meta.json @@ -36,6 +36,14 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "folded-inhand-left", + "directions": 4 + }, + { + "name": "folded-inhand-right", + "directions": 4 } ] } \ No newline at end of file diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo.rsi/folded-inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo.rsi/folded-inhand-left.png new file mode 100644 index 0000000000..534669eacd Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo.rsi/folded-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo.rsi/folded-inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo.rsi/folded-inhand-right.png new file mode 100644 index 0000000000..24c4ea8575 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo.rsi/folded-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo.rsi/meta.json index 7ad132f8af..05c6bef3e0 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo.rsi/meta.json @@ -36,6 +36,14 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "folded-inhand-left", + "directions": 4 + }, + { + "name": "folded-inhand-right", + "directions": 4 } ] } \ No newline at end of file diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective.rsi/folded-inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective.rsi/folded-inhand-left.png new file mode 100644 index 0000000000..aed8b4f025 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective.rsi/folded-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective.rsi/folded-inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective.rsi/folded-inhand-right.png new file mode 100644 index 0000000000..fd6f60eabb Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective.rsi/folded-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective.rsi/meta.json index e17812c000..038c5e663c 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective.rsi/meta.json @@ -36,6 +36,14 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "folded-inhand-left", + "directions": 4 + }, + { + "name": "folded-inhand-right", + "directions": 4 } ] -} +} \ No newline at end of file diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective_grey.rsi/folded-inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective_grey.rsi/folded-inhand-left.png new file mode 100644 index 0000000000..15c30a0491 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective_grey.rsi/folded-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective_grey.rsi/folded-inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective_grey.rsi/folded-inhand-right.png new file mode 100644 index 0000000000..53512e6969 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective_grey.rsi/folded-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective_grey.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective_grey.rsi/meta.json index 87c4feceb4..05c6bef3e0 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective_grey.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective_grey.rsi/meta.json @@ -36,6 +36,14 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "folded-inhand-left", + "directions": 4 + }, + { + "name": "folded-inhand-right", + "directions": 4 } ] -} +} \ No newline at end of file diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering.rsi/folded-inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering.rsi/folded-inhand-left.png new file mode 100644 index 0000000000..cf69e2e3cb Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering.rsi/folded-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering.rsi/folded-inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering.rsi/folded-inhand-right.png new file mode 100644 index 0000000000..2ff1950af2 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering.rsi/folded-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering.rsi/meta.json index a95528e408..038c5e663c 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering.rsi/meta.json @@ -36,6 +36,14 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "folded-inhand-left", + "directions": 4 + }, + { + "name": "folded-inhand-right", + "directions": 4 } ] } \ No newline at end of file diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering_hazard.rsi/folded-inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering_hazard.rsi/folded-inhand-left.png new file mode 100644 index 0000000000..cf69e2e3cb Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering_hazard.rsi/folded-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering_hazard.rsi/folded-inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering_hazard.rsi/folded-inhand-right.png new file mode 100644 index 0000000000..2ff1950af2 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering_hazard.rsi/folded-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering_hazard.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering_hazard.rsi/meta.json index a95528e408..038c5e663c 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering_hazard.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering_hazard.rsi/meta.json @@ -36,6 +36,14 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "folded-inhand-left", + "directions": 4 + }, + { + "name": "folded-inhand-right", + "directions": 4 } ] } \ No newline at end of file diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hop.rsi/folded-inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hop.rsi/folded-inhand-left.png new file mode 100644 index 0000000000..1328f0e220 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hop.rsi/folded-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hop.rsi/folded-inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hop.rsi/folded-inhand-right.png new file mode 100644 index 0000000000..b2998354a7 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hop.rsi/folded-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hop.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hop.rsi/meta.json index 7ad132f8af..05c6bef3e0 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hop.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hop.rsi/meta.json @@ -36,6 +36,14 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "folded-inhand-left", + "directions": 4 + }, + { + "name": "folded-inhand-right", + "directions": 4 } ] } \ No newline at end of file diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hydro.rsi/folded-inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hydro.rsi/folded-inhand-left.png new file mode 100644 index 0000000000..37bab77b6c Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hydro.rsi/folded-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hydro.rsi/folded-inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hydro.rsi/folded-inhand-right.png new file mode 100644 index 0000000000..de75bc9b5c Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hydro.rsi/folded-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hydro.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hydro.rsi/meta.json index 83acdf32b6..79f7b72df3 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hydro.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hydro.rsi/meta.json @@ -32,6 +32,14 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "folded-inhand-left", + "directions": 4 + }, + { + "name": "folded-inhand-right", + "directions": 4 } ] } \ No newline at end of file diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/janitor.rsi/folded-inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/janitor.rsi/folded-inhand-left.png new file mode 100644 index 0000000000..333d7bae8d Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/janitor.rsi/folded-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/janitor.rsi/folded-inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/janitor.rsi/folded-inhand-right.png new file mode 100644 index 0000000000..5db9b849d4 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/janitor.rsi/folded-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/janitor.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/janitor.rsi/meta.json index daa4ae4abf..2f9ad9ed9f 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/janitor.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/janitor.rsi/meta.json @@ -36,6 +36,14 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "folded-inhand-left", + "directions": 4 + }, + { + "name": "folded-inhand-right", + "directions": 4 } ] } \ No newline at end of file diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/medical.rsi/folded-inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/medical.rsi/folded-inhand-left.png new file mode 100644 index 0000000000..e154ff0120 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/medical.rsi/folded-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/medical.rsi/folded-inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/medical.rsi/folded-inhand-right.png new file mode 100644 index 0000000000..a3b9583c23 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/medical.rsi/folded-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/medical.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/medical.rsi/meta.json index 7ad132f8af..05c6bef3e0 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/medical.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/medical.rsi/meta.json @@ -36,6 +36,14 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "folded-inhand-left", + "directions": 4 + }, + { + "name": "folded-inhand-right", + "directions": 4 } ] } \ No newline at end of file diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/mercenary.rsi/folded-inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/mercenary.rsi/folded-inhand-left.png new file mode 100644 index 0000000000..deeceae816 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/mercenary.rsi/folded-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/mercenary.rsi/folded-inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/mercenary.rsi/folded-inhand-right.png new file mode 100644 index 0000000000..225759fb4a Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/mercenary.rsi/folded-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/mercenary.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/mercenary.rsi/meta.json index 73b2e82db1..c87b402303 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/mercenary.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/mercenary.rsi/meta.json @@ -32,6 +32,14 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "folded-inhand-left", + "directions": 4 + }, + { + "name": "folded-inhand-right", + "directions": 4 } ] -} +} \ No newline at end of file diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/mime.rsi/folded-inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/mime.rsi/folded-inhand-left.png new file mode 100644 index 0000000000..f8b8f0cf99 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/mime.rsi/folded-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/mime.rsi/folded-inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/mime.rsi/folded-inhand-right.png new file mode 100644 index 0000000000..08260df4f9 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/mime.rsi/folded-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/mime.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/mime.rsi/meta.json index 8485bc2cf9..87f39dd33b 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/mime.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/mime.rsi/meta.json @@ -32,6 +32,14 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "folded-inhand-left", + "directions": 4 + }, + { + "name": "folded-inhand-right", + "directions": 4 } ] -} +} \ No newline at end of file diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/roboticist.rsi/folded-inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/roboticist.rsi/folded-inhand-left.png new file mode 100644 index 0000000000..0dceab6759 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/roboticist.rsi/folded-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/roboticist.rsi/folded-inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/roboticist.rsi/folded-inhand-right.png new file mode 100644 index 0000000000..c512a197ce Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/roboticist.rsi/folded-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/roboticist.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/roboticist.rsi/meta.json index 2e5803332a..af680c00ff 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/roboticist.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/roboticist.rsi/meta.json @@ -32,6 +32,14 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "folded-inhand-left", + "directions": 4 + }, + { + "name": "folded-inhand-right", + "directions": 4 } ] } \ No newline at end of file diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/folded-inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/folded-inhand-left.png new file mode 100644 index 0000000000..4f271669a8 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/folded-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/folded-inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/folded-inhand-right.png new file mode 100644 index 0000000000..7b512340cf Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/folded-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/meta.json index d7f1e9830f..2ea674c9f7 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/meta.json @@ -32,6 +32,14 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "folded-inhand-left", + "directions": 4 + }, + { + "name": "folded-inhand-right", + "directions": 4 } ] } \ No newline at end of file diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist.rsi/folded-inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist.rsi/folded-inhand-left.png new file mode 100644 index 0000000000..a6f9089cad Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist.rsi/folded-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist.rsi/folded-inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist.rsi/folded-inhand-right.png new file mode 100644 index 0000000000..a4c036a457 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist.rsi/folded-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist.rsi/meta.json index fca7fb8edc..05c6bef3e0 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist.rsi/meta.json @@ -1,41 +1,49 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14, folded state by BIG_Zi_348", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14, folded state by BIG_Zi_348", + "size": { + "x": 32, + "y": 32 }, - { - "name": "icon_folded" - }, - { - "name": "equipped-INNERCLOTHING", - "directions": 4 - }, - { - "name": "folded-equipped-INNERCLOTHING", - "directions": 4 - }, - { - "name": "equipped-INNERCLOTHING-monkey", - "directions": 4 - }, - { - "name": "equipped-INNERCLOTHING-body-slim", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "icon_folded" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "folded-equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING-monkey", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING-body-slim", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "folded-inhand-left", + "directions": 4 + }, + { + "name": "folded-inhand-right", + "directions": 4 + } + ] } \ No newline at end of file diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/folded-inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/folded-inhand-left.png new file mode 100644 index 0000000000..5fc87a93df Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/folded-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/folded-inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/folded-inhand-right.png new file mode 100644 index 0000000000..1cb708b7ad Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/folded-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/meta.json index ec8e38d390..a63eaf9710 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/meta.json @@ -1,41 +1,49 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14. equipped-INNERCLOTHING edited by Dutch-VanDerLinde (github). folded state made BIG_Zi_348", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14. equipped-INNERCLOTHING edited by Dutch-VanDerLinde (github). folded state made BIG_Zi_348", + "size": { + "x": 32, + "y": 32 }, - { - "name": "icon_folded" - }, - { - "name": "equipped-INNERCLOTHING", - "directions": 4 - }, - { - "name": "folded-equipped-INNERCLOTHING", - "directions": 4 - }, - { - "name": "equipped-INNERCLOTHING-monkey", - "directions": 4 - }, - { - "name": "equipped-INNERCLOTHING-body-slim", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "icon_folded" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "folded-equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING-monkey", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING-body-slim", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "folded-inhand-left", + "directions": 4 + }, + { + "name": "folded-inhand-right", + "directions": 4 + } + ] } \ No newline at end of file diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/tacticool.rsi/folded-inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/tacticool.rsi/folded-inhand-left.png new file mode 100644 index 0000000000..81b43846cb Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/tacticool.rsi/folded-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/tacticool.rsi/folded-inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/tacticool.rsi/folded-inhand-right.png new file mode 100644 index 0000000000..18756ef6a0 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/tacticool.rsi/folded-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/tacticool.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/tacticool.rsi/meta.json index 459a9d1743..83d0a712e0 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/tacticool.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/tacticool.rsi/meta.json @@ -32,6 +32,14 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "folded-inhand-left", + "directions": 4 + }, + { + "name": "folded-inhand-right", + "directions": 4 } ] -} +} \ No newline at end of file diff --git a/Resources/Textures/White/Clothing/Uniforms/Jumpsuit/clown.rsi/folded-inhand-left.png b/Resources/Textures/White/Clothing/Uniforms/Jumpsuit/clown.rsi/folded-inhand-left.png new file mode 100644 index 0000000000..955631baa4 Binary files /dev/null and b/Resources/Textures/White/Clothing/Uniforms/Jumpsuit/clown.rsi/folded-inhand-left.png differ diff --git a/Resources/Textures/White/Clothing/Uniforms/Jumpsuit/clown.rsi/folded-inhand-right.png b/Resources/Textures/White/Clothing/Uniforms/Jumpsuit/clown.rsi/folded-inhand-right.png new file mode 100644 index 0000000000..3d6828c78d Binary files /dev/null and b/Resources/Textures/White/Clothing/Uniforms/Jumpsuit/clown.rsi/folded-inhand-right.png differ diff --git a/Resources/Textures/White/Clothing/Uniforms/Jumpsuit/clown.rsi/meta.json b/Resources/Textures/White/Clothing/Uniforms/Jumpsuit/clown.rsi/meta.json index 8485bc2cf9..87f39dd33b 100644 --- a/Resources/Textures/White/Clothing/Uniforms/Jumpsuit/clown.rsi/meta.json +++ b/Resources/Textures/White/Clothing/Uniforms/Jumpsuit/clown.rsi/meta.json @@ -32,6 +32,14 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "folded-inhand-left", + "directions": 4 + }, + { + "name": "folded-inhand-right", + "directions": 4 } ] -} +} \ No newline at end of file diff --git a/Resources/Textures/White/Clothing/Uniforms/Jumpsuit/clown_banana.rsi/folded-inhand-left.png b/Resources/Textures/White/Clothing/Uniforms/Jumpsuit/clown_banana.rsi/folded-inhand-left.png new file mode 100644 index 0000000000..186de2f66c Binary files /dev/null and b/Resources/Textures/White/Clothing/Uniforms/Jumpsuit/clown_banana.rsi/folded-inhand-left.png differ diff --git a/Resources/Textures/White/Clothing/Uniforms/Jumpsuit/clown_banana.rsi/folded-inhand-right.png b/Resources/Textures/White/Clothing/Uniforms/Jumpsuit/clown_banana.rsi/folded-inhand-right.png new file mode 100644 index 0000000000..d4c921e87f Binary files /dev/null and b/Resources/Textures/White/Clothing/Uniforms/Jumpsuit/clown_banana.rsi/folded-inhand-right.png differ diff --git a/Resources/Textures/White/Clothing/Uniforms/Jumpsuit/clown_banana.rsi/meta.json b/Resources/Textures/White/Clothing/Uniforms/Jumpsuit/clown_banana.rsi/meta.json index fef4aac94f..13b940655d 100644 --- a/Resources/Textures/White/Clothing/Uniforms/Jumpsuit/clown_banana.rsi/meta.json +++ b/Resources/Textures/White/Clothing/Uniforms/Jumpsuit/clown_banana.rsi/meta.json @@ -32,6 +32,14 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "folded-inhand-left", + "directions": 4 + }, + { + "name": "folded-inhand-right", + "directions": 4 } ] -} +} \ No newline at end of file diff --git a/Resources/Textures/White/Clothing/Uniforms/Jumpsuit/cluwne.rsi/folded-inhand-left.png b/Resources/Textures/White/Clothing/Uniforms/Jumpsuit/cluwne.rsi/folded-inhand-left.png new file mode 100644 index 0000000000..6aff0a7504 Binary files /dev/null and b/Resources/Textures/White/Clothing/Uniforms/Jumpsuit/cluwne.rsi/folded-inhand-left.png differ diff --git a/Resources/Textures/White/Clothing/Uniforms/Jumpsuit/cluwne.rsi/folded-inhand-right.png b/Resources/Textures/White/Clothing/Uniforms/Jumpsuit/cluwne.rsi/folded-inhand-right.png new file mode 100644 index 0000000000..2d931ac04a Binary files /dev/null and b/Resources/Textures/White/Clothing/Uniforms/Jumpsuit/cluwne.rsi/folded-inhand-right.png differ diff --git a/Resources/Textures/White/Clothing/Uniforms/Jumpsuit/cluwne.rsi/meta.json b/Resources/Textures/White/Clothing/Uniforms/Jumpsuit/cluwne.rsi/meta.json index 3d41c1bdfd..2ec914fb74 100644 --- a/Resources/Textures/White/Clothing/Uniforms/Jumpsuit/cluwne.rsi/meta.json +++ b/Resources/Textures/White/Clothing/Uniforms/Jumpsuit/cluwne.rsi/meta.json @@ -32,6 +32,14 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "folded-inhand-left", + "directions": 4 + }, + { + "name": "folded-inhand-right", + "directions": 4 } ] -} +} \ No newline at end of file diff --git a/Resources/Textures/White/Fluff/Serafim547/salvage.rsi/equipped-INNERCLOTHING-body-slim.png b/Resources/Textures/White/Fluff/Serafim547/salvage.rsi/equipped-INNERCLOTHING-body-slim.png deleted file mode 100644 index 7c8672348e..0000000000 Binary files a/Resources/Textures/White/Fluff/Serafim547/salvage.rsi/equipped-INNERCLOTHING-body-slim.png and /dev/null differ diff --git a/Resources/Textures/White/Fluff/Serafim547/salvage.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/White/Fluff/Serafim547/salvage.rsi/equipped-INNERCLOTHING-monkey.png index 98170f84b6..69e92dead7 100644 Binary files a/Resources/Textures/White/Fluff/Serafim547/salvage.rsi/equipped-INNERCLOTHING-monkey.png and b/Resources/Textures/White/Fluff/Serafim547/salvage.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/White/Fluff/Serafim547/salvage.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/White/Fluff/Serafim547/salvage.rsi/equipped-INNERCLOTHING.png index 8f0fc98768..14eec65ff9 100644 Binary files a/Resources/Textures/White/Fluff/Serafim547/salvage.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/White/Fluff/Serafim547/salvage.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/White/Fluff/Serafim547/salvage.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/White/Fluff/Serafim547/salvage.rsi/folded-equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..e082ec6f20 Binary files /dev/null and b/Resources/Textures/White/Fluff/Serafim547/salvage.rsi/folded-equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/White/Fluff/Serafim547/salvage.rsi/folded-inhand-left.png b/Resources/Textures/White/Fluff/Serafim547/salvage.rsi/folded-inhand-left.png new file mode 100644 index 0000000000..7d731111bc Binary files /dev/null and b/Resources/Textures/White/Fluff/Serafim547/salvage.rsi/folded-inhand-left.png differ diff --git a/Resources/Textures/White/Fluff/Serafim547/salvage.rsi/folded-inhand-right.png b/Resources/Textures/White/Fluff/Serafim547/salvage.rsi/folded-inhand-right.png new file mode 100644 index 0000000000..1b5cb3060f Binary files /dev/null and b/Resources/Textures/White/Fluff/Serafim547/salvage.rsi/folded-inhand-right.png differ diff --git a/Resources/Textures/White/Fluff/Serafim547/salvage.rsi/icon.png b/Resources/Textures/White/Fluff/Serafim547/salvage.rsi/icon.png index e5557a33e1..03fe87b1e0 100644 Binary files a/Resources/Textures/White/Fluff/Serafim547/salvage.rsi/icon.png and b/Resources/Textures/White/Fluff/Serafim547/salvage.rsi/icon.png differ diff --git a/Resources/Textures/White/Fluff/Serafim547/salvage.rsi/icon_folded.png b/Resources/Textures/White/Fluff/Serafim547/salvage.rsi/icon_folded.png new file mode 100644 index 0000000000..f1afa1c32c Binary files /dev/null and b/Resources/Textures/White/Fluff/Serafim547/salvage.rsi/icon_folded.png differ diff --git a/Resources/Textures/White/Fluff/Serafim547/salvage.rsi/inhand-left.png b/Resources/Textures/White/Fluff/Serafim547/salvage.rsi/inhand-left.png index 1987c5a9ea..fd19529177 100644 Binary files a/Resources/Textures/White/Fluff/Serafim547/salvage.rsi/inhand-left.png and b/Resources/Textures/White/Fluff/Serafim547/salvage.rsi/inhand-left.png differ diff --git a/Resources/Textures/White/Fluff/Serafim547/salvage.rsi/inhand-right.png b/Resources/Textures/White/Fluff/Serafim547/salvage.rsi/inhand-right.png index 54c5071292..0c0160c839 100644 Binary files a/Resources/Textures/White/Fluff/Serafim547/salvage.rsi/inhand-right.png and b/Resources/Textures/White/Fluff/Serafim547/salvage.rsi/inhand-right.png differ diff --git a/Resources/Textures/White/Fluff/Serafim547/salvage.rsi/meta.json b/Resources/Textures/White/Fluff/Serafim547/salvage.rsi/meta.json index 8148717fea..0b51bdb16e 100644 --- a/Resources/Textures/White/Fluff/Serafim547/salvage.rsi/meta.json +++ b/Resources/Textures/White/Fluff/Serafim547/salvage.rsi/meta.json @@ -1,34 +1,45 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/0a1ae39f0fb7353b0704f27d1599a567891f727c, edited by Flareguy. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/0a1ae39f0fb7353b0704f27d1599a567891f727c, edited by Flareguy. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14", + "size": { + "x": 32, + "y": 32 }, - { - "name": "equipped-INNERCLOTHING", - "directions": 4 - }, - { - "name": "equipped-INNERCLOTHING-monkey", - "directions": 4 - }, - { - "name": "equipped-INNERCLOTHING-body-slim", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} + "states": [ + { + "name": "icon" + }, + { + "name": "icon_folded" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "folded-equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING-monkey", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "folded-inhand-left", + "directions": 4 + }, + { + "name": "folded-inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/White/Fluff/Serafim547/vulp_coin.rsi/coin_1.png b/Resources/Textures/White/Fluff/Serafim547/vulp_coin.rsi/coin_1.png index 91bac2bbff..2d3ae3fb0c 100644 Binary files a/Resources/Textures/White/Fluff/Serafim547/vulp_coin.rsi/coin_1.png and b/Resources/Textures/White/Fluff/Serafim547/vulp_coin.rsi/coin_1.png differ diff --git a/Resources/Textures/White/Fluff/Serafim547/vulp_coin.rsi/coin_2.png b/Resources/Textures/White/Fluff/Serafim547/vulp_coin.rsi/coin_2.png index 671d686882..bb9b72909e 100644 Binary files a/Resources/Textures/White/Fluff/Serafim547/vulp_coin.rsi/coin_2.png and b/Resources/Textures/White/Fluff/Serafim547/vulp_coin.rsi/coin_2.png differ diff --git a/Resources/Textures/White/Fluff/Serafim547/vulp_coin.rsi/meta.json b/Resources/Textures/White/Fluff/Serafim547/vulp_coin.rsi/meta.json index e0a701d6ba..e9968cb62a 100644 --- a/Resources/Textures/White/Fluff/Serafim547/vulp_coin.rsi/meta.json +++ b/Resources/Textures/White/Fluff/Serafim547/vulp_coin.rsi/meta.json @@ -14,4 +14,4 @@ "name": "coin_2" } ] -} +} \ No newline at end of file