diff --git a/Content.Goobstation.Server/Chemistry/EntitySystems/EnergyReagentDispenserSystem.cs b/Content.Goobstation.Server/Chemistry/EntitySystems/EnergyReagentDispenserSystem.cs index 1e5fc2e255e..d3ba43a6cfb 100644 --- a/Content.Goobstation.Server/Chemistry/EntitySystems/EnergyReagentDispenserSystem.cs +++ b/Content.Goobstation.Server/Chemistry/EntitySystems/EnergyReagentDispenserSystem.cs @@ -75,6 +75,8 @@ public sealed class EnergyReagentDispenserSystem : EntitySystem [Dependency] private readonly UserInterfaceSystem _userInterfaceSystem = default!; [Dependency] private readonly IPrototypeManager _prototypeManager = default!; [Dependency] private readonly BatterySystem _battery = default!; + [Dependency] private readonly Content.Server.PowerCell.PowerCellSystem _powerCellSystem = default!; + public override void Initialize() { @@ -108,7 +110,12 @@ private void UpdateUiState(Entity reagentDispen var idleUse = 0f; var hasPower = false; - if (TryComp(reagentDispenser, out var battery)) + if (_powerCellSystem.TryGetBatteryFromSlot(reagentDispenser.Owner, out var slottedBatteryEnt, out var slottedBattery)) // Omu + { + batteryCharge = slottedBattery.CurrentCharge; // Omu + batteryMaxCharge = slottedBattery.MaxCharge; // Also omu + } + else if (TryComp(reagentDispenser, out var battery)) { batteryCharge = battery.CurrentCharge; batteryMaxCharge = battery.MaxCharge; @@ -193,16 +200,27 @@ private void OnDispenseReagentMessage(Entity re || !_solutionContainerSystem.TryGetFitsInDispenser(outputContainer.Value, out var solution, out _)) return; - if (!TryComp(reagentDispenser, out var battery)) - return; + TryComp(reagentDispenser, out var battery); // Omu var amount = (int) reagentDispenser.Comp.DispenseAmount; var powerRequired = GetPowerCostForReagent(message.ReagentId, amount, reagentDispenser.Comp); - if (battery.CurrentCharge < powerRequired) + // Omu start + if (HasComp(reagentDispenser)) { - _audioSystem.PlayPvs(reagentDispenser.Comp.PowerSound, reagentDispenser, AudioParams.Default.WithVolume(-2f)); - return; + if (!_powerCellSystem.TryUseCharge(reagentDispenser.Owner, powerRequired)) + { + _audioSystem.PlayPvs(reagentDispenser.Comp.PowerSound, reagentDispenser, AudioParams.Default.WithVolume(-2f)); + return; + } + } // Omu end + else + { + if (battery == null || battery.CurrentCharge < powerRequired) + { + _audioSystem.PlayPvs(reagentDispenser.Comp.PowerSound, reagentDispenser, AudioParams.Default.WithVolume(-2f)); + return; + } } @@ -210,7 +228,11 @@ private void OnDispenseReagentMessage(Entity re if (!_solutionContainerSystem.TryAddSolution(solution.Value, sol)) return; - _battery.SetCharge(reagentDispenser.Owner, battery.CurrentCharge - powerRequired); + if (!_powerCellSystem.TryGetBatteryFromSlot(reagentDispenser.Owner, out _, out _)) // Omu + { + if (battery != null) + _battery.SetCharge(reagentDispenser.Owner, battery.CurrentCharge - powerRequired); + } ClickSound(reagentDispenser); UpdateUiState(reagentDispenser); } @@ -224,7 +246,17 @@ private void OnClearContainerSolutionMessage(Entity GetPowerCostForReagent(reagent.Reagent.Prototype, (int) reagent.Quantity, reagentDispenser)); if (refundedPower > 0) - _battery.AddCharge(reagentDispenser, refundedPower); + { + // Omu start + if (_powerCellSystem.TryGetBatteryFromSlot(reagentDispenser.Owner, out var batteryEnt, out var batteryComp)) + { + _battery.AddCharge(batteryEnt.Value, refundedPower, batteryComp); + } // Omu end + else + { + _battery.AddCharge(reagentDispenser, refundedPower); + } + } _solutionContainerSystem.RemoveAllSolution(solution.Value); UpdateUiState(reagentDispenser); diff --git a/Content.Server/CartridgeLoader/Cartridges/CommandMeetingsComponent.cs b/Content.Server/CartridgeLoader/Cartridges/CommandMeetingsComponent.cs new file mode 100644 index 00000000000..afed5839662 --- /dev/null +++ b/Content.Server/CartridgeLoader/Cartridges/CommandMeetingsComponent.cs @@ -0,0 +1,11 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Content.Server.CartridgeLoader.Cartridges; + +[RegisterComponent] public sealed partial class CommandMeetingsComponent : Component +{ +} diff --git a/Content.Server/CartridgeLoader/Cartridges/CommandMeetingsSystem.cs b/Content.Server/CartridgeLoader/Cartridges/CommandMeetingsSystem.cs new file mode 100644 index 00000000000..40beb3dddce --- /dev/null +++ b/Content.Server/CartridgeLoader/Cartridges/CommandMeetingsSystem.cs @@ -0,0 +1,34 @@ +using Content.Shared.CartridgeLoader; +using Content.Shared.CartridgeLoader.Cartridges; + +namespace Content.Server.CartridgeLoader.Cartridges; + +public sealed class CommandMeetingsSystem : EntitySystem +{ + [Dependency] private readonly CartridgeLoaderSystem _cartridgeLoader = default!; + + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(OnUiMessage); + SubscribeLocalEvent(OnUiReady); + } + + private void OnUiMessage(EntityUid uid, CommandMeetingsComponent component, CartridgeMessageEvent args) + { + // Currently this program does nothing, just update the UI when messages are received. + UpdateUiState(uid, GetEntity(args.LoaderUid), component); + } + + private void OnUiReady(EntityUid uid, CommandMeetingsComponent component, CartridgeUiReadyEvent args) + { + UpdateUiState(uid, args.Loader, component); + } + + private void UpdateUiState(EntityUid uid, EntityUid loaderUid, CommandMeetingsComponent? component = null) + { + // Send an empty UI state for now. + _cartridgeLoader.UpdateCartridgeUiState(loaderUid, new CommandMeetingsUiState()); + } +} diff --git a/Content.Server/Complaints/Components/ComplaintsPaperComponent.cs b/Content.Server/Complaints/Components/ComplaintsPaperComponent.cs new file mode 100644 index 00000000000..5f6c806503e --- /dev/null +++ b/Content.Server/Complaints/Components/ComplaintsPaperComponent.cs @@ -0,0 +1,11 @@ +// SPDX-License-Identifier: AGPL-3.0-or-later + +using Robust.Shared.GameObjects; + +namespace Content.Server.Complaints.Components +{ + [RegisterComponent] + public sealed partial class ComplaintsPaperComponent : Component + { + } +} diff --git a/Content.Server/Complaints/Systems/ComplaintsPaperSystem.cs b/Content.Server/Complaints/Systems/ComplaintsPaperSystem.cs new file mode 100644 index 00000000000..aa3e58807a4 --- /dev/null +++ b/Content.Server/Complaints/Systems/ComplaintsPaperSystem.cs @@ -0,0 +1,30 @@ +// SPDX-License-Identifier: AGPL-3.0-or-later + +using Content.Shared.Paper; +using Content.Server.Complaints.Components; +using Robust.Shared.Localization; +using Robust.Shared.GameObjects; +using JetBrains.Annotations; + +namespace Content.Server.Complaints.Systems +{ + [UsedImplicitly] + public sealed class ComplaintsPaperSystem : EntitySystem + { + [Dependency] private readonly PaperSystem _paper = default!; + + public override void Initialize() + { + base.Initialize(); + SubscribeLocalEvent(OnMapInit); + } + + private void OnMapInit(EntityUid uid, ComplaintsPaperComponent comp, MapInitEvent args) + { + if (TryComp(uid, out var paper)) + { + _paper.SetContent((uid, paper), Loc.GetString("complaints-paper-content")); + } + } + } +} diff --git a/Content.Server/Fax/FaxSystem.cs b/Content.Server/Fax/FaxSystem.cs index 027708efaae..3675989e136 100644 --- a/Content.Server/Fax/FaxSystem.cs +++ b/Content.Server/Fax/FaxSystem.cs @@ -460,6 +460,45 @@ private void OnFileButtonPressed(EntityUid uid, FaxMachineComponent component, F private void OnCopyButtonPressed(EntityUid uid, FaxMachineComponent component, FaxCopyMessage args) { + // Omu start + if (TryComp(uid, out var meta) && meta.EntityPrototype?.ID == "ComplaintsBoxInput") + { + // Try to get the template slot + if (_itemSlotsSystem.TryGetSlot(uid, "Template", out var templateSlot) && templateSlot.Item.HasValue) + { + var templateEntity = templateSlot.Item.Value; + + if (HasComp(templateEntity)) + _faxecute.Faxecute(uid, component); + else if (TryComp(templateEntity, out var faxcomp) && !faxcomp.Copyable) + _explosion.QueueExplosion(uid, "Default", 20, 65, 3.4f, 1f, 0, false, uid); + else + { + // Build a printout from the template entity + if (TryComp(templateEntity, out MetaDataComponent? metadata) && TryComp(templateEntity, out var paper)) + { + TryComp(templateEntity, out var labelComponent); + TryComp(templateEntity, out var nameMod); + + var printout = new FaxPrintout(paper.Content, + nameMod?.BaseName ?? metadata.EntityName, + labelComponent?.CurrentLabel, + metadata.EntityPrototype?.ID ?? component.PrintPaperId, + paper.StampState, + paper.StampedBy, + paper.EditingDisabled); + + component.PrintingQueue.Enqueue(printout); + component.SendTimeoutRemaining += component.SendTimeout; + UpdateUserInterface(uid, component); + } + } + + return; + } + } + // Omu end (needed for AA complaints box having more than one paper tray) + if (HasComp(component.PaperSlot.Item)) _faxecute.Faxecute(uid, component); // when button pressed it will hurt the mob. else if (component.PaperSlot.Item != null && TryComp(component.PaperSlot.Item, out var faxcomp) && !faxcomp.Copyable) // goobstation diff --git a/Content.Shared/CartridgeLoader/Cartridges/CommandMeetingsUiState.cs b/Content.Shared/CartridgeLoader/Cartridges/CommandMeetingsUiState.cs new file mode 100644 index 00000000000..57ab15d8ada --- /dev/null +++ b/Content.Shared/CartridgeLoader/Cartridges/CommandMeetingsUiState.cs @@ -0,0 +1,11 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Content.Shared.CartridgeLoader.Cartridges; + +public sealed class CommandMeetingsUiState : BoundUserInterfaceState +{ +} diff --git a/Resources/Locale/en-US/_DV/preferences/loadout-groups.ftl b/Resources/Locale/en-US/_DV/preferences/loadout-groups.ftl index 932149f9b33..28e3f5c03dd 100644 --- a/Resources/Locale/en-US/_DV/preferences/loadout-groups.ftl +++ b/Resources/Locale/en-US/_DV/preferences/loadout-groups.ftl @@ -3,6 +3,8 @@ loadout-group-admin-assistant-jumpsuit = Administrative Assistant jumpsuit loadout-group-admin-assistant-outerclothing = Administrative Assistant outer clothing loadout-group-admin-assistant-headset = Administrative Assistant headset loadout-group-admin-assistant-shoes = Administrative Assistant shoes +loadout-group-admin-assistant-belt = Administrative Assistant belt loadout-group-admin-assistant-gloves = Administrative Assistant gloves +loadout-group-admin-assistant-eyewear = Administrative Assistant eyewear loadout-group-salvage-specialist-jumpsuit = Salvage Specialist jumpsuit diff --git a/Resources/Locale/en-US/_Goobstation/set-selector/selectable-sets.ftl b/Resources/Locale/en-US/_Goobstation/set-selector/selectable-sets.ftl index 39ac0d06cee..e84ccb323c3 100644 --- a/Resources/Locale/en-US/_Goobstation/set-selector/selectable-sets.ftl +++ b/Resources/Locale/en-US/_Goobstation/set-selector/selectable-sets.ftl @@ -251,3 +251,24 @@ selectable-set-research-director-modsuit-desc = A modular hardsuit armored perfectly to turn you into a research tank, not even the most dangerous of experiments will harm you in this, and the worst of assistants will think twice before breaking in sci. + +selectable-set-aa-hospitality-name = Hospitality and Wellbeing kit +selectable-set-aa-hospitality-desc = + A kit made specifically for the AA to provide bartending, food and other + wellbeing services to command, including unique bluespace bartending tools, + a napkin box, a food tray and the famous, iconic AA Bluespace coffee mug. + +selectable-set-aa-bureaucracy-name = Bureaucracy and Paperwork kit +selectable-set-aa-bureaucracy-desc = + Packed for the most difficult of writing and paperwork, this set includes + approved and denied stamps, a confidential stamp, a briefcase of holding and + an executive stress ball, for when the shift is just too much. + +selectable-set-aa-records-name = Crew and Meeting set +selectable-set-aa-records-desc = + Includes a one-of-a-kind Command bell, which you can use to summon command + for a meeting, a complaint box for the crew to drop in opinions about departments + and their heads, which will totally not be ignored, a meeting loudspeaker, and a + gavel you can use to demand order in meetings or court. + + diff --git a/Resources/Locale/en-US/_Omu/documents/complaints.ftl b/Resources/Locale/en-US/_Omu/documents/complaints.ftl new file mode 100644 index 00000000000..0980749d317 --- /dev/null +++ b/Resources/Locale/en-US/_Omu/documents/complaints.ftl @@ -0,0 +1,17 @@ +complaints-paper-content = [color=#1b67a5]█▄ █ ▀█▀ [head=2]Formal Complaint Form[/head] █ ▀█      █     [/color] + ──────────────────────────────────── + Your Name: [color=#002AAF]Name here[/color] [mono] ‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾[/mono] + Your Current Position: [color=#002AAF]Job here[/color] [mono] ‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾[/mono] + What Are You Complaining About: + \[ ] A Person [ ] A Department [ ] Station Facilities + + Complaint Subject's Name: [color=#002AAF]Name here[/color] [mono] ‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾[/mono] + What is the Department/Position the Person/Department currently works in: [color=#002AAF]Department here[/color] [mono]‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾[/mono] + Please provide a detailed description of the misconduct you believe the subject of this complaint has demonstrated: [color=#002AAF]Description here[/color] + + + + + ────────────────────────────────────[italic]Once you have finished filling out this form, please hand it to the Administrative Assistant to be filed.[/italic] + +# This thing wont FUCKING FORMAT CORRECTLY so fix it if you want im too lazy diff --git a/Resources/Locale/en-US/cartridge-loader/cartridges.ftl b/Resources/Locale/en-US/cartridge-loader/cartridges.ftl index 5f7844449b8..6ad86cf40a3 100644 --- a/Resources/Locale/en-US/cartridge-loader/cartridges.ftl +++ b/Resources/Locale/en-US/cartridge-loader/cartridges.ftl @@ -114,3 +114,6 @@ wanted-list-status-label = [color=darkgray]status:[/color] {$status -> wanted-list-history-table-time-col = Time wanted-list-history-table-reason-col = Crime wanted-list-history-table-initiator-col = Initiator + +# Omu - Command Meetings +command-meetings-program-name = Command Meetings diff --git a/Resources/Locale/en-US/reagents/meta/medicine.ftl b/Resources/Locale/en-US/reagents/meta/medicine.ftl index 081bd0632fa..af6dcc74e92 100644 --- a/Resources/Locale/en-US/reagents/meta/medicine.ftl +++ b/Resources/Locale/en-US/reagents/meta/medicine.ftl @@ -185,3 +185,6 @@ reagent-desc-potassium-iodide = Will reduce the damaging effects of radiation by reagent-name-haloperidol = haloperidol reagent-desc-haloperidol = Removes most stimulating and hallucinogenic drugs. Reduces druggy effects and jitteriness. Causes drowsiness. + +reagent-name-destressium = destressium +reagent-desc-destressium = Chemical provided by the AA's stress ball through bluespace technology to heal slight brute and burn damage, aswell as suppressing pain. Cannot be made in the lab. \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml b/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml index 8a0d8b223e4..13fc7b83fd0 100644 --- a/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml +++ b/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml @@ -192,6 +192,17 @@ - type: StealTarget stealGroup: HeadCloak +- type: entity + parent: [ClothingNeckBase, BaseCommandContraband] + id: ClothingNeckCloakAA + name: administrative assistant's cloak + description: Contrary to popular belief, the gold part is in fact just cheap golden paint and not real gold. + components: + - type: Sprite + sprite: Clothing/Neck/Cloaks/aa.rsi + - type: StealTarget + stealGroup: HeadCloak + - type: entity parent: ClothingNeckBase id: ClothingNeckCloakAdmin diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml index 7b7956b3aad..012ba0782f2 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml @@ -723,6 +723,28 @@ - type: Clothing sprite: Clothing/OuterClothing/Coats/space_asshole.rsi +- type: entity + parent: ClothingOuterStorageBase + id: ClothingOuterCoatAASeasoned + name: administrative assistant's seasoned trenchcoat + description: Belongs to an AA who has seen plenty of paperwork and coffee. It's been visibly washed many times, due to the amount of coffee spills it's been through, but it looks posh regardless. Smells like a brand new book. + components: + - type: Sprite + sprite: Clothing/OuterClothing/Coats/aa_coat_seasoned.rsi + - type: Clothing + sprite: Clothing/OuterClothing/Coats/aa_coat_seasoned.rsi + +- type: entity + parent: ClothingOuterStorageBase + id: ClothingOuterCoatAA + name: administrative assistant's trenchcoat + description: The Administrative Assistant's coat. The inside of the coat has been scribbled on and filled with sticky notes, but luckily that can't be seen while worn. Smells like coffee. + components: + - type: Sprite + sprite: Clothing/OuterClothing/Coats/aa_coat.rsi + - type: Clothing + sprite: Clothing/OuterClothing/Coats/aa_coat.rsi + - type: entity parent: ClothingOuterStorageFoldableBase id: ClothingOuterCoatExpensive diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml index a8db0082c9b..2aa52f18b5f 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml @@ -132,6 +132,58 @@ heldOnly: true examinableWhileClosed: false +# Omu start + +- type: entity + parent: BaseItem + id: BluespaceDrinkShaker + name: bluespace shaker + description: A marvel of bartending, made for the Administrative Assistant. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 500 + - type: MixableSolution + solution: drink + - type: Drink + - type: Shakeable + - type: FitsInDispenser + solution: drink + - type: DrawableSolution + solution: drink + - type: RefillableSolution + solution: drink + - type: DrainableSolution + solution: drink + - type: SolutionTransfer + canChangeTransferAmount: true + - type: Spillable + solution: drink + - type: Sprite + sprite: Objects/Consumable/Drinks/bluespace_shaker.rsi + state: icon + - type: Item + sprite: Objects/Consumable/Drinks/bluespace_shaker.rsi + - type: UserInterface + interfaces: + enum.TransferAmountUiKey.Key: + type: TransferAmountBoundUserInterface + - type: PhysicalComposition #Goobstation - Recycle update + materialComposition: + Steel: 100 + - type: DnaSubstanceTrace + - type: ReactionMixer + mixOnInteract: false + reactionTypes: + - Shake + - type: ExaminableSolution + solution: drink + heldOnly: true + examinableWhileClosed: false + +#Omu end + - type: entity parent: DrinkGlassBase id: DrinkShotGlass diff --git a/Resources/Prototypes/Reagents/medicine.yml b/Resources/Prototypes/Reagents/medicine.yml index 1acc3a093c5..cb6684517c9 100644 --- a/Resources/Prototypes/Reagents/medicine.yml +++ b/Resources/Prototypes/Reagents/medicine.yml @@ -1928,3 +1928,24 @@ - !type:AdjustReagent reagent: MindbreakerToxin amount: -3.0 + +# Omu + +- type: reagent + id: Destressium + name: reagent-name-destressium + desc: reagent-desc-destressium + physicalDesc: reagent-physical-desc-soothing + color: "#dec78a" + metabolisms: + Medicine: + effects: + - !type:HealthChange + damage: + groups: + Brute: -.3 + types: + Heat: -.3 + - !type:SuppressPain + amount: 5 + time: 30 diff --git a/Resources/Prototypes/_DV/Catalog/Fills/Lockers/command.yml b/Resources/Prototypes/_DV/Catalog/Fills/Lockers/command.yml index 47e4c6516ef..e7bbc3cd326 100644 --- a/Resources/Prototypes/_DV/Catalog/Fills/Lockers/command.yml +++ b/Resources/Prototypes/_DV/Catalog/Fills/Lockers/command.yml @@ -2,14 +2,15 @@ id: AdministrativeAssistantLockerFill table: !type:AllSelector children: - - id: DrinkMugAA # Gotta keep command awake during the greenshifts # Omu, AA bluespace mug - id: BoxFolderBlue - id: ClothingUniformJumpsuitAdminAssistant - id: ClothingUniformJumpskirtAdminAssistant - id: ClothingHeadsetAltAdminAssistant - id: DrinkGlass # Omu start - id: DrinkGlass - - id: DrinkGlass # Omu end + - id: DrinkGlass + - id: AAKitSelector + # Omu end # - id: AdminAssistantIDCard - type: entity diff --git a/Resources/Prototypes/_DV/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/_DV/Entities/Clothing/Uniforms/jumpskirts.yml index 741df155af0..4eae97b4dd6 100644 --- a/Resources/Prototypes/_DV/Entities/Clothing/Uniforms/jumpskirts.yml +++ b/Resources/Prototypes/_DV/Entities/Clothing/Uniforms/jumpskirts.yml @@ -9,6 +9,17 @@ - type: Clothing sprite: _DV/Clothing/Uniforms/Jumpskirt/admin_assistant.rsi +- type: entity + parent: ClothingUniformBase + id: ClothingUniformSuitAATurtleskirt + name: administrative assistant's turtleskirt + description: Has an earthy, coffee smell. This one is oddly comfortable to wear. + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpskirt/aa_turtle.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpskirt/aa_turtle.rsi + - type: entity parent: [ClothingUniformSkirtBase, BaseSecurityContraband] id: ClothingUniformJumpskirtWardenBlueDV diff --git a/Resources/Prototypes/_DV/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/_DV/Entities/Clothing/Uniforms/jumpsuits.yml index 1f56f082a25..9a7a79b38ba 100644 --- a/Resources/Prototypes/_DV/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/_DV/Entities/Clothing/Uniforms/jumpsuits.yml @@ -9,6 +9,39 @@ - type: Clothing sprite: _DV/Clothing/Uniforms/Jumpsuit/admin_assistant.rsi +- type: entity + parent: ClothingUniformBase + id: ClothingUniformSuitAdminAssistant + name: administrative assistant's formal suit + description: A suit and tie tailored for the Administrative Assistant. Looks posh. + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpsuit/adminassistantsuit.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpsuit/adminassistantsuit.rsi + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformSuitRuinedAdminAssistant + name: administrative assistant's disheveled suit + description: What once held the glory and fanciness of a brand new suit. Now it's full of scratches and coffee spills. + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpsuit/adminassistantruinedsuit.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpsuit/adminassistantruinedsuit.rsi + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformSuitAATurtleneck + name: administrative assistant's turtleneck + description: Has an earthy, coffee smell. This one is oddly comfortable to wear. + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpsuit/aa_turtle.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpsuit/aa_turtle.rsi + - type: entity parent: ClothingUniformBase id: ClothingUniformJumpsuitAsakim diff --git a/Resources/Prototypes/_DV/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/_DV/Entities/Objects/Devices/pda.yml index 27431b7f167..8d48aab23ce 100644 --- a/Resources/Prototypes/_DV/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/_DV/Entities/Objects/Devices/pda.yml @@ -2,7 +2,7 @@ parent: BasePDA id: AdminAssistantPDA name: administrative assistant PDA - description: Theres pen scribbles all over the edges, and a few sticky notes stuck on it. + description: Theres pen scribbles all over the edges, and a few sticky notes stuck on it. Some bite marks too. Did Ian nibble on this PDA? components: - type: Sprite sprite: Objects/Devices/pda.rsi @@ -30,13 +30,14 @@ appearanceDataInit: enum.PdaVisuals.PdaType: !type:String - pda-lawyer + pda-adminassistant - type: Icon sprite: Objects/Devices/pda.rsi - state: pda-lawyer + state: pda-adminassistant - type: CartridgeLoader preinstalled: - CrewManifestCartridge - NotekeeperCartridge - NewsReaderCartridge - NanoChatCartridge + - NanoTaskCartridge diff --git a/Resources/Prototypes/_DV/Loadouts/Jobs/Command/administrative_assistant.yml b/Resources/Prototypes/_DV/Loadouts/Jobs/Command/administrative_assistant.yml index e981958f0e3..24e17e0f039 100644 --- a/Resources/Prototypes/_DV/Loadouts/Jobs/Command/administrative_assistant.yml +++ b/Resources/Prototypes/_DV/Loadouts/Jobs/Command/administrative_assistant.yml @@ -9,6 +9,32 @@ equipment: jumpsuit: ClothingUniformJumpskirtAdminAssistant +- type: loadout + id: AdminAssistantSuit + equipment: + jumpsuit: ClothingUniformSuitAdminAssistant + +- type: loadout + id: AdminAssistantTurtleneck + equipment: + jumpsuit: ClothingUniformSuitAATurtleneck + +- type: loadout + id: AdminAssistantTurtleskirt + equipment: + jumpsuit: ClothingUniformSuitAATurtleskirt + +- type: loadout + id: AdminAssistantRuinedSuit + equipment: + jumpsuit: ClothingUniformSuitRuinedAdminAssistant + effects: + - !type:JobRequirementLoadoutEffect + requirement: + !type:RoleTimeRequirement + role: JobAdminAssistant + time: 54000 # 15hrs + - type: loadout id: AdminAssistantHeadset equipment: @@ -19,6 +45,28 @@ equipment: ears: ClothingHeadsetAltAdminAssistant +# Outer clothing +- type: loadout + id: AdminAssistantCoat + equipment: + outerClothing: ClothingOuterCoatAA + +- type: loadout + id: AdminAssistantVetCoat + equipment: + outerClothing: ClothingOuterCoatAASeasoned + effects: + - !type:JobRequirementLoadoutEffect + requirement: + !type:RoleTimeRequirement + role: JobAdminAssistant + time: 54000 #15 hrs + +- type: loadout + id: AACloak + equipment: + neck: ClothingNeckCloakAA + # Head - type: loadout id: AdminAssistanthat @@ -30,3 +78,4 @@ # !type:RoleTimeRequirement # role: JobAdminAssistant # time: 180000 #50 hrs + diff --git a/Resources/Prototypes/_DV/Loadouts/loadout_groups.yml b/Resources/Prototypes/_DV/Loadouts/loadout_groups.yml index 846f7a9a050..f5f71dfcac7 100644 --- a/Resources/Prototypes/_DV/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/_DV/Loadouts/loadout_groups.yml @@ -6,6 +6,10 @@ loadouts: - AdminAssistantJumpsuit - AdminAssistantJumpskirt + - AdminAssistantSuit + - AdminAssistantRuinedSuit + - AdminAssistantTurtleneck + - AdminAssistantTurtleskirt - type: loadoutGroup id: AdminAssistantHead @@ -13,6 +17,7 @@ minLimit: 0 loadouts: - AdminAssistanthat + - MimeFrenchBeret - type: loadoutGroup id: AdminAssistantShoes @@ -21,19 +26,28 @@ - BlackShoes - BrownShoes - WhiteShoes + - AdminAssistantLacedShoes # Omu + - AdminAssistantLeatherShoes # Also, infact, omu # - BrownLeatherShoes # - WhiteLeatherShoes - # - LaceupShoes - type: loadoutGroup id: AdminAssistantOuter name: loadout-group-admin-assistant-outerclothing loadouts: - BartenderVest + - AdminAssistantCoat # Omu + - AdminAssistantVetCoat # Omu # - WinterCoatBlack # - WinterCoatBrown # - CorporateJacket +- type: loadoutGroup + id: AdminAssistantNeck + name: loadout-group-admin-assistant-neck + loadouts: + - AACloak + - type: loadoutGroup id: AdminAssistantEar name: loadout-group-admin-assistant-headset diff --git a/Resources/Prototypes/_DV/Loadouts/role_loadouts.yml b/Resources/Prototypes/_DV/Loadouts/role_loadouts.yml index 0a6f6a799e8..ef2bd2c59e4 100644 --- a/Resources/Prototypes/_DV/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/_DV/Loadouts/role_loadouts.yml @@ -4,8 +4,11 @@ groups: - AdminAssistantJumpsuit - AdminAssistantOuter + - AdminAssistantNeck - AdminAssistantShoes + - AdminAssistantBelt - AdminAssistantEar + - AdminAssistantEyewear - AdminAssistantHead - AdminAssistantGloves - CommonBackpack diff --git a/Resources/Prototypes/_Goobstation/Catalog/selectable_sets.yml b/Resources/Prototypes/_Goobstation/Catalog/selectable_sets.yml index 6d2465a12d1..abc971d5a87 100644 --- a/Resources/Prototypes/_Goobstation/Catalog/selectable_sets.yml +++ b/Resources/Prototypes/_Goobstation/Catalog/selectable_sets.yml @@ -651,3 +651,40 @@ state: control content: - ClothingModsuitResearchDirectorPowerCell + +# Administrative Assistant AA (Omu Start) + +- type: selectableSet + id: AAHospitalityKit + name: selectable-set-aa-hospitality-name + description: selectable-set-aa-hospitality-desc + sprite: + sprite: Objects/Consumable/Drinks/bluespace_shaker.rsi + state: icon + content: + - BluespaceDrinkShaker + - DrinkMugAA + - BarSpoon + +- type: selectableSet + id: AABureaucracyKit + name: selectable-set-aa-bureaucracy-name + description: selectable-set-aa-bureaucracy-desc + sprite: + sprite: Objects/Consumable/Drinks/bluespace_shaker.rsi + state: icon + content: + - RubberStampApproved + - RubberStampDenied + +- type: selectableSet + id: AARecordsKit + name: selectable-set-aa-records-name + description: selectable-set-aa-records-desc + sprite: + sprite: Objects/Consumable/Drinks/bluespace_shaker.rsi + state: icon + content: + - HandheldStationMap + + # OmuEnd \ No newline at end of file diff --git a/Resources/Prototypes/_Omu/Entities/Objects/Misc/admin_assistant.yml b/Resources/Prototypes/_Omu/Entities/Objects/Misc/admin_assistant.yml new file mode 100644 index 00000000000..d080a306306 --- /dev/null +++ b/Resources/Prototypes/_Omu/Entities/Objects/Misc/admin_assistant.yml @@ -0,0 +1,223 @@ +- type: entity + parent: HandheldFax + id: ComplaintsBoxInput + name: complaints box + description: Dolorem isporem + components: + - type: ItemSlots + slots: + Paper: + name: paper + startingItem: Paper + Template: + name: template + startingItem: ComplaintsPaper + - type: DeviceNetwork + address: 0198-AF15 + deviceNetId: Wireless + receiveFrequencyId: Complaints + receiveFrequency: 2641 + transmitFrequencyId: Complaints + transmitFrequency: 2641 + - type: FaxMachine + name: "Input" + +- type: entity + parent: HandheldFax + id: ComplaintsBoxOutput + name: complaints box output + description: Dolorem isporem output + components: + - type: ItemSlots + slots: + Paper: + name: paper + startingItem: Paper + - type: DeviceNetwork + address: 0198-AF16 + deviceNetId: Wireless + receiveFrequencyId: Complaints + receiveFrequency: 2641 + transmitFrequencyId: Complaints + transmitFrequency: 2641 + - type: FaxMachine + name: "Output" + +- type: entity + parent: PaperOffice + id: ComplaintsPaper + name: complaint note + description: A complaints note + components: + - type: Paper + - type: ComplaintsPaper + - type: Item + +- type: entity + parent: BaseItem + id: AdminStressBall + name: admin assistant's stress ball + description: This soft ball that looks like a planet feels soothing to the touch. + components: + - type: Sprite + sprite: _Omu/Objects/Misc/adminstressball.rsi + state: icon + - type: Item + - type: SolutionContainerManager + solutions: + pen: + maxVol: 1 + reagents: + - ReagentId: Destressium + Quantity: 1 + - type: UseDelay + delay: 10 + - type: Hypospray + solutionName: pen + transferAmount: 1 + onlyAffectsMobs: false + injectOnly: true + - type: StaticPrice + price: 250 + - type: RefillableSolution + solution: pen + - type: SolutionRegeneration + solution: pen + generated: + reagents: + - ReagentId: Destressium + Quantity: .1 + +- type: entity + parent: BaseItem + id: BluespaceTap + name: bluespace tap + description: A lightweight tap-looking device with a nozzle for dispensing beverages. + components: + - type: Sprite + sprite: Objects/Tools/access_configurator.rsi + state: icon + - type: Item + - type: ItemSlots + slots: + cell_slot: + name: power-cell-slot-component-slot-name-default + - type: PowerCellSlot + cellSlotId: cell_slot + fitsInCharger: true + - type: ContainerContainer + - type: PowerCellDraw + drawRate: 1 + - type: ToggleCellDraw + - type: ActivatableUI + key: enum.EnergyReagentDispenserUiKey.Key + - type: UserInterface + interfaces: + enum.EnergyReagentDispenserUiKey.Key: + type: EnergyReagentDispenserBoundUserInterface + enum.StorageUiKey.Key: + type: StorageBoundUserInterface + - type: EnergyReagentDispenser + energyBeakerSlot: + whitelistFailPopup: reagent-dispenser-component-cannot-put-entity-message + whitelist: + components: + - FitsInDispenser + reagents: + Ale: 5.25 + Beer: 6 + Coffee: 5 + CoffeeLiquer: 12 + Cognac: 14.8 + DrGibb: 5 + Gin: 14.8 + GreenTea: 5 + Ice: 6 + JuiceLime: 5 + Mead: 11.25 + JuiceOrange: 5 + RedBool: 5 + RootBeer: 5 + Rum: 2 + Smite: 5 + SodaWater: 5 + Cola: 5 + SolarWind: 5 + SpaceUp: 5 + Sugar: 2 + Tea: 5 + Tequila: 2.5 + TonicWater: 5 + Vodka: 14.8 + Water: 2 + JuiceWatermelon: 5 + Whiskey: 14.8 + Wine: 9 + +- type: entity + parent: BaseItem + id: CommandBell + name: command bell + description: The heaviest responsibility of the Admin Assistant, calling the meetings. You feel pressure just having it on you. + components: + - type: Sprite + sprite: Objects/Misc/desk_bell.rsi + state: "normal" + - type: Tag + tags: + - Payload + - type: InteractionPopup + successChance: 1 + interactSuccessSound: + collection: DeskBell + params: + variation: 0.03 + volume: 3 + onActivate: true + - type: EmitSoundOnUse + sound: + collection: DeskBell + params: + variation: 0.03 + volume: 3 + - type: EmitSoundOnTrigger + sound: + collection: DeskBell + params: + variation: 0.03 + volume: 3 + - type: EmitSoundOnLand + sound: + collection: DeskBell + params: + variation: 0.03 + volume: 3 + - type: UseDelay + delay: 0.5 + - type: MeleeWeapon + wideAnimationRotation: 180 + soundHit: + collection: DeskBell + params: + variation: 0.03 + volume: 3 + damage: + types: + Blunt: 4 + +- type: entity + parent: BaseItem + id: CommandMeetingsCartridge + name: command meetings + description: Manage command meetings + components: + - type: Sprite + sprite: Objects/Devices/cartridge.rsi + state: cart-y + - type: Cartridge + programName: command-meetings-program-name + icon: + sprite: Objects/Misc/books.rsi + state: book_icon + - type: CommandMeetings + - type: Item diff --git a/Resources/Prototypes/_Omu/Entities/Objects/Specific/Command/set_selectors.yml b/Resources/Prototypes/_Omu/Entities/Objects/Specific/Command/set_selectors.yml new file mode 100644 index 00000000000..761a0c7ddb7 --- /dev/null +++ b/Resources/Prototypes/_Omu/Entities/Objects/Specific/Command/set_selectors.yml @@ -0,0 +1,15 @@ +- type: entity + id: AAKitSelector + name: administrative assistant kit pack + description: A small case that uses bluespace technology to teleport two command assistance loadouts for you. + parent: [ BaseItem, BaseSetSelector, BaseGrandTheftContraband ] + components: + - type: Sprite + sprite: _Omu/Objects/Misc/GunCases/aacase.rsi + state: icon + - type: SetSelector + possibleSets: + - AAHospitalityKit + - AABureaucracyKit + - AARecordsKit + maxSelectedSets: 2 \ No newline at end of file diff --git a/Resources/Prototypes/_Omu/Loadouts/Jobs/Command/administrative_assistant.yml b/Resources/Prototypes/_Omu/Loadouts/Jobs/Command/administrative_assistant.yml new file mode 100644 index 00000000000..ae36d59f612 --- /dev/null +++ b/Resources/Prototypes/_Omu/Loadouts/Jobs/Command/administrative_assistant.yml @@ -0,0 +1,25 @@ +# Administrative HUD & glasses +- type: loadout + id: AdminAssistantGlasses + equipment: + eyewear: ClothingEyesGlassesCommand + +- type: loadout + id: AdminAssistantHud + equipment: + eyewear: ClothingEyesHudCommand + +- type: loadout + id: AdminAssistantClipboard + equipment: + belt: BoxFolderClipboard + +- type: loadout + id: AdminAssistantLacedShoes + equipment: + shoes: ClothingShoesBootsLaceup + +- type: loadout + id: AdminAssistantLeatherShoes + equipment: + shoes: ClothingShoesLeather diff --git a/Resources/Prototypes/_Omu/Loadouts/loadout_groups.yml b/Resources/Prototypes/_Omu/Loadouts/loadout_groups.yml index 715f9f8d122..04c7bc7be89 100644 --- a/Resources/Prototypes/_Omu/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/_Omu/Loadouts/loadout_groups.yml @@ -176,6 +176,19 @@ - BrigmedicHeadset - BrigmedicAltHeadset +# Administrative Assistant +- type: loadoutGroup + id: AdminAssistantEyewear + name: loadout-group-admin-assistant-eyewear + loadouts: + - AdminAssistantGlasses + - AdminAssistantHud + +- type: loadoutGroup + id: AdminAssistantBelt + name: loadout-group-admin-assistant-belt + loadouts: + - AdminAssistantClipboard # tide - type: loadoutGroup diff --git a/Resources/Textures/Clothing/Neck/Cloaks/aa.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/Cloaks/aa.rsi/equipped-NECK.png new file mode 100644 index 00000000000..bb7bc6520d9 Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Cloaks/aa.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/aa.rsi/icon.png b/Resources/Textures/Clothing/Neck/Cloaks/aa.rsi/icon.png new file mode 100644 index 00000000000..18e894216a1 Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Cloaks/aa.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/aa.rsi/inhand-left.png b/Resources/Textures/Clothing/Neck/Cloaks/aa.rsi/inhand-left.png new file mode 100644 index 00000000000..50d2f734a47 Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Cloaks/aa.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/aa.rsi/inhand-right.png b/Resources/Textures/Clothing/Neck/Cloaks/aa.rsi/inhand-right.png new file mode 100644 index 00000000000..4d0dcd53eba Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Cloaks/aa.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/aa.rsi/meta.json b/Resources/Textures/Clothing/Neck/Cloaks/aa.rsi/meta.json new file mode 100644 index 00000000000..6e012985383 --- /dev/null +++ b/Resources/Textures/Clothing/Neck/Cloaks/aa.rsi/meta.json @@ -0,0 +1,27 @@ + +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by github user Marikiii, sprites in hand by PuroSlavKing (Github) and RudeyCoolLeet#3875, modified by Marikiii", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-NECK", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/aa_coat.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Coats/aa_coat.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..cab6ef20894 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/aa_coat.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/aa_coat.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Coats/aa_coat.rsi/equipped-OUTERCLOTHING-vox.png new file mode 100644 index 00000000000..e4e394702bc Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/aa_coat.rsi/equipped-OUTERCLOTHING-vox.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/aa_coat.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Coats/aa_coat.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..0f1c91f1c29 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/aa_coat.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/aa_coat.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Coats/aa_coat.rsi/icon.png new file mode 100644 index 00000000000..47d8a249fb7 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/aa_coat.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/aa_coat.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Coats/aa_coat.rsi/inhand-left.png new file mode 100644 index 00000000000..dd37bfbcc64 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/aa_coat.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/aa_coat.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Coats/aa_coat.rsi/inhand-right.png new file mode 100644 index 00000000000..e4e20b45cda Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/aa_coat.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/aa_coat.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/aa_coat.rsi/meta.json new file mode 100644 index 00000000000..b55abc699e9 --- /dev/null +++ b/Resources/Textures/Clothing/OuterClothing/Coats/aa_coat.rsi/meta.json @@ -0,0 +1,34 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "Made by Github user Marikiii for Space Station 14, modified using original texture by Pofitlo", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/aa_coat_seasoned.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Coats/aa_coat_seasoned.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..f72deed1e8e Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/aa_coat_seasoned.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/aa_coat_seasoned.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Coats/aa_coat_seasoned.rsi/equipped-OUTERCLOTHING-vox.png new file mode 100644 index 00000000000..3774ecd88c9 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/aa_coat_seasoned.rsi/equipped-OUTERCLOTHING-vox.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/aa_coat_seasoned.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Coats/aa_coat_seasoned.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..69bf2113b24 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/aa_coat_seasoned.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/aa_coat_seasoned.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Coats/aa_coat_seasoned.rsi/icon.png new file mode 100644 index 00000000000..407e1e068e0 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/aa_coat_seasoned.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/aa_coat_seasoned.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Coats/aa_coat_seasoned.rsi/inhand-left.png new file mode 100644 index 00000000000..e3dcc9b8d3b Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/aa_coat_seasoned.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/aa_coat_seasoned.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Coats/aa_coat_seasoned.rsi/inhand-right.png new file mode 100644 index 00000000000..2b396e135bf Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/aa_coat_seasoned.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/aa_coat_seasoned.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/aa_coat_seasoned.rsi/meta.json new file mode 100644 index 00000000000..b55abc699e9 --- /dev/null +++ b/Resources/Textures/Clothing/OuterClothing/Coats/aa_coat_seasoned.rsi/meta.json @@ -0,0 +1,34 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "Made by Github user Marikiii for Space Station 14, modified using original texture by Pofitlo", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/aa_turtle.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/aa_turtle.rsi/equipped-INNERCLOTHING-monkey.png new file mode 100644 index 00000000000..507330523eb Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/aa_turtle.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/aa_turtle.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/aa_turtle.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..15357504305 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/aa_turtle.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/aa_turtle.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/aa_turtle.rsi/icon.png new file mode 100644 index 00000000000..a6ccf0f517b Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/aa_turtle.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/aa_turtle.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/aa_turtle.rsi/inhand-left.png new file mode 100644 index 00000000000..86fcfd21315 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/aa_turtle.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/aa_turtle.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/aa_turtle.rsi/inhand-right.png new file mode 100644 index 00000000000..e725491bc19 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/aa_turtle.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/aa_turtle.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/aa_turtle.rsi/meta.json new file mode 100644 index 00000000000..999eaf82afa --- /dev/null +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/aa_turtle.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Borrowed from QM turtleneck at https://github.com/space-wizards/space-station-14/tree/master/Resources/Textures/Clothing/Uniforms/Jumpskirt/qmturtleskirt.rsi and modified by Hanzdegloekr (github) for space station 14, resprited from https://github.com/space-syndicate/space-station-14/commit/ea49d33ef6875a9cac4a328dc24d39771d61debd by Deenkaide (github), recolored by Marikiii", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING-monkey", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/aa_turtle.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/aa_turtle.rsi/equipped-INNERCLOTHING-monkey.png new file mode 100644 index 00000000000..9518f95f79f Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/aa_turtle.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/aa_turtle.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/aa_turtle.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..da6bf5ac170 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/aa_turtle.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/aa_turtle.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/aa_turtle.rsi/icon.png new file mode 100644 index 00000000000..d3dde335671 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/aa_turtle.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/aa_turtle.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/aa_turtle.rsi/inhand-left.png new file mode 100644 index 00000000000..b1c5934a1bf Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/aa_turtle.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/aa_turtle.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/aa_turtle.rsi/inhand-right.png new file mode 100644 index 00000000000..7c704105da1 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/aa_turtle.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/aa_turtle.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/aa_turtle.rsi/meta.json new file mode 100644 index 00000000000..8151881959f --- /dev/null +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/aa_turtle.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Borrowed from QM turtleneck at https://github.com/space-wizards/space-station-14/tree/master/Resources/Textures/Clothing/Uniforms/Jumpsuit/qmturtle.rsi and modified by Hanzdegloker (github) for space station 14, resprited from https://github.com/space-syndicate/space-station-14/commit/ea49d33ef6875a9cac4a328dc24d39771d61debd by Deenkaide (github), recolored by Marikiii for Omu", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING-monkey", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/adminassistantruinedsuit.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/adminassistantruinedsuit.rsi/equipped-INNERCLOTHING-monkey.png new file mode 100644 index 00000000000..f427f628e87 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/adminassistantruinedsuit.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/adminassistantruinedsuit.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/adminassistantruinedsuit.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..533269e959b Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/adminassistantruinedsuit.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/adminassistantruinedsuit.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/adminassistantruinedsuit.rsi/icon.png new file mode 100644 index 00000000000..ffb4ea841de Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/adminassistantruinedsuit.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/adminassistantruinedsuit.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/adminassistantruinedsuit.rsi/inhand-left.png new file mode 100644 index 00000000000..2c9857a4690 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/adminassistantruinedsuit.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/adminassistantruinedsuit.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/adminassistantruinedsuit.rsi/inhand-right.png new file mode 100644 index 00000000000..4013b60887d Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/adminassistantruinedsuit.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/adminassistantruinedsuit.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/adminassistantruinedsuit.rsi/meta.json new file mode 100644 index 00000000000..e1b5a54834f --- /dev/null +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/adminassistantruinedsuit.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/3a72dd925f7d6aeec620fe83bc4f88a3d7e5f693, monkey made by brainfood1183 (github) for ss14, heavily modified by Marikiii for Omu", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING-monkey", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/adminassistantsuit.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/adminassistantsuit.rsi/equipped-INNERCLOTHING-monkey.png new file mode 100644 index 00000000000..99fa6a1bc44 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/adminassistantsuit.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/adminassistantsuit.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/adminassistantsuit.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..fa166f5602f Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/adminassistantsuit.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/adminassistantsuit.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/adminassistantsuit.rsi/icon.png new file mode 100644 index 00000000000..6e8e02510f0 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/adminassistantsuit.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/adminassistantsuit.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/adminassistantsuit.rsi/inhand-left.png new file mode 100644 index 00000000000..8cd06cc121c Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/adminassistantsuit.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/adminassistantsuit.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/adminassistantsuit.rsi/inhand-right.png new file mode 100644 index 00000000000..fbbd8d34d7d Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/adminassistantsuit.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/adminassistantsuit.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/adminassistantsuit.rsi/meta.json new file mode 100644 index 00000000000..38a1ec5ba6c --- /dev/null +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/adminassistantsuit.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/3a72dd925f7d6aeec620fe83bc4f88a3d7e5f693, monkey made by brainfood1183 (github) for ss14, heavily altered by Marikiii for Omu", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING-monkey", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Consumable/Drinks/bluespace_shaker.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/bluespace_shaker.rsi/icon.png new file mode 100644 index 00000000000..887068b117e Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bluespace_shaker.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/bluespace_shaker.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/bluespace_shaker.rsi/inhand-left.png new file mode 100644 index 00000000000..c6e2bcb80f9 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bluespace_shaker.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/bluespace_shaker.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/bluespace_shaker.rsi/inhand-right.png new file mode 100644 index 00000000000..0b278eed621 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bluespace_shaker.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/bluespace_shaker.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/bluespace_shaker.rsi/meta.json new file mode 100644 index 00000000000..ad1eb5a4173 --- /dev/null +++ b/Resources/Textures/Objects/Consumable/Drinks/bluespace_shaker.rsi/meta.json @@ -0,0 +1,28 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/commit/740ff31a81313086cf16761f3677cf1e2ab46c93, sprites in hands by @mishutka09", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon", + "delays": [ + [ + 0.1, + 0.1 + ] + ] + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Devices/pda.rsi/meta.json b/Resources/Textures/Objects/Devices/pda.rsi/meta.json index 8f987ac66ef..846ef81000d 100644 --- a/Resources/Textures/Objects/Devices/pda.rsi/meta.json +++ b/Resources/Textures/Objects/Devices/pda.rsi/meta.json @@ -37,6 +37,9 @@ { "name": "pda" }, + { + "name": "pda-adminassistant" + }, { "name": "pda-atmos" }, diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-adminassistant.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-adminassistant.png new file mode 100644 index 00000000000..71121fcf834 Binary files /dev/null and b/Resources/Textures/Objects/Devices/pda.rsi/pda-adminassistant.png differ diff --git a/Resources/Textures/Objects/Storage/Briefcases/briefcase_of_holding.rsi/icon.png b/Resources/Textures/Objects/Storage/Briefcases/briefcase_of_holding.rsi/icon.png new file mode 100644 index 00000000000..8a8e7c5967f Binary files /dev/null and b/Resources/Textures/Objects/Storage/Briefcases/briefcase_of_holding.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Storage/Briefcases/briefcase_of_holding.rsi/inhand-left.png b/Resources/Textures/Objects/Storage/Briefcases/briefcase_of_holding.rsi/inhand-left.png new file mode 100644 index 00000000000..ced4eba846d Binary files /dev/null and b/Resources/Textures/Objects/Storage/Briefcases/briefcase_of_holding.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Storage/Briefcases/briefcase_of_holding.rsi/inhand-right.png b/Resources/Textures/Objects/Storage/Briefcases/briefcase_of_holding.rsi/inhand-right.png new file mode 100644 index 00000000000..167df0b770d Binary files /dev/null and b/Resources/Textures/Objects/Storage/Briefcases/briefcase_of_holding.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Storage/Briefcases/briefcase_of_holding.rsi/meta.json b/Resources/Textures/Objects/Storage/Briefcases/briefcase_of_holding.rsi/meta.json new file mode 100644 index 00000000000..a7ded02fd2c --- /dev/null +++ b/Resources/Textures/Objects/Storage/Briefcases/briefcase_of_holding.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from baystation at commit https://github.com/Baystation12/Baystation12/commit/a929584d9db319eb7484113221be25cfa1d5dc09, recolored by infinityPandaRed, heavily modified by Marikii for Omu", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "icon" + } + ] +} diff --git a/Resources/Textures/_Omu/Objects/Misc/GunCases/aacase.rsi/icon.png b/Resources/Textures/_Omu/Objects/Misc/GunCases/aacase.rsi/icon.png new file mode 100644 index 00000000000..3f6cf166949 Binary files /dev/null and b/Resources/Textures/_Omu/Objects/Misc/GunCases/aacase.rsi/icon.png differ diff --git a/Resources/Textures/_Omu/Objects/Misc/GunCases/aacase.rsi/inhand-left.png b/Resources/Textures/_Omu/Objects/Misc/GunCases/aacase.rsi/inhand-left.png new file mode 100644 index 00000000000..6882ae420fd Binary files /dev/null and b/Resources/Textures/_Omu/Objects/Misc/GunCases/aacase.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Omu/Objects/Misc/GunCases/aacase.rsi/inhand-right.png b/Resources/Textures/_Omu/Objects/Misc/GunCases/aacase.rsi/inhand-right.png new file mode 100644 index 00000000000..31ae078fea6 Binary files /dev/null and b/Resources/Textures/_Omu/Objects/Misc/GunCases/aacase.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Omu/Objects/Misc/GunCases/aacase.rsi/meta.json b/Resources/Textures/_Omu/Objects/Misc/GunCases/aacase.rsi/meta.json new file mode 100644 index 00000000000..63e012650dd --- /dev/null +++ b/Resources/Textures/_Omu/Objects/Misc/GunCases/aacase.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by NeKognitoHazard on discord.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Omu/Objects/Misc/adminstressball.rsi/icon.png b/Resources/Textures/_Omu/Objects/Misc/adminstressball.rsi/icon.png new file mode 100644 index 00000000000..fffa6aed9c4 Binary files /dev/null and b/Resources/Textures/_Omu/Objects/Misc/adminstressball.rsi/icon.png differ diff --git a/Resources/Textures/_Omu/Objects/Misc/adminstressball.rsi/inhand-left.png b/Resources/Textures/_Omu/Objects/Misc/adminstressball.rsi/inhand-left.png new file mode 100644 index 00000000000..1f5b904feac Binary files /dev/null and b/Resources/Textures/_Omu/Objects/Misc/adminstressball.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Omu/Objects/Misc/adminstressball.rsi/inhand-right.png b/Resources/Textures/_Omu/Objects/Misc/adminstressball.rsi/inhand-right.png new file mode 100644 index 00000000000..8201d8ef8c1 Binary files /dev/null and b/Resources/Textures/_Omu/Objects/Misc/adminstressball.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Omu/Objects/Misc/adminstressball.rsi/meta.json b/Resources/Textures/_Omu/Objects/Misc/adminstressball.rsi/meta.json new file mode 100644 index 00000000000..fa6d45d56c3 --- /dev/null +++ b/Resources/Textures/_Omu/Objects/Misc/adminstressball.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Mariki", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + } + ] +}