From a9f7fe8e9a337d13ef34ec643064432d0cec2b60 Mon Sep 17 00:00:00 2001 From: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com> Date: Thu, 16 Jan 2025 23:53:49 -0400 Subject: [PATCH] Downstream Port (#1509) # Changelog :cl: sleepyyapril, Stop-Signs, Memeji - add: Changed the Warden suit's capabilities. (Original author: Stop-Signs) - add: Repeater, Argenti, and 45 magnum rubber box to Bartender's loadout. - add: Red cloak to loadout (Port from Floof PR #390) - add: Witch Robes to loadout (Port from Floof PR #390) - add: Sawed-off PKA (Port from Floof PR #390) - add: The ChemMaster now has 20, 75, and 80 unit options available. - tweak: Made the ChemMaster wider. - fix: Ported Frontier fix to mag visuals on specific guns. - fix: Fixed heirlooms flickering negative mood when the moodlet ended. --------- Signed-off-by: Stop-Signs Signed-off-by: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com> Co-authored-by: Stop-Signs Co-authored-by: FoxxoTrystan <45297731+FoxxoTrystan@users.noreply.github.com> Co-authored-by: Radezolid Co-authored-by: ErhardSteinhauer <65374927+ErhardSteinhauer@users.noreply.github.com> Co-authored-by: VMSolidus --- .../Chemistry/UI/ChemMasterWindow.xaml | 16 +++---- .../Chemistry/UI/ChemMasterWindow.xaml.cs | 5 ++- .../EntitySystems/ConditionalSpawnerSystem.cs | 14 +++++- .../Traits/Assorted/HeirloomSystem.cs | 11 +++-- Content.Shared/Chemistry/SharedChemMaster.cs | 3 ++ .../VendingMachines/Inventories/theater.yml | 3 ++ .../Jobs/Service/bartender.yml | 4 ++ .../Clothing/OuterClothing/hardsuits.yml | 8 ++-- .../Entities/Clothing/Head/hoods.yml | 17 +++++++ .../Entities/Clothing/Neck/cloaks.yml | 16 +++++++ .../Entities/Clothing/OuterClothing/suits.yml | 11 +++++ .../Objects/Weapons/Guns/Basic/pka.yml | 7 +++ .../Loadouts/Jobs/Service/bartender.yml | 42 ++++++++++++++++++ .../Mood/genericNegativeEffects.yml | 5 +++ .../Mood/genericPositiveEffects.yml | 2 +- .../Entities/Clothing/Belt/belts.yml | 2 + .../Entities/Clothing/Head/hats.yml | 3 ++ .../Entities/Objects/Weapons/Melee/knives.yml | 3 ++ .../_NF/Entities/Clothing/Neck/cloaks.yml | 10 +++++ .../Objects/Weapons/Guns/Basic/sawn_pka.yml | 27 +++++++++++ .../Objects/Weapons/Guns/Rifles/rifles.yml | 15 ++++--- .../Objects/Weapons/Guns/Snipers/snipers.yml | 31 +++++++++++++ .../Construction/Graphs/weapons/pkasawn.yml | 12 +++++ .../Hoods/redhood.rsi/equipped-HELMET.png | Bin 0 -> 682 bytes .../Clothing/Head/Hoods/redhood.rsi/icon.png | Bin 0 -> 235 bytes .../Clothing/Head/Hoods/redhood.rsi/meta.json | 18 ++++++++ .../Neck/Cloaks/redhood.rsi/equipped-NECK.png | Bin 0 -> 1077 bytes .../Clothing/Neck/Cloaks/redhood.rsi/icon.png | Bin 0 -> 392 bytes .../Neck/Cloaks/redhood.rsi/inhand-left.png | Bin 0 -> 821 bytes .../Neck/Cloaks/redhood.rsi/inhand-right.png | Bin 0 -> 784 bytes .../Neck/Cloaks/redhood.rsi/meta.json | 26 +++++++++++ .../witchrobe.rsi/equipped-OUTERCLOTHING.png | Bin 0 -> 612 bytes .../Suits/witchrobe.rsi/icon.png | Bin 0 -> 330 bytes .../Suits/witchrobe.rsi/inhand-left.png | Bin 0 -> 725 bytes .../Suits/witchrobe.rsi/inhand-right.png | Bin 0 -> 730 bytes .../Suits/witchrobe.rsi/meta.json | 26 +++++++++++ .../Neck/Cloaks/janitor.rsi/equipped-NECK.png | Bin 0 -> 1247 bytes .../Clothing/Neck/Cloaks/janitor.rsi/icon.png | Bin 0 -> 515 bytes .../Neck/Cloaks/janitor.rsi/inhand-left.png | Bin 0 -> 755 bytes .../Neck/Cloaks/janitor.rsi/inhand-right.png | Bin 0 -> 799 bytes .../Neck/Cloaks/janitor.rsi/meta.json | 33 ++++++++++++++ .../janitor.rsi/plunger-equipped-NECK.png | Bin 0 -> 225 bytes .../Neck/Cloaks/janitor.rsi/plunger.png | Bin 0 -> 193 bytes .../equipped-BELT.png | Bin 0 -> 8773 bytes .../sawn_kinetic_accelerator.rsi/icon.png | Bin 0 -> 7007 bytes .../inhand-left.png | Bin 0 -> 9405 bytes .../inhand-right.png | Bin 0 -> 9434 bytes .../sawn_kinetic_accelerator.rsi/meta.json | 26 +++++++++++ .../Guns/Snipers/repeater.rsi/base.png | Bin 0 -> 4994 bytes .../Guns/Snipers/repeater.rsi/bolt-open.png | Bin 0 -> 4766 bytes .../repeater.rsi/equipped-BACKPACK.png | Bin 0 -> 1294 bytes .../repeater.rsi/equipped-SUITSTORAGE.png | Bin 0 -> 1294 bytes .../Guns/Snipers/repeater.rsi/inhand-left.png | Bin 0 -> 4826 bytes .../Snipers/repeater.rsi/inhand-right.png | Bin 0 -> 4800 bytes .../Guns/Snipers/repeater.rsi/meta.json | 41 +++++++++++++++++ .../repeater.rsi/wielded-inhand-left.png | Bin 0 -> 7348 bytes .../repeater.rsi/wielded-inhand-right.png | Bin 0 -> 7293 bytes 57 files changed, 410 insertions(+), 27 deletions(-) create mode 100644 Resources/Prototypes/_NF/Entities/Clothing/Neck/cloaks.yml create mode 100644 Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Basic/sawn_pka.yml create mode 100644 Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Snipers/snipers.yml create mode 100644 Resources/Prototypes/_NF/Recipes/Construction/Graphs/weapons/pkasawn.yml create mode 100644 Resources/Textures/Clothing/Head/Hoods/redhood.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/Clothing/Head/Hoods/redhood.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Head/Hoods/redhood.rsi/meta.json create mode 100644 Resources/Textures/Clothing/Neck/Cloaks/redhood.rsi/equipped-NECK.png create mode 100644 Resources/Textures/Clothing/Neck/Cloaks/redhood.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Neck/Cloaks/redhood.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Neck/Cloaks/redhood.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/Neck/Cloaks/redhood.rsi/meta.json create mode 100644 Resources/Textures/Clothing/OuterClothing/Suits/witchrobe.rsi/equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/Clothing/OuterClothing/Suits/witchrobe.rsi/icon.png create mode 100644 Resources/Textures/Clothing/OuterClothing/Suits/witchrobe.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/OuterClothing/Suits/witchrobe.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/OuterClothing/Suits/witchrobe.rsi/meta.json create mode 100644 Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/equipped-NECK.png create mode 100644 Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/icon.png create mode 100644 Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/inhand-left.png create mode 100644 Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/inhand-right.png create mode 100644 Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/meta.json create mode 100644 Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/plunger-equipped-NECK.png create mode 100644 Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/plunger.png create mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Basic/sawn_kinetic_accelerator.rsi/equipped-BELT.png create mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Basic/sawn_kinetic_accelerator.rsi/icon.png create mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Basic/sawn_kinetic_accelerator.rsi/inhand-left.png create mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Basic/sawn_kinetic_accelerator.rsi/inhand-right.png create mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Basic/sawn_kinetic_accelerator.rsi/meta.json create mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/base.png create mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/bolt-open.png create mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/equipped-BACKPACK.png create mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/equipped-SUITSTORAGE.png create mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/inhand-left.png create mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/inhand-right.png create mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/meta.json create mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/wielded-inhand-left.png create mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/wielded-inhand-right.png diff --git a/Content.Client/Chemistry/UI/ChemMasterWindow.xaml b/Content.Client/Chemistry/UI/ChemMasterWindow.xaml index b1f4f5917f4..61bbba3c35f 100644 --- a/Content.Client/Chemistry/UI/ChemMasterWindow.xaml +++ b/Content.Client/Chemistry/UI/ChemMasterWindow.xaml @@ -2,7 +2,7 @@ xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client" - MinSize="620 670" + MinSize="620 770" Title="{Loc 'chem-master-bound-user-interface-title'}"> @@ -13,12 +13,12 @@