From 1acc84c21c26dd479b57bcdc007a5172dddc7ed1 Mon Sep 17 00:00:00 2001 From: ThereDrD0 <88589686+ThereDrD0@users.noreply.github.com> Date: Tue, 23 Jul 2024 20:37:15 +0300 Subject: [PATCH] Cherry picks 6 (#486) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * inital * force them to WRITE * b * new system * aaaa * b * bbbb * translations * add tts support for evacuation reason * PaddedStool_Sprite&Prototype 8 colors of pudded stool. * PaddedStool_Crafting * ComfyChair_Sprites&Prototype * ComfyChair_Crafting * Sofa_Sprites&Prototype * Sofa_Crafting * Sofa_SpriteFix * Sofa_RemoveSomeSprites * Revert "Sofa_RemoveSomeSprites" This reverts commit b110e9bda9a75cf6337c4efacd4888967d0e1fe6. * Revert "Sofa_SpriteFix" This reverts commit bfa8a17c16c57d2f70d64eb8dd54ae94ac48b248. * Revert "Sofa_Crafting" This reverts commit 89daadcb1e9d45a84281a5fdf998ab6c6f6b0f9b. * Revert "Sofa_Sprites&Prototype" This reverts commit 73cd0be403e03b1852a4632e1b6a8ca7526c5622. * Revert "ComfyChair_Crafting" This reverts commit 940f9665dd998090b43bca596ef3800c0c6ba89b. * Revert "ComfyChair_Sprites&Prototype" This reverts commit 2c909de5d3e3f4ab5efa1cbef6b5feda32d05a80. * Revert "PaddedStool_Crafting" This reverts commit 82040ba82c0190f2a52614fd3573e77586d73802. * Revert "PaddedStool_Sprite&Prototype" This reverts commit c5241a03ffeccbb4a18ab0f108d05c4fe1e047ba. * Sprites&Meta * Crafting * Tweaks * PaddedStool_tweaks * Add Random Spawners * remove old colored chairs * Sprites&Meta * Changing prototypes * Adding to Theater vend * Sprite_Change * Sprite_Change * Prototype_Changes Is this exactly how it should be?... * add bouquet * Not very useful functionality has been removed * Update toys.yml * Now you need cloth to made bouquet * Update toys.yml * I hope. I done right * Update toys.yml * Update bouquet.yml * Update toys.yml * Update Resources/Prototypes/Recipes/Crafting/Graphs/toys.yml Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com> * add musician jumpskirt to loadouts * better bouquet * pAIs can now be inserted into plushies. * No more bad bleed * More Tourniquets, hopefully fixed YML check. * deals a bit of bloodloss * Reduce Stack Count. * fix tourniquet * add migrations for old chair types and add few new --------- Co-authored-by: Mr. 27 Co-authored-by: Арт <123451459+JustArt1m@users.noreply.github.com> Co-authored-by: Green resomi <135062489+Yeah-I-listening-Hollywood-undead@users.noreply.github.com> Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com> Co-authored-by: Moomoobeef Co-authored-by: PoorMansDreams --- ...CommunicationsConsoleBoundUserInterface.cs | 1 + .../UI/CommunicationsConsoleMenu.xaml.cs | 19 + .../CommunicationsConsoleSystem.cs | 30 +- Content.Server/RoundEnd/RoundEndSystem.cs | 28 +- .../communications-console-component.ftl | 2 + .../en-US/round-end/round-end-system.ftl | 6 +- .../communications-console-component.ftl | 2 + .../_white/round-end/round-end-system.ftl | 5 + .../VendingMachines/Inventories/medical.yml | 1 + .../Entities/Clothing/Uniforms/jumpskirts.yml | 11 + .../Markers/Spawners/Random/furniture.yml | 41 ++ .../Prototypes/Entities/Objects/Fun/toys.yml | 11 + .../Entities/Objects/Misc/bouquet.yml | 54 +++ .../Objects/Specific/Medical/healing.yml | 15 +- .../Entities/Structures/Furniture/chairs.yml | 279 +++++++++++++- .../Loadouts/Jobs/Civilian/musician.yml | 8 + .../Prototypes/Loadouts/loadout_groups.yml | 1 + .../Construction/Graphs/furniture/seats.yml | 349 +++++++++++++++++- .../Recipes/Construction/furniture.yml | 326 +++++++++++++++- .../Recipes/Crafting/Graphs/toys.yml | 39 ++ .../Prototypes/Recipes/Crafting/toys.yml | 11 + .../Prototypes/Stacks/medical_stacks.yml | 8 + .../_White/Object/colored_armchairs.yml | 83 +---- .../musician.rsi/equipped-INNERCLOTHING.png | Bin 0 -> 1134 bytes .../Uniforms/Jumpskirt/musician.rsi/icon.png | Bin 0 -> 451 bytes .../Jumpskirt/musician.rsi/inhand-left.png | Bin 0 -> 658 bytes .../Jumpskirt/musician.rsi/inhand-right.png | Bin 0 -> 646 bytes .../Uniforms/Jumpskirt/musician.rsi/meta.json | 26 ++ .../Objects/Misc/poppybouquet.rsi/icon.png | Bin 0 -> 2538 bytes .../Misc/poppybouquet.rsi/inhand-left.png | Bin 0 -> 5266 bytes .../Misc/poppybouquet.rsi/inhand-right.png | Bin 0 -> 5285 bytes .../Objects/Misc/poppybouquet.rsi/meta.json | 22 ++ .../Furniture/chairs.rsi/comfy-greyscale.png | Bin 0 -> 1084 bytes .../Furniture/chairs.rsi/comfy-overlay.png | Bin 567 -> 0 bytes .../Furniture/chairs.rsi/comfy-random.png | Bin 0 -> 1559 bytes .../Structures/Furniture/chairs.rsi/comfy.png | Bin 1201 -> 0 bytes .../Structures/Furniture/chairs.rsi/meta.json | 205 +++++----- .../chairs.rsi/pufi-box-greyscale.png | Bin 0 -> 346 bytes .../Furniture/chairs.rsi/pufi-box-random.png | Bin 0 -> 862 bytes Resources/migration.yml | 13 +- 40 files changed, 1375 insertions(+), 221 deletions(-) create mode 100644 Resources/Locale/ru-RU/_white/communications/communications-console-component.ftl create mode 100644 Resources/Locale/ru-RU/_white/round-end/round-end-system.ftl create mode 100644 Resources/Prototypes/Entities/Markers/Spawners/Random/furniture.yml create mode 100644 Resources/Prototypes/Entities/Objects/Misc/bouquet.yml create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpskirt/musician.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpskirt/musician.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpskirt/musician.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpskirt/musician.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpskirt/musician.rsi/meta.json create mode 100644 Resources/Textures/Objects/Misc/poppybouquet.rsi/icon.png create mode 100644 Resources/Textures/Objects/Misc/poppybouquet.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Misc/poppybouquet.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Misc/poppybouquet.rsi/meta.json create mode 100644 Resources/Textures/Structures/Furniture/chairs.rsi/comfy-greyscale.png delete mode 100644 Resources/Textures/Structures/Furniture/chairs.rsi/comfy-overlay.png create mode 100644 Resources/Textures/Structures/Furniture/chairs.rsi/comfy-random.png delete mode 100644 Resources/Textures/Structures/Furniture/chairs.rsi/comfy.png create mode 100644 Resources/Textures/Structures/Furniture/chairs.rsi/pufi-box-greyscale.png create mode 100644 Resources/Textures/Structures/Furniture/chairs.rsi/pufi-box-random.png diff --git a/Content.Client/Communications/UI/CommunicationsConsoleBoundUserInterface.cs b/Content.Client/Communications/UI/CommunicationsConsoleBoundUserInterface.cs index 1c94d32bf8..73488eaea3 100644 --- a/Content.Client/Communications/UI/CommunicationsConsoleBoundUserInterface.cs +++ b/Content.Client/Communications/UI/CommunicationsConsoleBoundUserInterface.cs @@ -3,6 +3,7 @@ using Content.Shared.Chat; using Content.Shared.Communications; using Robust.Shared.Configuration; using Robust.Shared.Timing; +using Robust.Shared.Prototypes; namespace Content.Client.Communications.UI { diff --git a/Content.Client/Communications/UI/CommunicationsConsoleMenu.xaml.cs b/Content.Client/Communications/UI/CommunicationsConsoleMenu.xaml.cs index 90643e45cf..db42618776 100644 --- a/Content.Client/Communications/UI/CommunicationsConsoleMenu.xaml.cs +++ b/Content.Client/Communications/UI/CommunicationsConsoleMenu.xaml.cs @@ -1,7 +1,9 @@ using Content.Client.UserInterface.Controls; using System.Threading; +using Content.Shared.CCVar; using Robust.Client.AutoGenerated; using Robust.Client.UserInterface.XAML; +using Robust.Shared.Configuration; using Robust.Shared.Utility; using Timer = Robust.Shared.Timing.Timer; @@ -13,6 +15,8 @@ namespace Content.Client.Communications.UI private CommunicationsConsoleBoundUserInterface Owner { get; set; } private readonly CancellationTokenSource _timerCancelTokenSource = new(); + [Dependency] private readonly IConfigurationManager _cfg = default!; + public CommunicationsConsoleMenu(CommunicationsConsoleBoundUserInterface owner) { IoCManager.InjectDependencies(this); @@ -23,6 +27,21 @@ namespace Content.Client.Communications.UI var loc = IoCManager.Resolve(); MessageInput.Placeholder = new Rope.Leaf(loc.GetString("comms-console-menu-announcement-placeholder")); + var maxAnnounceLength = _cfg.GetCVar(CCVars.ChatMaxAnnouncementLength); + MessageInput.OnTextChanged += (args) => + { + if (args.Control.TextLength > maxAnnounceLength) + { + AnnounceButton.Disabled = true; + AnnounceButton.ToolTip = Loc.GetString("comms-console-message-too-long"); + } + else + { + AnnounceButton.Disabled = !owner.CanAnnounce; + AnnounceButton.ToolTip = null; + } + }; + AnnounceButton.OnPressed += (_) => Owner.AnnounceButtonPressed(Rope.Collapse(MessageInput.TextRope)); AnnounceButton.Disabled = !owner.CanAnnounce; diff --git a/Content.Server/Communications/CommunicationsConsoleSystem.cs b/Content.Server/Communications/CommunicationsConsoleSystem.cs index 174ef80ed9..ef095e3619 100644 --- a/Content.Server/Communications/CommunicationsConsoleSystem.cs +++ b/Content.Server/Communications/CommunicationsConsoleSystem.cs @@ -9,7 +9,7 @@ using Content.Server.DeviceNetwork.Systems; using Content.Server.Interaction; using Content.Server.Popups; using Content.Server.RoundEnd; -using Content.Server.Screens; +using Robust.Shared.Player; using Content.Server.Screens.Components; using Content.Server.Shuttles.Systems; using Content.Server.Station.Components; @@ -27,6 +27,7 @@ using Content.Shared.Popups; using Content.Shared._White; using Robust.Server.GameObjects; using Robust.Shared.Configuration; +using Content.Server.Administration; namespace Content.Server.Communications { @@ -45,6 +46,7 @@ namespace Content.Server.Communications [Dependency] private readonly UserInterfaceSystem _uiSystem = default!; [Dependency] private readonly IConfigurationManager _cfg = default!; [Dependency] private readonly IAdminLogManager _adminLogger = default!; + [Dependency] private readonly QuickDialogSystem _quickDialog = default!; private const float UIUpdateInterval = 5.0f; @@ -332,7 +334,7 @@ namespace Content.Server.Communications if (!CanUse(mob, uid)) { - _popupSystem.PopupEntity(Loc.GetString("comms-console-permission-denied"), uid, message.Session); + _popupSystem.PopupEntity(Loc.GetString("comms-console-permission-denied"), uid, mob); return; } @@ -340,12 +342,30 @@ namespace Content.Server.Communications RaiseLocalEvent(ref ev); if (ev.Cancelled) { - _popupSystem.PopupEntity(ev.Reason ?? Loc.GetString("comms-console-shuttle-unavailable"), uid, message.Session); + _popupSystem.PopupEntity(ev.Reason ?? Loc.GetString("comms-console-shuttle-unavailable"), uid, mob); return; } - _roundEndSystem.RequestRoundEnd(uid); - _adminLogger.Add(LogType.Action, LogImpact.Extreme, $"{ToPrettyString(mob):player} has called the shuttle."); + if (!TryComp(mob, out var actor)) + return; + + _quickDialog.OpenDialog(actor.PlayerSession, Loc.GetString("comms-console-window-text"), "Reason", (LongString message) => + { + if (!CanUse(mob, uid)) + { + _popupSystem.PopupEntity(Loc.GetString("comms-console-permission-denied"), uid, mob); + return; + } + + _roundEndSystem.RequestRoundEnd(uid, text: "round-end-system-shuttle-called-announcement-reason", reason: message); + + //WD-start + var ttsEv = new TTSAnnouncementEvent(message, comp.TtsVoiceId, uid, comp.Global); + RaiseLocalEvent(ttsEv); + //WD-end + + _adminLogger.Add(LogType.Action, LogImpact.Extreme, $"{ToPrettyString(mob):player} has called the shuttle."); + }); } private void OnRecallShuttleMessage(EntityUid uid, CommunicationsConsoleComponent comp, CommunicationsConsoleRecallEmergencyShuttleMessage message) diff --git a/Content.Server/RoundEnd/RoundEndSystem.cs b/Content.Server/RoundEnd/RoundEndSystem.cs index cf90f9b84f..3269074769 100644 --- a/Content.Server/RoundEnd/RoundEndSystem.cs +++ b/Content.Server/RoundEnd/RoundEndSystem.cs @@ -141,7 +141,8 @@ namespace Content.Server.RoundEnd EntityUid? requester = null, bool checkCooldown = true, string text = "round-end-system-shuttle-called-announcement", - string name = "Station") + string name = "Station", + string? reason = null) { var duration = DefaultCountdownDuration; @@ -156,7 +157,7 @@ namespace Content.Server.RoundEnd } } - RequestRoundEnd(duration, requester, checkCooldown, text, name); + RequestRoundEnd(duration, requester, checkCooldown, text, name, reason); } public void RequestRoundEnd( @@ -164,7 +165,8 @@ namespace Content.Server.RoundEnd EntityUid? requester = null, bool checkCooldown = true, string text = "round-end-system-shuttle-called-announcement", - string name = "Station") + string name = "Station", + string? reason = null) { if (_gameTicker.RunLevel != GameRunLevel.InRound) return; @@ -202,13 +204,23 @@ namespace Content.Server.RoundEnd units = "eta-units-minutes"; } - _chatSystem.DispatchGlobalAnnouncement(Loc.GetString(text, + if (reason == null) + _chatSystem.DispatchGlobalAnnouncement(Loc.GetString(text, ("time", time), ("units", Loc.GetString(units))), - name, - false, - null, - Color.Gold); + name, + false, + null, + Color.Gold); + else + _chatSystem.DispatchGlobalAnnouncement(Loc.GetString(text, + ("time", time), + ("units", Loc.GetString(units)), + ("reason", reason)), + name, + false, + null, + Color.Gold); _audio.PlayGlobal("/Audio/Announcements/shuttlecalled.ogg", Filter.Broadcast(), true); diff --git a/Resources/Locale/en-US/communications/communications-console-component.ftl b/Resources/Locale/en-US/communications/communications-console-component.ftl index f7cc87cb8b..3485906519 100644 --- a/Resources/Locale/en-US/communications/communications-console-component.ftl +++ b/Resources/Locale/en-US/communications/communications-console-component.ftl @@ -5,10 +5,12 @@ comms-console-menu-announcement-button = Announce comms-console-menu-broadcast-button = Broadcast comms-console-menu-call-shuttle = Call emergency shuttle comms-console-menu-recall-shuttle = Recall emergency shuttle +comms-console-window-text = Enter the nature of emergency # Popup comms-console-permission-denied = Permission denied comms-console-shuttle-unavailable = Shuttle is currently unavailable +comms-console-message-too-long = Message is too long # Placeholder values comms-console-announcement-sent-by = Sent by diff --git a/Resources/Locale/en-US/round-end/round-end-system.ftl b/Resources/Locale/en-US/round-end/round-end-system.ftl index f86851506b..d1afaf1ea8 100644 --- a/Resources/Locale/en-US/round-end/round-end-system.ftl +++ b/Resources/Locale/en-US/round-end/round-end-system.ftl @@ -1,6 +1,10 @@ ## RoundEndSystem -round-end-system-shuttle-called-announcement = An emergency shuttle has been sent. ETA: {$time} {$units}. +round-end-system-shuttle-called-announcement = An emergency shuttle has been sent. ETA: {$time} {$units}. +round-end-system-shuttle-called-announcement-reason = + An emergency shuttle has been sent. ETA: {$time} {$units}. + + Nature of emergency: {$reason} round-end-system-shuttle-already-called-announcement = An emergency shuttle has already been sent. round-end-system-shuttle-auto-called-announcement = An automatic crew shift change shuttle has been sent. ETA: {$time} {$units}. Recall the shuttle to extend the shift. round-end-system-shuttle-recalled-announcement = The emergency shuttle has been recalled. diff --git a/Resources/Locale/ru-RU/_white/communications/communications-console-component.ftl b/Resources/Locale/ru-RU/_white/communications/communications-console-component.ftl new file mode 100644 index 0000000000..2ec62606c0 --- /dev/null +++ b/Resources/Locale/ru-RU/_white/communications/communications-console-component.ftl @@ -0,0 +1,2 @@ +comms-console-window-text = Введите причину вызова эвакуации +comms-console-message-too-long = Сообщение слишком длинное diff --git a/Resources/Locale/ru-RU/_white/round-end/round-end-system.ftl b/Resources/Locale/ru-RU/_white/round-end/round-end-system.ftl new file mode 100644 index 0000000000..4023c05040 --- /dev/null +++ b/Resources/Locale/ru-RU/_white/round-end/round-end-system.ftl @@ -0,0 +1,5 @@ +round-end-system-shuttle-called-announcement = Эвакуационный шаттл был вызван. Он прибудет через: {$time} {$units}. +round-end-system-shuttle-called-announcement-reason = + Эвакуационный шаттл был вызван. Он прибудет через: {$time} {$units}. + + Причина: {$reason} diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/medical.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/medical.yml index 82bb1ffc2e..7667a385e2 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/medical.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/medical.yml @@ -6,6 +6,7 @@ Ointment: 2 Bloodpack: 2 Gauze: 2 + Tourniquet: 5 EpinephrineChemistryBottle: 1 Syringe: 2 EmergencyMedipen: 2 diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml index 37875420d7..eff2b56be0 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml @@ -788,3 +788,14 @@ sprite: Clothing/Uniforms/Jumpskirt/inspectorformal.rsi - type: Clothing sprite: Clothing/Uniforms/Jumpskirt/inspectorformal.rsi + +- type: entity + parent: ClothingUniformSkirtBase + id: ClothingUniformJumpskirtMusician + name: musician's skirt + description: A fancy skirt for the musically inclined. Perfect for any lounge act! + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpskirt/musician.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpskirt/musician.rsi diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/furniture.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/furniture.yml new file mode 100644 index 0000000000..2236a0a776 --- /dev/null +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/furniture.yml @@ -0,0 +1,41 @@ +- type: entity + name: random comfy spawner + id: RandomComfySpawner + parent: MarkerBase + components: + - type: Sprite + layers: + - sprite: Structures/Furniture/chairs.rsi + state: comfy-random + - type: RandomSpawner + prototypes: + - BlackComfyChair + - BlueComfyChair + - GreenComfyChair + - OrangeComfyChair + - PinkComfyChair + - PurpleComfyChair + - RedComfyChair + - WhiteComfyChair + chance: 1 + +- type: entity + name: random padded stool spawner + id: RandomPaddedStoolSpawner + parent: MarkerBase + components: + - type: Sprite + layers: + - sprite: Structures/Furniture/chairs.rsi + state: pufi-box-random + - type: RandomSpawner + prototypes: + - BlackPaddedStool + - BluePaddedStool + - GreenPaddedStool + - OrangePaddedStool + - PinkPaddedStool + - PurplePaddedStool + - RedPaddedStool + - WhitePaddedStool + chance: 1 \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml index b31dd992bd..efc0636ff8 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml @@ -52,6 +52,17 @@ reagents: - ReagentId: Fiber Quantity: 10 + - type: ItemSlots + slots: + item: + ejectSound: + collection: storageRustle + insertSound: + collection: storageRustle + #name: plushie-inserted-pai + whitelist: + components: + - PAI - type: entity parent: BasePlushie diff --git a/Resources/Prototypes/Entities/Objects/Misc/bouquet.yml b/Resources/Prototypes/Entities/Objects/Misc/bouquet.yml new file mode 100644 index 0000000000..fbea7eb812 --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Misc/bouquet.yml @@ -0,0 +1,54 @@ +- type: entity + name: PoppyBouquet + parent: FoodProduceBase + id: PoppyBouquet + description: It's a great way to honor the memory of an assistant who was killed through your fault. + components: + - type: Sprite + sprite: Objects/Misc/poppybouquet.rsi + state: icon + scale: 1.15,1.15 + - type: Item + sprite: Objects/Misc/poppybouquet.rsi + - type: Construction + graph: PoppyBouquet + node: PoppyBouquet + - type: BadFood + - type: SolutionContainerManager # 4 flowers + solutions: + food: + maxVol: 66 + reagents: + - ReagentId: Nutriment + Quantity: 4 + - ReagentId: Bicaridine + Quantity: 40 + - ReagentId: Fiber + Quantity: 8 + - type: FlavorProfile + flavors: + - medicine + - type: Flammable + fireSpread: true + alwaysCombustible: true + damage: + types: + Heat: 1 + - type: FireVisuals + sprite: Effects/fire.rsi + normalState: fire + - type: Damageable + damageModifierSet: Web + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 15 + behaviors: + - !type:SpawnEntitiesBehavior + spawn: + Ash: + min: 1 + max: 1 + - !type:DoActsBehavior + acts: [ "Destruction" ] diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml index ec43ae2089..11ca70eae2 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml @@ -242,20 +242,29 @@ - SecBeltEquip - type: Sprite state: tourniquet + - type: Item + size: Tiny - type: Healing damageContainers: - Biological damage: groups: - Brute: 5 # Tourniquets HURT! + Brute: -1 types: - Asphyxiation: 5 # Essentially Stopping all blood reaching a part of your body - bloodlossModifier: -10 # Tourniquets stop bleeding + Bloodloss: 2 + Asphyxiation: 2 # Essentially Stopping all blood reaching a part of your body + bloodlossModifier: -10 delay: 0.5 healingBeginSound: path: "/Audio/Items/Medical/brutepack_begin.ogg" healingEndSound: path: "/Audio/Items/Medical/brutepack_end.ogg" + - type: Stack + stackType: Tourniquet + count: 1 + - type: StackPrice + price: 10 + - type: entity name: roll of gauze diff --git a/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml b/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml index a7dbab65f5..e8c94824bd 100644 --- a/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml +++ b/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml @@ -4,7 +4,7 @@ abstract: true description: You sit in this. Either by will or force. placement: - mode: PlaceFree + mode: SnapgridCenter components: - type: Clickable - type: InteractionOutline @@ -34,7 +34,7 @@ buckleOffset: "0,-0.05" - type: Pullable - type: Damageable - damageContainer: StructuralInorganic + damageContainer: Inorganic damageModifierSet: Metallic - type: Destructible thresholds: @@ -128,7 +128,7 @@ - type: entity name: stool id: Stool - parent: UnanchoredChairBase + parent: ChairBase description: Apply butt. components: - type: Sprite @@ -181,6 +181,148 @@ graph: Seat node: chairOfficeDark +- type: entity + name: black comfy chair + id: BlackComfyChair + parent: ChairBase + description: It looks comfy. + components: + - type: Sprite + sprite: Structures/Furniture/chairs.rsi + state: comfy-greyscale + color: "#23242c" + - type: Construction + graph: Seat + node: blackChairComfy + +- type: entity + name: blue comfy chair + id: BlueComfyChair + parent: ChairBase + description: It looks comfy. + components: + - type: Sprite + sprite: Structures/Furniture/chairs.rsi + state: comfy-greyscale + color: "#356287" + - type: Construction + graph: Seat + node: blueChairComfy + +- type: entity + name: green comfy chair + id: GreenComfyChair + parent: ChairBase + description: It looks comfy. + components: + - type: Sprite + sprite: Structures/Furniture/chairs.rsi + state: comfy-greyscale + color: "#2a6e47" + - type: Construction + graph: Seat + node: greenChairComfy + +- type: entity + name: orange comfy chair + id: OrangeComfyChair + parent: ChairBase + description: It looks comfy. + components: + - type: Sprite + sprite: Structures/Furniture/chairs.rsi + state: comfy-greyscale + color: "#9d480c" + - type: Construction + graph: Seat + node: orangeChairComfy + +- type: entity + name: pink comfy chair + id: PinkComfyChair + parent: ChairBase + description: It looks comfy. + components: + - type: Sprite + sprite: Structures/Furniture/chairs.rsi + state: comfy-greyscale + color: "#91265e" + - type: Construction + graph: Seat + node: pinkChairComfy + +- type: entity + name: purple comfy chair + id: PurpleComfyChair + parent: ChairBase + description: It looks comfy. + components: + - type: Sprite + sprite: Structures/Furniture/chairs.rsi + state: comfy-greyscale + color: "#563968" + - type: Construction + graph: Seat + node: purpleChairComfyf + +- type: entity + name: red comfy chair + id: RedComfyChair + parent: ChairBase + description: It looks comfy. + components: + - type: Sprite + sprite: Structures/Furniture/chairs.rsi + state: comfy-greyscale + color: "#872222" + - type: Construction + graph: Seat + node: redChairComfy + +- type: entity + name: white comfy chair + id: WhiteComfyChair + parent: ChairBase + description: It looks comfy. + components: + - type: Sprite + sprite: Structures/Furniture/chairs.rsi + state: comfy-greyscale + color: "#dcdcdc" + - type: Construction + graph: Seat + node: whiteChairComfy + +# WD edit start + +- type: entity + name: brown comfy chair + id: BrownComfyChair + parent: ChairBase + description: It looks comfy. + components: + - type: Sprite + sprite: Structures/Furniture/chairs.rsi + state: comfy-greyscale + color: "#AE6716" + - type: Construction + graph: Seat + node: brownChairComfy + +- type: entity + name: light blue comfy chair + id: LightBlueComfyChair + parent: ChairBase + description: It looks comfy. + components: + - type: Sprite + sprite: Structures/Furniture/chairs.rsi + state: comfy-greyscale + color: "#52B4E9" + - type: Construction + graph: Seat + node: lightBlueChairComfy + - type: entity name: comfy chair id: ComfyChair @@ -188,11 +330,14 @@ description: It looks comfy. components: - type: Sprite - state: comfy + sprite: Structures/Furniture/chairs.rsi + state: comfy-greyscale - type: Construction graph: Seat node: chairComfy +# WD edit end + - type: entity name: pilot seat id: ChairPilotSeat @@ -253,7 +398,7 @@ - type: entity id: ChairMeat - parent: UnanchoredChairBase + parent: ChairBase name: meat chair description: Uncomfortably sweaty. components: @@ -298,7 +443,7 @@ name: web chair id: ChairWeb description: For true web developers. - parent: UnanchoredChairBase + parent: ChairBase components: - type: Sprite sprite: Structures/Web/chair.rsi @@ -314,12 +459,6 @@ thresholds: - trigger: !type:DamageTrigger - damage: 300 #excess damage (nuke?). avoid computational cost of spawning entities. # WD edit start - behaviors: - - !type:DoActsBehavior - acts: [ "Destruction" ] - - trigger: - !type:DamageTrigger # WD edit end damage: 50 behaviors: - !type:DoActsBehavior @@ -368,6 +507,8 @@ parent: ChairFolding id: ChairFoldingSpawnFolded suffix: folded + placement: + mode: PlaceFree components: - type: Foldable folded: true @@ -384,6 +525,7 @@ graph: Seat node: chairSteelBench +# WD edit start - type: entity name: wooden bench id: WoodenBench @@ -413,3 +555,116 @@ max: 4 - type: StaticPrice price: 20 +# WD edit end + +- type: entity + name: black padded stool + id: BlackPaddedStool + parent: ChairBase + description: Soft bag chair, comfortable! + components: + - type: Sprite + sprite: Structures/Furniture/chairs.rsi + state: pufi-box-greyscale + color: "#23242c" + - type: Construction + graph: Seat + node: blackPaddedStool + +- type: entity + name: blue padded stool + id: BluePaddedStool + parent: ChairBase + description: Soft bag chair, comfortable! + components: + - type: Sprite + sprite: Structures/Furniture/chairs.rsi + state: pufi-box-greyscale + color: "#356287" + - type: Construction + graph: Seat + node: bluePaddedStool + +- type: entity + name: green padded stool + id: GreenPaddedStool + parent: ChairBase + description: Soft bag chair, comfortable! + components: + - type: Sprite + sprite: Structures/Furniture/chairs.rsi + state: pufi-box-greyscale + color: "#2a6e47" + - type: Construction + graph: Seat + node: greenPaddedStool + +- type: entity + name: orange padded stool + id: OrangePaddedStool + parent: ChairBase + description: Soft bag chair, comfortable! + components: + - type: Sprite + sprite: Structures/Furniture/chairs.rsi + state: pufi-box-greyscale + color: "#9d480c" + - type: Construction + graph: Seat + node: orangePaddedStool + +- type: entity + name: pink padded stool + id: PinkPaddedStool + parent: ChairBase + description: Soft bag chair, comfortable! + components: + - type: Sprite + sprite: Structures/Furniture/chairs.rsi + state: pufi-box-greyscale + color: "#91265e" + - type: Construction + graph: Seat + node: pinkPaddedStool + +- type: entity + name: purple padded stool + id: PurplePaddedStool + parent: ChairBase + description: Soft bag chair, comfortable! + components: + - type: Sprite + sprite: Structures/Furniture/chairs.rsi + state: pufi-box-greyscale + color: "#563968" + - type: Construction + graph: Seat + node: purplePaddedStool + +- type: entity + name: red padded stool + id: RedPaddedStool + parent: ChairBase + description: Soft bag chair, comfortable! + components: + - type: Sprite + sprite: Structures/Furniture/chairs.rsi + state: pufi-box-greyscale + color: "#872222" + - type: Construction + graph: Seat + node: redPaddedStool + +- type: entity + name: white padded stool + id: WhitePaddedStool + parent: ChairBase + description: Soft bag chair, comfortable! + components: + - type: Sprite + sprite: Structures/Furniture/chairs.rsi + state: pufi-box-greyscale + color: "#dcdcdc" + - type: Construction + graph: Seat + node: whitePaddedStool diff --git a/Resources/Prototypes/Loadouts/Jobs/Civilian/musician.yml b/Resources/Prototypes/Loadouts/Jobs/Civilian/musician.yml index 7a2f9244e2..fa055f486b 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Civilian/musician.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Civilian/musician.yml @@ -36,6 +36,14 @@ equipment: jumpsuit: ClothingUniformJumpsuitMusician +- type: itemLoadout # WD + id: MusicianJumpskirt + equipment: MusicianJumpskirt +- type: startingGear + id: MusicianJumpskirt + equipment: + jumpsuit: ClothingUniformJumpskirtMusician + # Outerclothing - type: itemLoadout id: MusicianWintercoat diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml index 77df53e05e..ef0abc65c8 100644 --- a/Resources/Prototypes/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/Loadouts/loadout_groups.yml @@ -634,6 +634,7 @@ name: loadout-group-jumpsuit loadouts: - MusicianJumpsuit + - MusicianJumpskirt - JumpsuitFamily - JumpsuitLoungewear diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/seats.yml b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/seats.yml index c587e47efb..42d2b14207 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/seats.yml +++ b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/seats.yml @@ -36,7 +36,42 @@ - material: Steel amount: 2 doAfter: 1 - - to: chairComfy + - to: blackChairComfy + steps: + - material: Steel + amount: 2 + doAfter: 1 + - to: blueChairComfy + steps: + - material: Steel + amount: 2 + doAfter: 1 + - to: greenChairComfy + steps: + - material: Steel + amount: 2 + doAfter: 1 + - to: orangeChairComfy + steps: + - material: Steel + amount: 2 + doAfter: 1 + - to: pinkChairComfy + steps: + - material: Steel + amount: 2 + doAfter: 1 + - to: purpleChairComfy + steps: + - material: Steel + amount: 2 + doAfter: 1 + - to: redChairComfy + steps: + - material: Steel + amount: 2 + doAfter: 1 + - to: whiteChairComfy steps: - material: Steel amount: 2 @@ -87,6 +122,70 @@ doAfter: 1 - material: Cloth amount: 1 + - to: blackPaddedStool + steps: + - material: Cloth + amount: 3 + doAfter: 1 + - material: WoodPlank + amount: 1 + doAfter: 1 + - to: bluePaddedStool + steps: + - material: Cloth + amount: 3 + doAfter: 1 + - material: WoodPlank + amount: 1 + doAfter: 1 + - to: greenPaddedStool + steps: + - material: Cloth + amount: 3 + doAfter: 1 + - material: WoodPlank + amount: 1 + doAfter: 1 + - to: orangePaddedStool + steps: + - material: Cloth + amount: 3 + doAfter: 1 + - material: WoodPlank + amount: 1 + doAfter: 1 + - to: pinkPaddedStool + steps: + - material: Cloth + amount: 3 + doAfter: 1 + - material: WoodPlank + amount: 1 + doAfter: 1 + - to: purplePaddedStool + steps: + - material: Cloth + amount: 3 + doAfter: 1 + - material: WoodPlank + amount: 1 + doAfter: 1 + - to: redPaddedStool + steps: + - material: Cloth + amount: 3 + doAfter: 1 + - material: WoodPlank + amount: 1 + doAfter: 1 + - to: whitePaddedStool + steps: + - material: Cloth + amount: 3 + doAfter: 1 + - material: WoodPlank + amount: 1 + doAfter: 1 - node: chair entity: Chair @@ -156,8 +255,8 @@ - tool: Screwing doAfter: 1 - - node: chairComfy - entity: ComfyChair + - node: blackChairComfy + entity: BlackComfyChair edges: - to: start completed: @@ -168,6 +267,130 @@ - tool: Screwing doAfter: 1 + - node: blueChairComfy + entity: BlueComfyChair + edges: + - to: start + completed: + - !type:SpawnPrototype + prototype: SheetSteel1 + amount: 2 + steps: + - tool: Screwing + doAfter: 1 + + - node: greenChairComfy + entity: GreenComfyChair + edges: + - to: start + completed: + - !type:SpawnPrototype + prototype: SheetSteel1 + amount: 2 + steps: + - tool: Screwing + doAfter: 1 + + - node: orangeChairComfy + entity: OrangeComfyChair + edges: + - to: start + completed: + - !type:SpawnPrototype + prototype: SheetSteel1 + amount: 2 + steps: + - tool: Screwing + doAfter: 1 + + - node: pinkChairComfy + entity: PinkComfyChair + edges: + - to: start + completed: + - !type:SpawnPrototype + prototype: SheetSteel1 + amount: 2 + steps: + - tool: Screwing + doAfter: 1 + + - node: purpleChairComfy + entity: PurpleComfyChair + edges: + - to: start + completed: + - !type:SpawnPrototype + prototype: SheetSteel1 + amount: 2 + steps: + - tool: Screwing + doAfter: 1 + + - node: redChairComfy + entity: RedComfyChair + edges: + - to: start + completed: + - !type:SpawnPrototype + prototype: SheetSteel1 + amount: 2 + steps: + - tool: Screwing + doAfter: 1 + + - node: whiteChairComfy + entity: WhiteComfyChair + edges: + - to: start + completed: + - !type:SpawnPrototype + prototype: SheetSteel1 + amount: 2 + steps: + - tool: Screwing + doAfter: 1 + + # WD edit starts + + - node: brownChairComfy + entity: BrownComfyChair + edges: + - to: start + completed: + - !type:SpawnPrototype + prototype: SheetSteel1 + amount: 2 + steps: + - tool: Screwing + doAfter: 1 + + - node: lightBlueChairComfy + entity: LightBlueComfyChair + edges: + - to: start + completed: + - !type:SpawnPrototype + prototype: SheetSteel1 + amount: 2 + steps: + - tool: Screwing + doAfter: 1 + + - node: chairComfy + entity: ComfyChair + edges: + - to: start + completed: + - !type:SpawnPrototype + prototype: SheetSteel1 + amount: 2 + steps: + - tool: Screwing + doAfter: 1 + + # WD edit end + - node: chairPilotSeat entity: ChairPilotSeat edges: @@ -276,3 +499,123 @@ doAfter: 1 - tool: Screwing doAfter: 1 + + - node: blackPaddedStool + entity: BlackPaddedStool + edges: + - to: start + completed: + - !type:SpawnPrototype + prototype: MaterialCloth1 + amount: 3 + - !type:SpawnPrototype + prototype: MaterialWoodPlank1 + amount: 1 + steps: + - tool: Cutting + doAfter: 1 + + - node: bluePaddedStool + entity: BluePaddedStool + edges: + - to: start + completed: + - !type:SpawnPrototype + prototype: MaterialCloth1 + amount: 3 + - !type:SpawnPrototype + prototype: MaterialWoodPlank1 + amount: 1 + steps: + - tool: Cutting + doAfter: 1 + + - node: greenPaddedStool + entity: GreenPaddedStool + edges: + - to: start + completed: + - !type:SpawnPrototype + prototype: MaterialCloth1 + amount: 3 + - !type:SpawnPrototype + prototype: MaterialWoodPlank1 + amount: 1 + steps: + - tool: Cutting + doAfter: 1 + + - node: orangePaddedStool + entity: OrangePaddedStool + edges: + - to: start + completed: + - !type:SpawnPrototype + prototype: MaterialCloth1 + amount: 3 + - !type:SpawnPrototype + prototype: MaterialWoodPlank1 + amount: 1 + steps: + - tool: Cutting + doAfter: 1 + + - node: pinkPaddedStool + entity: PinkPaddedStool + edges: + - to: start + completed: + - !type:SpawnPrototype + prototype: MaterialCloth1 + amount: 3 + - !type:SpawnPrototype + prototype: MaterialWoodPlank1 + amount: 1 + steps: + - tool: Cutting + doAfter: 1 + + - node: purplePaddedStool + entity: PurplePaddedStool + edges: + - to: start + completed: + - !type:SpawnPrototype + prototype: MaterialCloth1 + amount: 3 + - !type:SpawnPrototype + prototype: MaterialWoodPlank1 + amount: 1 + steps: + - tool: Cutting + doAfter: 1 + + - node: redPaddedStool + entity: RedPaddedStool + edges: + - to: start + completed: + - !type:SpawnPrototype + prototype: MaterialCloth1 + amount: 3 + - !type:SpawnPrototype + prototype: MaterialWoodPlank1 + amount: 1 + steps: + - tool: Cutting + doAfter: 1 + + - node: whitePaddedStool + entity: WhitePaddedStool + edges: + - to: start + completed: + - !type:SpawnPrototype + prototype: MaterialCloth1 + amount: 3 + - !type:SpawnPrototype + prototype: MaterialWoodPlank1 + amount: 1 + steps: + - tool: Cutting + doAfter: 1 diff --git a/Resources/Prototypes/Recipes/Construction/furniture.yml b/Resources/Prototypes/Recipes/Construction/furniture.yml index 47b7a37fc8..898749a095 100644 --- a/Resources/Prototypes/Recipes/Construction/furniture.yml +++ b/Resources/Prototypes/Recipes/Construction/furniture.yml @@ -102,25 +102,201 @@ - !type:TileNotBlocked - type: construction - name: comfy chair - id: ComfyChair + name: black comfy chair + id: BlackChairComfy graph: Seat startNode: start - targetNode: chairComfy + targetNode: blackChairComfy category: construction-category-furniture description: It looks comfy. icon: sprite: Structures/Furniture/chairs.rsi - state: comfy + state: comfy-greyscale objectType: Structure placementMode: SnapgridCenter canBuildInImpassable: false conditions: - !type:TileNotBlocked +- type: construction + name: blue comfy chair + id: BlueChairComfy + graph: Seat + startNode: start + targetNode: blueChairComfy + category: construction-category-furniture + description: It looks comfy. + icon: + sprite: Structures/Furniture/chairs.rsi + state: comfy-greyscale + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked + +- type: construction + name: green comfy chair + id: GreenChairComfy + graph: Seat + startNode: start + targetNode: greenChairComfy + category: construction-category-furniture + description: It looks comfy. + icon: + sprite: Structures/Furniture/chairs.rsi + state: comfy-greyscale + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked + +- type: construction + name: orange comfy chair + id: OrangeChairComfy + graph: Seat + startNode: start + targetNode: orangeChairComfy + category: construction-category-furniture + description: It looks comfy. + icon: + sprite: Structures/Furniture/chairs.rsi + state: comfy-greyscale + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked + +- type: construction + name: pink comfy chair + id: PinkChairComfy + graph: Seat + startNode: start + targetNode: pinkChairComfy + category: construction-category-furniture + description: It looks comfy. + icon: + sprite: Structures/Furniture/chairs.rsi + state: comfy-greyscale + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked + +- type: construction + name: purple comfy chair + id: PurpleChairComfy + graph: Seat + startNode: start + targetNode: purpleChairComfy + category: construction-category-furniture + description: It looks comfy. + icon: + sprite: Structures/Furniture/chairs.rsi + state: comfy-greyscale + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked + +- type: construction + name: red comfy chair + id: RedChairComfy + graph: Seat + startNode: start + targetNode: redChairComfy + category: construction-category-furniture + description: It looks comfy. + icon: + sprite: Structures/Furniture/chairs.rsi + state: comfy-greyscale + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked + +- type: construction + name: white comfy chair + id: WhiteChairComfy + graph: Seat + startNode: start + targetNode: whiteChairComfy + category: construction-category-furniture + description: It looks comfy. + icon: + sprite: Structures/Furniture/chairs.rsi + state: comfy-greyscale + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked + +# WD edit start + +- type: construction + name: brown comfy chair + id: BrownChairComfy + graph: Seat + startNode: start + targetNode: brownChairComfy + category: construction-category-furniture + description: It looks comfy. + icon: + sprite: Structures/Furniture/chairs.rsi + state: comfy-greyscale + color: "#AE6716" + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked + +- type: construction + name: light blue comfy chair + id: LightBlueChairComfy + graph: Seat + startNode: start + targetNode: lightBlueChairComfy + category: construction-category-furniture + description: It looks comfy. + icon: + sprite: Structures/Furniture/chairs.rsi + state: comfy-greyscale + color: "#52B4E9" + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked + +- type: construction + name: comfy chair + id: ChairComfy + graph: Seat + startNode: start + targetNode: chairComfy + category: construction-category-furniture + description: It looks comfy. + icon: + sprite: Structures/Furniture/chairs.rsi + state: comfy-greyscale + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked + +# WD edit end + - type: construction name: pilots chair - id: ChairPilotSeat + id: chairPilotSeat graph: Seat startNode: start targetNode: chairPilotSeat @@ -271,6 +447,142 @@ conditions: - !type:TileNotBlocked +- type: construction + name: black padded stool + id: BlackPaddedStool + graph: Seat + startNode: start + targetNode: blackPaddedStool + category: construction-category-furniture + description: Soft bag chair, comfortable! + icon: + sprite: Structures/Furniture/chairs.rsi + state: pufi-box-greyscale + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked + +- type: construction + name: blue padded stool + id: BluePaddedStool + graph: Seat + startNode: start + targetNode: bluePaddedStool + category: construction-category-furniture + description: Soft bag chair, comfortable! + icon: + sprite: Structures/Furniture/chairs.rsi + state: pufi-box-greyscale + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked + +- type: construction + name: green padded stool + id: GreenPaddedStool + graph: Seat + startNode: start + targetNode: greenPaddedStool + category: construction-category-furniture + description: Soft bag chair, comfortable! + icon: + sprite: Structures/Furniture/chairs.rsi + state: pufi-box-greyscale + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked + +- type: construction + name: orange padded stool + id: OrangePaddedStool + graph: Seat + startNode: start + targetNode: orangePaddedStool + category: construction-category-furniture + description: Soft bag chair, comfortable! + icon: + sprite: Structures/Furniture/chairs.rsi + state: pufi-box-greyscale + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked + +- type: construction + name: pink padded stool + id: PinkPaddedStool + graph: Seat + startNode: start + targetNode: pinkPaddedStool + category: construction-category-furniture + description: Soft bag chair, comfortable! + icon: + sprite: Structures/Furniture/chairs.rsi + state: pufi-box-greyscale + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked + +- type: construction + name: purple padded stool + id: PurplePaddedStool + graph: Seat + startNode: start + targetNode: purplePaddedStool + category: construction-category-furniture + description: Soft bag chair, comfortable! + icon: + sprite: Structures/Furniture/chairs.rsi + state: pufi-box-greyscale + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked + +- type: construction + name: red padded stool + id: RedPaddedStool + graph: Seat + startNode: start + targetNode: redPaddedStool + category: construction-category-furniture + description: Soft bag chair, comfortable! + icon: + sprite: Structures/Furniture/chairs.rsi + state: pufi-box-greyscale + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked + +- type: construction + name: white padded stool + id: WhitePaddedStool + graph: Seat + startNode: start + targetNode: whitePaddedStool + category: construction-category-furniture + description: Soft bag chair, comfortable! + icon: + sprite: Structures/Furniture/chairs.rsi + state: pufi-box-greyscale + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked + #tables - type: construction name: steel table @@ -885,6 +1197,7 @@ conditions: - !type:TileNotBlocked +# WD edit start - type: construction id: NoticeBoard name: notice board @@ -901,7 +1214,7 @@ canRotate: true canBuildInImpassable: false conditions: - - !type:TileNotBlocked + - !type:TileNotBlocked - type: construction id: Mannequin @@ -920,3 +1233,4 @@ canBuildInImpassable: false conditions: - !type:TileNotBlocked +# WD edit end diff --git a/Resources/Prototypes/Recipes/Crafting/Graphs/toys.yml b/Resources/Prototypes/Recipes/Crafting/Graphs/toys.yml index 56e31bbe8d..b61ee35533 100644 --- a/Resources/Prototypes/Recipes/Crafting/Graphs/toys.yml +++ b/Resources/Prototypes/Recipes/Crafting/Graphs/toys.yml @@ -36,3 +36,42 @@ doAfter: 5 - node: suit entity: ClothingOuterSuitIan + +- type: constructionGraph + id: PoppyBouquet + start: start + graph: + - node: start + edges: + - to: PoppyBouquet + steps: + - tag: Flower + name: flower + icon: + sprite: Objects/Specific/Hydroponics/poppy.rsi + state: produce + - tag: Flower + name: flower + icon: + sprite: Objects/Specific/Hydroponics/poppy.rsi + state: produce + - tag: Flower + name: flower + icon: + sprite: Objects/Specific/Hydroponics/poppy.rsi + state: produce + - tag: Flower + name: flower + icon: + sprite: Objects/Specific/Hydroponics/poppy.rsi + state: produce + - tag: Flower + name: flower + icon: + sprite: Objects/Specific/Hydroponics/poppy.rsi + state: produce + - material: Cotton + amount: 1 + doAfter: 10 + - node: PoppyBouquet + entity: PoppyBouquet \ No newline at end of file diff --git a/Resources/Prototypes/Recipes/Crafting/toys.yml b/Resources/Prototypes/Recipes/Crafting/toys.yml index 4fd91bdb69..941388f379 100644 --- a/Resources/Prototypes/Recipes/Crafting/toys.yml +++ b/Resources/Prototypes/Recipes/Crafting/toys.yml @@ -23,3 +23,14 @@ icon: sprite: Clothing/OuterClothing/Suits/iansuit.rsi state: icon + +- type: construction + name: PoppyBouquet + id: PoppyBouquet + graph: PoppyBouquet + startNode: start + targetNode: PoppyBouquet + category: construction-category-misc + description: A bouquet of the best flowers that you could grow. At least you tried... + icon: { sprite: Objects/Misc/poppybouquet.rsi, state: icon } + objectType: Item \ No newline at end of file diff --git a/Resources/Prototypes/Stacks/medical_stacks.yml b/Resources/Prototypes/Stacks/medical_stacks.yml index 7ad3c21634..31a53fe543 100644 --- a/Resources/Prototypes/Stacks/medical_stacks.yml +++ b/Resources/Prototypes/Stacks/medical_stacks.yml @@ -33,6 +33,14 @@ spawn: Bloodpack maxCount: 10 +- type: stack + id: Tourniquet + name: tourniquet + icon: { sprite: "/Textures/Objects/Specific/Medical/medical.rsi", state: tourniquet } + spawn: Tourniquet + maxCount: 3 # WD + itemSize: 1 + - type: stack id: MedicatedSuture name: medicated-suture diff --git a/Resources/Prototypes/_White/Object/colored_armchairs.yml b/Resources/Prototypes/_White/Object/colored_armchairs.yml index a4b6ab12d4..5f282702bb 100644 --- a/Resources/Prototypes/_White/Object/colored_armchairs.yml +++ b/Resources/Prototypes/_White/Object/colored_armchairs.yml @@ -1,82 +1 @@ -# black - #808080 -# brown - #AE6716 -# command - #4B709C -# security - #DE3A3A -# medical - #52B4E9 -# engineering - #FFA647 -# science - #F98AFF -# cargo - #D69949 -# service - #9FED58 - -- type: entity - id: ComfyChairBlack - suffix: Black - parent: ComfyChair - components: - - type: Sprite - color: "#808080" - -- type: entity - id: ComfyChairBrown - suffix: Brown - parent: ComfyChair - components: - - type: Sprite - color: "#AE6716" - -- type: entity - id: ComfyChairCommand - suffix: Command - parent: ComfyChair - components: - - type: Sprite - color: "#4B709C" - -- type: entity - id: ComfyChairSecurity - suffix: Security - parent: ComfyChair - components: - - type: Sprite - color: "#DE3A3A" - -- type: entity - id: ComfyChairMedical - suffix: Medical - parent: ComfyChair - components: - - type: Sprite - color: "#52B4E9" - -- type: entity - id: ComfyChairEngineering - suffix: Engineering - parent: ComfyChair - components: - - type: Sprite - color: "#FFA647" - -- type: entity - id: ComfyChairScience - suffix: Science - parent: ComfyChair - components: - - type: Sprite - color: "#F98AFF" - -- type: entity - id: ComfyChairCargo - suffix: Cargo - parent: ComfyChair - components: - - type: Sprite - color: "#D69949" - -- type: entity - id: ComfyChairService - suffix: Service - parent: ComfyChair - components: - - type: Sprite - color: "#9FED58" - + \ No newline at end of file diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/musician.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/musician.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..78b2c2ea5dbee201f4e29a1eb776bc1f8a414c0f GIT binary patch literal 1134 zcmV-!1d;oRP)3~KjEN7?ph41{_if&slfAvWop*PMff>l#o!OoFX21R6d3(mFC_NwcIfpT)~{^u5YhB z`u=lmz-=q518;QrViIO;<9$-+_Sh)G4uk0#-f3tBm!T-2AXGz%E+2-Rn&@p(lLx2yz5d2&MI0_wXS*w8T)Q|gC zQKz_DzrUHm!GGHgv7y5bp?+2g_$efSX4Mz#!M#U5v$f^#$|{q0NdEj3-*NSI&BgP$0m5VDK(d+|1cm)6)C+nG!N%L!a(;Oda zrpnLj3y2x~5Q5I3LioUi_)6p#iwM8)5JW^0u%0JH?RmZ-ZAI~m+I<*7D}dO?(#sO8 z3bgk#3t2JAUMGGK0lj_geYB;4BUw6_sy+wm#1|cc7$jx`rBA9JxDVr?@qIa|O&L%I zlmTTx8Bhk40cAiLPzIC%Wk4BF29$wA#XzYyLUZ%4>|n>o#|QAHW5hgBXN$^@8?%9ezI4>GEdpoLUp~1x@Q0umZ`#)H%B7ize!{hQg<-lziI0%7Aa|j}Um_MlR19k_t z`xstz4nYL;mbCYT-H-1BKtNqN1fKy&0z&^8+12*`*0uNdqWm8@xH+k=3@8K2fHH6x z8Tbo#yHZoU@@}gD000hUSV?A0O#mtY000O800000007cclK=n!07*qoM6N<$f*QC6 AJOBUy literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/musician.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/musician.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..48c415163267176464dfe9fba198fd9330b5fa59 GIT binary patch literal 451 zcmV;!0X+VRP)T?c-|Z#F#1k2a3`7PZ0|5*)8=V55EXxX62AgBjuhF+ONyx!~ zEU=&RWUWj00^qI6n%rEE%iQF1)ybl5Y1q1No5}PMG}~pyS0@X+49H|# zAN0>`SFr75psbsumKnhFm;SQ4DxaDG+~{O?pKd%4I~|UwFKoOCh-+@X1QWzSv(cj3 z!`_M6sVC<1E2qJbIEd#TGt#wRDgeCwYQ3!N3lNBdg`ZPsFQN*-Z?nyxjzqzO;p6SK t!%;&&E>N_`^^8LXYv;wh$iV++;2RkXndURVXlnof002ovPDHLkV1fbl$%p^| literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/musician.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/musician.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..5919ab9cff200bf1d1af06740d97bbf8b67f8d2a GIT binary patch literal 658 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV2bo~aSW+od^^k5o7qvI&3~h~ zi&B9`id9R(T->MqG%yv3v9Fr^kN1GrDrL#zI`${ASn7$ZO%cUJLzVA4REc%bR+& z>RO!{gG%|O{W@{W7BjuQ{d>`^kN*z-40;xBn2vX62r zd7X20#jNGm&diGM+WfP^^~=|HeD3@=awC5!hWoP34T)}y`eyK(_k!RH*&{U;*EVge zTOr+-{A=ZFJ%$ax_n!UxNucHN<;SZp+4H%cdA(g(EMoTB8S7H-vNl-6)%a+0c*rHc zew?{lw{4BF15bVZ{;TKZpG`cFW2d=n{dv!Hhc4ZTA9GeapE;ayclA2{?Rs`j(P7rH zH9^x@JQ{GL15O8mgfCq659W0YzrRjg*{buy{aaPK+vPXQMqmGTm$76m=Y@kyzD%4G zZp-v%CzC@#Y!*|H&^4nC??d|)%I-2GJWmXH_x0lcUg_A};F_yf1u`s;T>7%(4)38I zOVt)=u2@!CYrAa!XPNtX`3)>{z2cq}-?|WP;kWTEo5FH61=RrE=DXilxfd`uFcfDq zl}ysC?U!QOZp^?Koy`<9>8jDZuN?b>y}qW~e%t@K2h6 S-oOD&YYd*QelF{r5}E+C79%GB literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/musician.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/musician.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..988fda91fabdaf886430b2c45229ac0112d46b09 GIT binary patch literal 646 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEVDj~JaSW+od^^j~+u2ay_~ISh zN}_KSEJ9>ScJuv%{7>KAJG!>{!ojs3-6CCAw|=Vsa>(>-wf@TYKZAax zXB18Me)n#=Nvqni4HFnRaiN9-XRkiKqq=eX?Rmeytc&$3iac|BUxML@<>IlC`)@1_ zd46;c6GNN$-RRGTax?Ot-)j2tYhI-7ug_{ZRxfYNn9iWE^4r0gm2d55KYVdkW}8*y zqP=nXbu}fkp0e5gN}R6L0#@U!qQSbG;pxMFnyX#g7QEeb&c#mU*o7J8C3hyjEbva* zyX)^k?y%@xJ=->)IwG~uaQz#Gx$V18ty_~DoVnX@*Cy%Z;tXN?x7H^W+*lYh?|!Oj z%8Re>PFM;3>gc`6?eJ;l-yU5SA0ErELeifvNh+Mw-S_yLx zYkptQdtLrE`H9tYKBfkS0^=)3W;fd0H)QC}@n%$LSay%+$xl5mjcw~i7}Tzqui5zh z{YJ)}-|X)H679&A*RFog_EqIq6sNXQ?ZWTxllJ??KB=DjvnIKztU+!?I7?OdwQZr> zUw;tgVOV|t3dr1020k{0b4l;-r^bkG{T6$)X2#+#JOb|B?-$!LFW}!Wfz^j()HIxmub1+)Sy)c*QvmFXA~@LL)|9t=d zee?e_`(9PWjNBokhF}<$TV58dMm_F6gZiWI;D%*KP}k3{o>78r{bBSUXfPmJ94^MN z?JIKbf~V0qR5i0Uw2dQw)9McSnAHViPlZF@UO2zz>)rQyPWSX2zH#eD*R?Cxu61_& z)bZ!|rsL1Pb%%PVC-~v%>z8`!*1@&Xluz=p7y`mJEgZQQbt9bWikhBY8`d?g>rG@b z*et8FF)Sy~efnW-pXOuOz^hvAY-e_Orlc5g4^RymdRpS93yk@vwwOSf4;@^FQB4mJ zmpcv+xTXe(S%qObY?i_Xt!#k>YZg@0DhuW-qDo9H${pfwkq|;0Isk8p$8=k22@nZj z3H^4bDFRQJIP(KUvFj0^9j?Ml4GZF;hb9%8W^h6DFg#Rbo}G-dG|N&9OVKRJh!Vp} zJddXuf&AgP-%=w|b#Qvh9~uRS2FEcaifV3d_B3-I!-`UjD2fP!Vp$Sdkanx?fEH4> z3z8rym>{$jOEVqK&~Xyz288VbU=?^X4QbVT$CqyqUu5~B1beG2a*1(g#S zhNfA_s%f-JOG6b0V%ex}R4PJ*-bh3)Axh|mm)a){#rWFb>1_7Y!mDq9La)fWx@$S=yHGR>8?HH&b9ZVh}pYbqlx zo~TO+DDHU^AQZRIAj*Q|wAM>b_G$N1>zf-O0)0#YCf(RZ#AyZ=ERLf5eR6?QeIa7# zP0-4sVgd`GvmaV^fQVQ|90#Tu(-h$HrkZp$b&_U;#vKFCs@=Z$v_aG3rR!TcCpCFU zy8j+X|4X{$BBcT7QHZWlbUJ4fOJ-hnrueDek}7GJbx|cYBsq(2K{P_^(s!^s%G~2n zM_w&-OD|ft@H6y=GORpUTS%hcu(jnSjncLVIJW%*au7Jbus5er?vTGW25t$Kgc$%gej9P4!z|vrb;bmQJ~|XkXVRxa^n3bL)?-d7-oM=a<&6 zn)AxtldrE`yk*syGu>w^_F}t6J#~KH(u%>kM>lg<+It4R(f!QE9ijHp3-QD5%TIZz LBDl3=-jaU-mn%vT literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Misc/poppybouquet.rsi/inhand-left.png b/Resources/Textures/Objects/Misc/poppybouquet.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..b461104567fad6b1d020699c7274e6b5bf336a15 GIT binary patch literal 5266 zcmd5=dvH|M8NY#qghUtu10oN5=OP%ClRf9$_a)IRBtR;G7@|a!%DLyBo9vL?yXt28IgiATBxY?kG{leXRK4L6=q6X2m0OJWQ}7q>DErW zGkfpeyWjbJkMn)M^PO{B^NOVt%4d{Ik~E=lS$zxK>%wo@Sh(K*O!-To5E$VDx4N;Y32 z9kIwUVjeL`%Oxe7E|u0!nzrL5df!t|Jp1PF^i2zn>gwjX(tTCZDrMX;Y<;D8+?lgy zs*rx}{41?;*`|5YQG<%HigG>v;DcW+YifPv^m~6j`~LI9IB-GPttAV*V!7+$q78GU z4fCY$SB~??%-K~^W^Rla8>??AF7?{iA9&%&-q~YcUbuMoY-#&R+@g$IJ!8Vb%jX?j zFz@>D(=s!qwPn*!pFQ0-ZR{p6<5KDR@~OLLNn1)wX;#UW93bgihHMz`Eo@ugs7|j!AiKT$+WCk zb^gEgkxst$wE(n?PcFMIElCwq!f%oEtv%Bvsj@WI+Lmc+TJG>5Ud_C~71h1*BuGnA z&6T}L#@CCC?27hSqE`9K!DkdX=G7{z^(NeuTr4_b%QmLOs*NjJ`Ns9!_LM8Hm{4BR z>i|MrWSHC=?@Xkf-dZIK?7;8vbwrV~BANBIN;K3cw>34(i-VMq?P`oT#zZ#lYN845 zYIK22F{KegBbXv$JA^u#CJ%fR&?n0^DbIIW>X!`YgQr@hBa=xwkw{NZPj!!49i-YL z#I|j~h){|^0;T&B8P7XmcMMF23IcLzDbf!go6x2}+2l4FSq_a3B zSSCod20`cGbT<$BD^snS$W^Oj2`}hL&kwZ?3=s7!BWe|xdKF=URMLuJ>NN*jmt)nz zI49Z^crm|ks3=IAtrR;dNPk=u63=59Hlnb{9Y09L8AK}c;}!&r*o07Gn@m>=fTcQd4PyIRB4XzNsVC)&#Ol10#5%nynF2h(cm(c*MfY z(vfa5intzHYZ(?&Js%6<>85KGVy($Ms$-%fn=+0xs_9^@#Sr(H<`G@RIux0DiSOVf@MQZ__jr{>-o0p6#(mM zzKT^nWFOT6L?98{RRwaXMGfu>hM86fEKED3K2RhF%C}jVw=S`f&V`0m%q>Al0kB*b zn0dgJx~&UjaNq=sTOMSBOEpW=m~Zg{U_HZvnfFa(*!y`Zjl<|N|L1*bgUwku2uY05SQ~Eft(3smP~fWI17Ui=}ve9&0s$2iaZ*f zY1TbL=r|*o>lQK$ABaqZd1hcpJ71$5XkFDbb1?Lu2wm7LtB$S@HcbVEE;opGutd9n z<{x^>&&4q=1ZSp4kjD%S8EWVl_JKuw3u7QsgJ{rT<&=NYF~fm|P$mBZ$M}d@GD2d6 zxsy+%(FM~Jso0P_8Jd@QbL4D>e*U^g%uuQk=uDZ4h^ABI0i(j20P9WI;bB$y2IcPm z<3x_=*yvjLPiE+_n~>3#9v!+L`s~unk^WGUu89oK=L0lfpG%`9A(dsfbk1;OJ=(&A zJ)Q&ml>E-+-`Zmg=nwwWy-J>oa={p~ea{kp?k$`Rz!L;#@MI!<%AanC1h85P&Muys zyQLJ)sqSj5kG8fgefOU0RvpIE8|L?uua-xzzWITlbR8|3zirK-sejvKoUOp$-|H{lJLSRBlamhrT&dhc z?%37&)DIu1e5+&gUAIqtuA#nh%F5-BCD%60se0@OA7*ZwR5{*g_g}o0JiS+{nEv=T zRrAIdw%z`V!-w71_PsH?(I;IF8=M*)jNLq_l0Y=KJ%knHy>Qm{N$^Veb=tt_wb=Hr;b&9T|V{F zkKaG{?GvYZj`X*kno{9zUHN+X1>b!%c5GJNvMK+3W=%=kBag@L>MpzI&O_@TU)X!$ zW#b=N7kuH)n-`ydeS!T>_nP06*2#6zlTLJhdvxK>-Y@O%ns`rfbKSdV8uo6u?X9Yg z8})~SL%Y9I+4khy@12Wo?|**(d+H67*KO@6jXa#%`E=}yV{Y0uu}l2)Y~8BK>xy12 z)8-zr%urQ=N literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Misc/poppybouquet.rsi/inhand-right.png b/Resources/Textures/Objects/Misc/poppybouquet.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..ca5c3c919fbcfbc2d9604413195cc4193e28519f GIT binary patch literal 5285 zcmd5=3vg7`8NR_pBn$-+!b2X*@(2u^-E+@9_h|xo0ZD5R!lEeDa_+h3CM(&!>+U59 z5f~AyQUx5_S}ka$I&EiktW-yBu~u4)mKiXJ%2aE0#Ayf1!vc0_b!z{+o2+q+O}e$6 z-kIII_wIkb|8f5RJO4S`mM&R5qI6=ZBuOJ0>g$@|UKM;Uxd^`Re|qytxD{oZ7S~9R z9iDUo9*Uc*8>=O0@6O>Lvl94k%+f1k3lG&*JT$TRP;JElLq4F(cTbXDRMjqxHcc735arE5j`o>sd{Ll?! zhTJ$)O3#p1j~?^Nxl`LpOI8glYndP=#};WfMfA>Scop7sNl9y2k<+~Pk%I@08jB9q zR6abR_ywKp=$2PZ8MbkzbU>5+%cbqzxNUOL+HulkK6~=@bMAP3UZ(sjyJkzVDZ^SP zT)h1V{^0B@yJtz8OG~zvTpS-SCB_zQ8Cm?7v#(BBGk3%2;^dejf7C_ORz)FDQ~5W3 z3%AvN(~{+%{P!+tOJdwRpl4XB{@RQr4Zke-6iMITJzkP79U70V^j9`sX>l(RVUA~u zNJkPjkqyYD_Y|9ooTVWb4iSMuH~i^ zUNC<|X+?(x2npe{P)DLQnXx)5!&zVpeh06k;ZRn@Ut1Zj4m5^VHZBd-dT9|dBN%av z<&bVhWGc8#$-EH3ghXW$#RSQwB@>I%P|px`ITWXIp<3v zmB&tIdIAQai*~S7RF2@lx2&MU^Kz+m>DH_T4v&gfkq}8g1F~{nHr3+!UZ%zS0_gnT zpHToYZfwl!=+~A+BCjIjFKh!hdZN;=bSAbwC8A9tZyf|xmd9<&WSd9PTXDJR}`f67{QieT3G&!C?uZ4d^Vu4!!6fKCm2L4o?y))no2f@ zL-{$dYQ0u34T`}!C2K`vqt%ei_$>V}*>n-HxsEue4A}yrPqD_p zR-HJeS`aKut733O90wA^p(bK3(UB=D8pF2GOq&z{t8u{<$Djzix{4H&3S{USM({+a zNo8G#LSm~qvVobQB2{MuaW$~k&*pdZ1pf&>eKV3<%7 zu4xc#JFaOv1;EYt~1;BDuVCD$OTT>NCq$z=8*aa4G4UBMYvDhiq5W<`2AiRz?|vvZ=!;4(NBVt9x+2;?pZCyw zT`r9l1yq*Z(pmkH^cRX=E`tB$Q)eCnQSm;V}%y7`g#*l*oar9K!N@nOre zBdhKxe|O{C&2U=t`2H1dG|?Bvb)7hN+v!=q^L}*S;gerIJat>i-kXn(9n$driS4JW zfA-3;GtbQ&x~HzGam0qmaOEd^p8Te=`mUGWZ)v&ry)}#P`uLKrhf1~#cOKrk{i^Qp z$=jFF@(~s4_Mcb1cI3{56ZSk_Ud*;UQ6iQczvXYYzA*EKz4aeH_WbJWmtB4Andj$x zx8c@hmpyeL^qm#2>mBcv9^AqI^k~;FjIzCNS>Nj#xn|#0vFC26>K-+0NwfojxSCy{*!)BxEgOjHph%G-d z->JIz@^ueSuKHv7?3bp7uYGw|=%OcUCLe#O!r3(BmLINv^kBn`+R`y|}+y7Gx#9W9rxKKAOaH?OGQ{L#>bH*FYw+0wu6?%aIfH-CQf zigV|ck^8^qf3#^>%~Y{#>&{Wt``h0h+1<9a<wibmxTy o(+=J#ZT)>Uwf8R=WgH$_(!O3gKGiuCoKZC_TvGQ~&6->O3Dudn(f|Me literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Misc/poppybouquet.rsi/meta.json b/Resources/Textures/Objects/Misc/poppybouquet.rsi/meta.json new file mode 100644 index 0000000000..a74877333b --- /dev/null +++ b/Resources/Textures/Objects/Misc/poppybouquet.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprite taked from TG station.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Structures/Furniture/chairs.rsi/comfy-greyscale.png b/Resources/Textures/Structures/Furniture/chairs.rsi/comfy-greyscale.png new file mode 100644 index 0000000000000000000000000000000000000000..8b5f960fce9ecd34ff60be027fbae59845704f5a GIT binary patch literal 1084 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 P00000NkvXXu0mjfvH~o0 diff --git a/Resources/Textures/Structures/Furniture/chairs.rsi/meta.json b/Resources/Textures/Structures/Furniture/chairs.rsi/meta.json index 0433a854d2..41a29ecf1b 100644 --- a/Resources/Textures/Structures/Furniture/chairs.rsi/meta.json +++ b/Resources/Textures/Structures/Furniture/chairs.rsi/meta.json @@ -1,103 +1,108 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/11402f6ae62facc2e8bcfa1f8ef5353b26663278, meat.png is CC0-1.0 by EmoGarbage404 (github) for Space Station 14. chair.png and its derrivatives taken from shiptest at commit https://github.com/shiptest-ss13/Shiptest/commit/f761c784812e827960a66cd10aac17ebc6edfac3, palette for chair.png, steel-bench.png and chair-greyscale.png taken from paradise equivalent chairs at commit https://github.com/ParadiseSS13/Paradise/commit/5ce5a66c814c4a60118d24885389357fd0240002, steel by SonicHDC, brass chair.png taken from tgstation at https://github.com/tgstation/tgstation/blob/b7e7779c19b76449c290aaf2150fb93545b1a79a/icons/obj/chairs.dmi, wooden bench by Ko4erga (discord)", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "bar", - "directions": 4 + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/11402f6ae62facc2e8bcfa1f8ef5353b26663278, meat.png is CC0-1.0 by EmoGarbage404 (github) for Space Station 14. chair.png and its derrivatives taken from shiptest at commit https://github.com/shiptest-ss13/Shiptest/commit/f761c784812e827960a66cd10aac17ebc6edfac3, palette for chair.png, steel-bench.png and chair-greyscale.png taken from paradise equivalent chairs at commit https://github.com/ParadiseSS13/Paradise/commit/5ce5a66c814c4a60118d24885389357fd0240002, steel by SonicHDC, brass chair.png taken from tgstation at https://github.com/tgstation/tgstation/blob/b7e7779c19b76449c290aaf2150fb93545b1a79a/icons/obj/chairs.dmi, pufi-greyscale pufi-greyscale-overlay comfy-greyscale comfy-overlay-greyscale sprited by github:DreamlyJack(624946166152298517)", + "size": { + "x": 32, + "y": 32 }, - { - "name": "bar-knocked", - "directions": 4 - }, - { - "name": "chair", - "directions": 4 - }, - { - "name": "chair-knocked", - "directions": 4 - }, - { - "name": "chair-greyscale", - "directions": 4 - }, - { - "name": "chair-greyscale-knocked", - "directions": 4 - }, - { - "name": "comfy", - "directions": 4 - }, - { - "name": "comfy-overlay", - "directions": 4 - }, - { - "name": "meat", - "directions": 4 - }, - { - "name": "office-dark", - "directions": 4 - }, - { - "name": "office-white", - "directions": 4 - }, - { - "name": "shuttle", - "directions": 4 - }, - { - "name": "shuttle-overlay", - "directions": 4 - }, - { - "name": "stool", - "directions": 4 - }, - { - "name": "stool-knocked", - "directions": 4 - }, - { - "name": "wooden", - "directions": 4 - }, - { - "name": "wooden-bench", - "directions": 4 - }, - { - "name": "wooden-wings", - "directions": 4 - }, - { - "name": "wooden-wings-knocked", - "directions": 4 - }, - { - "name": "ritual", - "directions": 4 - }, - { - "name": "cursed", - "directions": 4 - }, - { - "name": "steel-bench", - "directions": 4 - }, - { - "name": "brass_chair", - "directions": 4 - } - ] + "states": [ + { + "name": "bar", + "directions": 4 + }, + { + "name": "bar-knocked", + "directions": 4 + }, + { + "name": "chair", + "directions": 4 + }, + { + "name": "chair-knocked", + "directions": 4 + }, + { + "name": "chair-greyscale", + "directions": 4 + }, + { + "name": "chair-greyscale-knocked", + "directions": 4 + }, + { + "name": "meat", + "directions": 4 + }, + { + "name": "office-dark", + "directions": 4 + }, + { + "name": "office-white", + "directions": 4 + }, + { + "name": "shuttle", + "directions": 4 + }, + { + "name": "shuttle-overlay", + "directions": 4 + }, + { + "name": "stool", + "directions": 4 + }, + { + "name": "stool-knocked", + "directions": 4 + }, + { + "name": "wooden", + "directions": 4 + }, + { + "name": "wooden-wings", + "directions": 4 + }, + { + "name": "wooden-wings-knocked", + "directions": 4 + }, + { + "name": "ritual", + "directions": 4 + }, + { + "name": "cursed", + "directions": 4 + }, + { + "name": "steel-bench", + "directions": 4 + }, + { + "name": "brass_chair", + "directions": 4 + }, + { + "name": "pufi-box-greyscale" + }, + { + "name": "comfy-greyscale", + "directions": 4 + }, + { + "name": "comfy-random" + }, + { + "name": "pufi-box-random" + }, + { + "name": "wooden-bench", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Structures/Furniture/chairs.rsi/pufi-box-greyscale.png b/Resources/Textures/Structures/Furniture/chairs.rsi/pufi-box-greyscale.png new file mode 100644 index 0000000000000000000000000000000000000000..6be19dcac6bc4c48925657db3eee73dec3eefeb0 GIT binary patch literal 346 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=hEVFtU5PIEF-Uz70Ld+ibw&vzo85 z!jNsTft%Y&iJn6edjhsCkeM`*kvV*&XulPIO<~gS8cu;G{_q2$1*|cQK$om>|2uY#T56(p z+Vqs70G3s&xI8$rMV*u0PTw1LaBaU*!-8Gw!q?w5n>g?BxeTYO-0n;!jw3hgs_*=h zT~H_S!fL5W-KE-|iKl$!8TG{8IbJVSNLHKQ)wii#)mxsiYtfIZ7Rnh%_c3}JG(=h0 lrJe?c3}0%5XPU1sgBFm@0mLA1DR?r7@^tlcS?83{1OObFeFXpj literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Furniture/chairs.rsi/pufi-box-random.png b/Resources/Textures/Structures/Furniture/chairs.rsi/pufi-box-random.png new file mode 100644 index 0000000000000000000000000000000000000000..0f8fb1dd50e81926406d1c11ba9fd8382a90731b GIT binary patch literal 862 zcmV-k1EKthP)^NQjaafoMQN+C|!m8i@i43DK|}H4Pr=wT_emckBSv1_Hb}$jC39DP8OIj`r=6}CrMbZQ*b_W!@Wq>o|Dz zSdsbU8g4q5Wu;W2DFW~#rls^2m5(L=J>{+?t~1gSVCOrDMI`db8$Tg==wF6kUV#OV z$fyw173Zw`%!G5Yr<<5pMQK?3)}dWn(h@-A;|>gBckLz$U8?_G`M(@NszTm)aOD)2 za$ngR%#pW8#fgt=EbEN)1jMyv_^6U>g_PiGSkeQ+dIQT9n0k{1W11x?iq5cGwxzh5 zw(ea|fGq+{scY#4akwYWF#O;iq2ZC+k;E(c9PJ;WC~cx=85Zfr6cIY1^(}~jGAEBj zsFaN4GQ