Merge remote-tracking branch 'WD-core/master' into upstream-3

Content.Server/Administration/QuickDialogSystem.OpenDialog.cs

@@ -6,7 +6,7 @@ namespace Content.Server.Administration;
 
 //res<IEntityManager>().System<MindSystem>().TryGetSession(new EntityUid(X), out var seks);res<IEntityManager>().System<QuickDialogSystem>().OpenDialog<string, bool, bool, int, VoidOption, VoidOption, Hex16>(seks, "Заголовок", "Серийный код твоей матери", "Селёдкой пахнет?", "Сосал?", "Сколько ванотян жрал хуёв:", "тыгыдык тыгыдык тыгыдык тыгыдык" ," ", "Вскрываем байты", (_,_,_,_,_,_,_)=>{});
 //
-//List<(Type, string, object)> entries = new();entries.Add((typeof(string), "shitass", "faggot"));entries.Add((typeof(int), "cunt", 2254))
+//List<(Type, string, object)> entries = new();entries.Add((typeof(string), "shitass", "idiot"));entries.Add((typeof(int), "cunt", 2254))
 //res<IEntityManager>().System<MindSystem>().TryGetSession(new EntityUid(X), out var seks);res<IEntityManager>().System<QuickDialogSystem>().OpenDialog(seks, "Заголовок", entries, (_)=>{});
 public sealed partial class QuickDialogSystem
 {

Content.Server/_White/MeatyOre/MeatyOreStoreSystem.cs

@@ -76,40 +76,41 @@ public sealed class MeatyOreStoreSystem : EntitySystem
 
         SubscribeLocalEvent<RoundRestartCleanupEvent>(OnPostRoundCleanup);
         SubscribeNetworkEvent<MeatyOreShopRequestEvent>(OnShopRequested);
-        //SubscribeLocalEvent<GetVerbsEvent<Verb>>(MeatyOreVerbs);
+
+        // SubscribeLocalEvent<GetVerbsEvent<Verb>>(MeatyOreVerbs);
     }
 
-//    private void MeatyOreVerbs(GetVerbsEvent<Verb> ev)
+    //    private void MeatyOreVerbs(GetVerbsEvent<Verb> ev)
-//    {
+    //    {
-//        if (!_antagGrantEnabled)
+    //        if (!_antagGrantEnabled)
-//            return;
+    //            return;
-//
+    //
-//        if (!EntityManager.TryGetComponent<ActorComponent>(ev.User, out var actorComponent))
+    //        if (!EntityManager.TryGetComponent<ActorComponent>(ev.User, out var actorComponent))
-//            return;
+    //            return;
-//
+    //
-//        if (!_sponsorsManager.TryGetInfo(actorComponent.PlayerSession.UserId, out _))
+    //        if (!_sponsorsManager.TryGetInfo(actorComponent.PlayerSession.UserId, out _))
-//            return;
+    //            return;
-//
+    //
-//        if (!HasComp<HumanoidAppearanceComponent>(ev.Target))
+    //        if (!HasComp<HumanoidAppearanceComponent>(ev.Target))
-//            return;
+    //            return;
-//
+    //
-//         if (!TryGetStore(actorComponent.PlayerSession, out var store, out var storeEntity))
+    //         if (!TryGetStore(actorComponent.PlayerSession, out var store, out var storeEntity))
-//             return;
+    //             return;
-//
+    //
-//         var verb = new Verb
+    //         var verb = new Verb
-//         {
+    //         {
-//             Text = "Выдать роль.",
+    //             Text = "Выдать роль.",
-//             ConfirmationPopup = true,
+    //             ConfirmationPopup = true,
-//             Message = $"Цена - {MeatyOreCurrencyPrototype}:10",
+    //             Message = $"Цена - {MeatyOreCurrencyPrototype}:10",
-//             Act = () =>
+    //             Act = () =>
-//             {
+    //             {
-//                 TryAddRole(ev.User, ev.Target, store, storeEntity.Value);
+    //                 TryAddRole(ev.User, ev.Target, store, storeEntity.Value);
-//             },
+    //             },
-//             Category = VerbCategory.MeatyOre
+    //             Category = VerbCategory.MeatyOre
-//         };
+    //         };
-//
+    //
-//        ev.Verbs.Add();
+    //        ev.Verbs.Add();
-//    }
+    //    }
 
     private void OnPanelEnableChanged(bool enabled)
     {
@@ -269,21 +270,21 @@ public sealed class MeatyOreStoreSystem : EntitySystem
         }
     }
 
-//    private async void TryBanDolboeb(ICommonSession session)
+    //    private async void TryBanDolboeb(ICommonSession session)
-//     {
+    //     {
-//         if(_banManager.GetServerBans(session.UserId).Count > 0)
+    //         if(_banManager.GetServerBans(session.UserId).Count > 0)
-//             return;
+    //             return;
-//
+    //
-//         _banManager.CreateServerBan(session.UserId,
+    //         _banManager.CreateServerBan(session.UserId,
-//             session.Name,
+    //             session.Name,
-//             null,
+    //             null,
-//             null,
+    //             null,
-//             null,
+    //             null,
-//             2880,
+    //             2880,
-//             NoteSeverity.Minor,
+    //             NoteSeverity.Minor,
-//             "Кусок дерьма, блядина нахуй! У НАС АНТАЖКУ ВЫДАВАТЬ ЗАПРЕЩЕНО НАХУЙ!!!! ЧТОБ ТЯ ВЫЕБАЛИ СТО НЕГРОВ НАХУЙ!",
+    //             "Кусок дерьма, блядина нахуй! У НАС АНТАЖКУ ВЫДАВАТЬ ЗАПРЕЩЕНО НАХУЙ!!!! ЧТОБ ТЯ ВЫЕБАЛИ СТО НЕГРОВ НАХУЙ!",
-//             false);
+    //             false);
-//     }
+    //     }
 
     private async Task<bool> GrantAntagonist(string ckey, bool isFriend)
     {

Content.Shared/RCD/Components/RCDComponent.cs

@@ -1,5 +1,6 @@
 using Content.Shared._White.RCD;
 using Content.Shared.RCD.Systems;
+using Content.Shared.Whitelist;
 using Robust.Shared.Audio;
 using Robust.Shared.GameStates;
 using Robust.Shared.Physics;
@@ -76,4 +77,11 @@ public sealed partial class RCDComponent : Component
     /// </remarks>
     [ViewVariables(VVAccess.ReadOnly)]
     public Transform ConstructionTransform { get; private set; } = default!;
+
+    /// <summary>
+    /// WD.
+    /// A blacklist for limiting entities of the same construction group on one tile.
+    /// </summary>
+    [DataField]
+    public EntityWhitelist? BlacklistOnOneTile;
 }

Content.Shared/RCD/Systems/RCDSystem.cs

@@ -13,6 +13,7 @@ using Content.Shared.Popups;
 using Content.Shared.RCD.Components;
 using Content.Shared.Tag;
 using Content.Shared.Tiles;
+using Content.Shared.Whitelist;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Map;
 using Robust.Shared.Map.Components;
@@ -47,6 +48,7 @@ public class RCDSystem : EntitySystem
     [Dependency] private readonly IPrototypeManager _protoManager = default!;
     [Dependency] private readonly SharedMapSystem _mapSystem = default!;
     [Dependency] private readonly TagSystem _tags = default!;
+    [Dependency] private readonly EntityWhitelistSystem _blacklist = default!;
 
     private readonly int _instantConstructionDelay = 0;
     private readonly EntProtoId _instantConstructionFx = "EffectRCDConstruct0";
@@ -405,21 +407,40 @@ public class RCDSystem : EntitySystem
             // Check for existing identical entities in the same tile
             _intersectingEntities.Clear();
             _lookup.GetLocalEntitiesIntersecting(mapGridData.GridUid, mapGridData.Position, _intersectingEntities, -0.05f, LookupFlags.Uncontained);
-
+            // WD EDIT START
             if (component.CachedPrototype.Prototype != null)
             {
                 foreach (var entity in _intersectingEntities)
                 {
-                    // Check if the entity has the same prototype ID
+                    var entityID = MetaData(entity).EntityPrototype?.ID;
-                    if (MetaData(entity).EntityPrototype?.ID == component.CachedPrototype.Prototype)
+                    if (entityID == null)
+                        continue;
+
+                    // Prevents building entities from same construction group on one tile
+                    if (component.BlacklistOnOneTile?.Tags != null)
+                    {
+                        foreach (var tag in component.BlacklistOnOneTile.Tags)
+                        {
+                            if (_blacklist.IsValid(component.BlacklistOnOneTile, entity) && component.CachedPrototype.Category == tag)
+                            {
+                                if (popMsgs)
+                                    _popup.PopupClient(Loc.GetString("rcd-component-cannot-build-blacklisted-entity"), uid, user);
+                                return false;
+                            }
+                        }
+                    }
+
+                    // Prevents building identical electrical entities on same tile
+                    if (component.CachedPrototype.Category == "Electrical" && entityID == component.CachedPrototype.Prototype)
                     {
                         if (popMsgs)
-                            _popup.PopupClient("An identical object already exists in this location.", uid, user);
+                            _popup.PopupClient(Loc.GetString("rcd-component-cannot-build-identical-entity"), uid, user);
 
                         return false;
                     }
                 }
             }
+            // WD EDIT END
 
             var isWindow = component.CachedPrototype.ConstructionRules.Contains(RcdConstructionRule.IsWindow);
             var isCatwalk = component.CachedPrototype.ConstructionRules.Contains(RcdConstructionRule.IsCatwalk);

Resources/Changelog/ChangelogWhite.yml

@@ -1,50 +1,4 @@
 Entries:
-- author: NCast
-  changes:
-  - message: "\u0414\u043E\u0431\u0430\u0432\u0438\u043B \u0440\u0435\u0446\u0435\u043F\
-      \u0442\u044B \u0441\u043B\u0435\u0434\u0443\u044E\u0449\u0438\u043C \u043F\u0440\
-      \u043E\u0434\u0443\u043A\u0442\u0430\u043C: \u042F\u0439\u0446\u0430 \u0431\u0435\
-      \u043D\u0435\u0434\u0438\u043A\u0442, \u042F\u0438\u0447\u043D\u0438\u0446\u0430\
-      , \u041C\u043E\u043B\u043E\u0447\u043D\u0430\u044F \u043E\u0431\u0435\u0437\u044C\
-      \u044F\u043D\u0430, \u0413\u0430\u043C\u0431\u0430\u043B, \u041B\u041E\u041B\
-      \u0418\u043F\u043E\u043F, \u041C\u0430\u0444\u0444\u0438\u043D, \u0411\u0443\
-      \u043B\u043E\u0447\u043A\u0430 \u0445\u043E\u0442\u043A\u0440\u043E\u0441\u0441"
-    type: Add
-  id: 104
-  time: '2023-03-05T10:51:33.0000000+00:00'
-- author: rhailrake
-  changes:
-  - message: "\u0424\u043B\u0435\u0448\u043A\u0430 \u0431\u043E\u0440\u0433\u043E\u0432\
-      \ \u0442\u0435\u043F\u0435\u0440\u044C \u0437\u0430\u0440\u044F\u0436\u0430\u0435\
-      \u0442\u0441\u044F!"
-    type: Add
-  - message: "RCD \u0431\u043E\u0440\u0433\u043E\u0432 \u0442\u043E\u0436\u0435 \u0442\
-      \u0435\u043F\u0435\u0440\u044C \u0437\u0430\u0440\u044F\u0436\u0430\u0435\u0442\
-      \u0441\u044F."
-    type: Fix
-  - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u044B \u043D\u043E\u0440\
-      \u043C\u0430\u043B\u044C\u043D\u044B\u0435 \u0438\u043D\u0441\u0442\u0440\u0443\
-      \u043C\u0435\u043D\u0442\u044B \u0438\u043D\u0436\u0435\u043D\u0435\u0440\u043D\
-      \u043E\u043C\u0443 \u0431\u043E\u0440\u0433\u0443."
-    type: Add
-  - message: "\u0421\u0438\u0441\u0442\u0435\u043C\u0430 \u0440\u0435\u0444\u043B\u0435\
-      \u043A\u0442\u043E\u0432!"
-    type: Add
-  - message: "\u0414\u0432\u043E\u0439\u043D\u043E\u0439 \u0435-\u0441\u0432\u043E\
-      \u0440\u0434(\u043A\u0440\u0430\u0444\u0442\u0438\u0442\u0441\u044F \u0432 \u043A\
-      \u0440\u0430\u0444\u0442\u0438\u043D\u0433\u0435 \u0432 \u043A\u0430\u0442\u0435\
-      \u0433\u043E\u0440\u0438\u0438 Weapons \u0438\u0437 \u0434\u0432\u0443\u0445\
-      \ \u0435-\u0441\u0432\u043E\u0440\u0434\u043E\u0432)."
-    type: Add
-  id: 105
-  time: '2023-03-05T17:57:30.0000000+00:00'
-- author: HitPanda
-  changes:
-  - message: "\u0410\u043F\u0434\u0435\u0439\u0442 \u043A\u0430\u0440\u0442\u044B\
-      \ White box"
-    type: Tweak
-  id: 106
-  time: '2023-03-06T20:05:22.0000000+00:00'
 - author: KettlebellOfCreation
   changes:
   - message: "\u0442\u0435\u043F\u0435\u0440\u044C, \u043A\u0430\u043A \u0442\u043E\
@@ -8884,3 +8838,36 @@
   id: 603
   time: '2024-11-11T07:02:02.0000000+00:00'
   url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/782
+- author: BIG_Zi_348
+  changes:
+  - message: "\u0418\u0437\u043C\u0435\u043D\u0435\u043D\u044B \u043F\u0440\u043E\u0432\
+      \u0435\u0440\u043A\u0438 \u043F\u043E\u0441\u0442\u0440\u043E\u0439\u043A\u0438\
+      \ \u043E\u0431\u044A\u0435\u043A\u0442\u043E\u0432 \u0434\u043B\u044F \u0420\
+      \u0426\u0414 \u0438 \u0420\u041F\u0414."
+    type: Tweak
+  id: 604
+  time: '2024-11-16T09:53:37.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/759
+- author: Jabak
+  changes:
+  - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D \u0442\u0440\u0430\u0432\
+      \u043C\u0430\u0442\u0438\u0447\u0435\u0441\u043A\u0438\u0439 \u0434\u0440\u043E\
+      \u0431\u043E\u0432\u0438\u043A."
+    type: Add
+  - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D \u0441\u043F\u0430\u0432\
+      \u043D \u0438\u043D\u0441\u043F\u0435\u043A\u0442\u043E\u0440\u0430 \u043D\u0430\
+      \ 3 \u043A\u0430\u0440\u0442\u0430\u0445."
+    type: Add
+  id: 605
+  time: '2024-11-16T19:55:09.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/764
+- author: BIG_Zi_348
+  changes:
+  - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u0430 \u043D\u043E\u0432\
+      \u0430\u044F \u043C\u0443\u0437\u044B\u043A\u0430 \u0432 \u043C\u0443\u0437\u044B\
+      \u043A\u0430\u043B\u044C\u043D\u044B\u0439 \u0430\u0432\u0442\u043E\u043C\u0430\
+      \u0442."
+    type: Add
+  id: 606
+  time: '2024-11-16T19:56:48.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/779

Resources/Locale/ru-RU/rcd/components/rcd-component.ftl

@@ -30,7 +30,8 @@ rcd-component-must-build-on-subfloor-message = Вы можете строить
 rcd-component-cannot-build-on-subfloor-message = Вы не можете строить это на открытом полу!
 rcd-component-cannot-build-on-occupied-tile-message = Вы не можете строить здесь, это место уже занято!
 rcd-component-cannot-build-identical-tile = Эта плитка уже существует!
-
+rcd-component-cannot-build-blacklisted-entity = Вы не можете строить здесь, недостаточно свободного места!
+rcd-component-cannot-build-identical-entity = Идентичный объект уже существует в этом месте!
 
 ### Category names
 

Resources/Maps/White/DryDock.yml

@@ -18416,7 +18416,7 @@ entities:
     - type: Transform
       pos: 12.8871565,-5.2782454
       parent: 17144
-- proto: BoxResinShot
+- proto: BoxRubberShot
   entities:
   - uid: 17282
     components:
@@ -114123,7 +114123,7 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -149.58974,10.572603
       parent: 2
-- proto: WeaponResinShotgun
+- proto: WeaponRubberShotgun
   entities:
   - uid: 17280
     components:

Resources/Maps/White/WhiteMoose.yml

@@ -14960,7 +14960,7 @@ entities:
     - type: Transform
       pos: 9.52937,15.355085
       parent: 2
-- proto: BoxResinShot
+- proto: BoxRubberShot
   entities:
   - uid: 13214
     components:
@@ -106899,7 +106899,7 @@ entities:
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
-- proto: WeaponResinShotgun
+- proto: WeaponRubberShotgun
   entities:
   - uid: 14524
     components:

Resources/Maps/White/Whitebox.yml

@@ -22174,7 +22174,7 @@ entities:
     - type: Transform
       pos: 46.48018,-25.706886
       parent: 2
-- proto: BoxResinShot
+- proto: BoxRubberShot
   entities:
   - uid: 12481
     components:
@@ -181701,7 +181701,7 @@ entities:
     - type: Transform
       pos: 25.484055,36.464966
       parent: 2
-- proto: WeaponResinShotgun
+- proto: WeaponRubberShotgun
   entities:
   - uid: 12477
     components:

Resources/Prototypes/Entities/Objects/Tools/tools.yml

@@ -466,6 +466,9 @@
     - APC # WD
     - Camera # WD
     - Deconstruct
+    blacklistOnOneTile: # WD
+      tags:
+      - Lighting
 
 - type: entity
   id: RCDEmpty
@@ -528,6 +531,9 @@
     - DisposalUnit # disposal units
     - MailingUnit
     - ToiletEmpty
+    blacklistOnOneTile: # WD
+      tags:
+      - DisposalUnits
 
 - type: entity # WD
   id: RapidPipeDispenserEmpty

Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml

@@ -81,6 +81,9 @@
       - !type:PlaySoundBehavior
         sound:
           collection: GlassBreak
+  - type: Tag # WD EDIT
+    tags:
+    - Lighting
   - type: LightingOverlay # WD
   - type: LightMark
   placement:

Resources/Prototypes/Entities/Structures/Piping/Disposal/units.yml

@@ -64,6 +64,9 @@
   - type: StaticPrice
     price: 62
   - type: PowerSwitch
+  - type: Tag # WD EDIT
+    tags:
+    - DisposalUnits
 
 - type: entity
   id: DisposalUnit

Resources/Prototypes/_White/Entities/Objects/Misc/implanters.yml

@@ -43,15 +43,6 @@
   - type: Implanter
     implant: NeuroStabilizationImplant
 
-#Amour
-- type: entity
-  id: GenderSwapImplanter
-  name: gender swap implanter
-  parent: BaseImplantOnlyImplanter
-  components:
-  - type: Implanter
-    implant: GenderSwapImplant
-
 - type: entity
   parent: BaseImplantOnlyImplanterSyndi
   id: VoiceActivatedBombImplanter

Resources/Prototypes/_White/Entities/Objects/Misc/subdermal_implants.yml

@@ -49,17 +49,6 @@
     tags:
     - NeuroStabilization
 
-#Amour
-- type: entity
-  parent: BaseSubdermalImplant
-  id: GenderSwapImplant
-  name: Gender Swap Implant
-  description: This swaps the users gender on activation.
-  noSpawn: true
-  components:
-  - type: SubdermalImplant
-    implantAction: ActionActivateGenderSwapImplant
-
 - type: entity
   parent: BaseSubdermalImplant
   id: VoiceActivatedBombImplant

Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.yml

@@ -0,0 +1,13 @@
+# Shotgun Shells
+- type: entity
+  name: коробка резиновой дроби
+  parent: AmmoProviderShotgunShell
+  id: BoxRubberShot
+  description: A dispenser box full of beanbag shots, designed for riot shotguns.
+  components:
+    - type: BallisticAmmoProvider
+      proto: ShellShotgunRubberShot
+    - type: Sprite
+      layers:
+        - state: boxwide
+        - state: shellrubber

Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml

@@ -0,0 +1,16 @@
+- type: entity
+  id: ShellShotgunRubberShot
+  name: ружейный патрон (.49 резиновая дробь)
+  parent: BaseShellShotgun
+  components:
+  - type: Tag
+    tags:
+    - ShellRubberShotgun
+  - type: Sprite
+    layers:
+    - state: rubber
+      map: [ "enum.AmmoVisualLayers.Base" ]
+  - type: CartridgeAmmo
+    proto: PelletShotgunRubberShot
+  - type: SpentAmmoVisuals
+    state: rubber

Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml

@@ -0,0 +1,16 @@
+- type: entity
+  id: PelletShotgunRubberShot
+  name: резиновая дробь (.49)
+  noSpawn: true
+  parent: [BaseBullet, BaseBulletTrail]
+  components:
+  - type: Sprite
+    sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi
+    state: buckshot
+  - type: Projectile
+    damage:
+      types:
+        Blunt: 1
+  - type: StaminaDamageOnCollide
+    ignoreResistances: false
+    damage: 25

Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml

@@ -0,0 +1,24 @@
+- type: entity
+  name: травматический дробовик
+  parent: BaseWeaponShotgun
+  id: WeaponRubberShotgun
+  description: Вот что выходит, когда старый дизайн Ремингтона соединяется с современными материалами. Модифицирован под миротворческие нужны Службы Безопасности. Использует патроны калибра .49 ружейный.
+  components:
+  - type: Item
+    size: Normal
+    shape:
+    - 0,0,4,0
+    sprite: White/Objects/Weapons/Guns/Shotguns/rubber_pump_inhands_64x.rsi
+  - type: Sprite
+    sprite: White/Objects/Weapons/Guns/Shotguns/rubber_pump.rsi
+  - type: Clothing
+    sprite: White/Objects/Weapons/Guns/Shotguns/rubber_pump_onbody.rsi
+  - type: BallisticAmmoProvider
+    proto: ShellShotgunRubberShot
+    capacity: 6
+    whitelist:
+      tags:
+      - ShellRubberShotgun
+  - type: Tag
+    tags:
+    - WeaponRubberShotgun

Resources/Prototypes/_White/Ghosts/custom_ghosts.yml

@@ -492,15 +492,6 @@
   ghostName: Devf_2
   ghostDescription: Aladeen madafaka
 
-#DEN4IK_64
-- type: customGhost
-  id: den4ik_64-ghost
-  ckey: DEN4IK__64
-  sprite: White/Ghosts/DEN4IK_64-ghost.rsi
-  alpha: 0.9
-  ghostName: Никелевый камушек
-  ghostDescription: Этот камушек имеет талант, знаешь что я тебе за это дам???
-
 #BIG_Zi_348
 - type: customGhost
   id: big_zi_348-ghost

Resources/Prototypes/_White/JukeboxSongs/LobbySongs.yml

@@ -7,278 +7,410 @@
 # Songs
 - type: jukebox # WD
   id: SpaceOddity
-  name: Song - Space Oddity
+  name: "Song - Space Oddity"
   path:
     path: /Audio/White/Music/Lobby/Songs/SpaceOddity.ogg
 
 - type: jukebox # WD
   id: SpaceAsshole
-  name: Song - Space Asshole
+  name: "Song - Space Asshole"
   path:
     path: /Audio/White/Music/Lobby/Songs/SpaceAsshole.ogg
 
 - type: jukebox # WD
   id: SpaceShuttle
-  name: Song - Space Shuttle
+  name: "Song - Space Shuttle"
   path:
     path: /Audio/White/Music/Lobby/Songs/SpaceShuttle.ogg
 
 - type: jukebox # WD
   id: TheSettler
-  name: Song - The Settler
+  name: "Song - The Settler"
   path:
     path: /Audio/White/Music/Lobby/Songs/TheSettler.ogg
 
 - type: jukebox # WD
   id: TheWizard
-  name: Song - The Wizard
+  name: "Song - The Wizard"
   path:
     path: /Audio/White/Music/Lobby/Songs/TheWizard.ogg
 
 - type: jukebox # WD
   id: CirclesAroundTheSun
-  name: Song - Circles Around The Sun
+  name: "Song - Circles Around The Sun"
   path:
     path: /Audio/White/Music/Lobby/Songs/CirclesAroundTheSun.ogg
 
 - type: jukebox # WD
   id: RetroFilk
-  name: Song - RetroFilk
+  name: "Song - RetroFilk"
   path:
     path: /Audio/White/Music/Lobby/Songs/RetroFilk.ogg
 
 - type: jukebox # WD
   id: AllThatICanSee
-  name: Song - All That I Can See
+  name: "Song - All That I Can See"
   path:
     path: /Audio/White/Music/Lobby/Songs/AllThatICanSee.ogg
 
+- type: jukebox # WD
+  id: ARealHero
+  name: "[NEW] Song - A Real Hero"
+  path:
+    path: /Audio/White/Jukebox/Music/A_Real_Hero.ogg
+
+- type: jukebox # WD
+  id: EnjoytheSilence
+  name: "[NEW] Song - Enjoy the Silence"
+  path:
+    path: /Audio/White/Jukebox/Music/Enjoy_the_Silence.ogg
+
+- type: jukebox # WD
+  id: INVISIBLE
+  name: "[NEW] Song - INVISIBLE"
+  path:
+    path: /Audio/White/Jukebox/Music/INVISIBLE.ogg
+
+- type: jukebox # WD
+  id: Nuclear
+  name: "[NEW] Song - Nuclear"
+  path:
+    path: /Audio/White/Jukebox/Music/Nuclear.ogg
+
+- type: jukebox # WD
+  id: MusicMessagesfromtheStars
+  name: "[NEW] Song - Messages from the Stars"
+  path:
+    path: /Audio/White/Jukebox/Music_Messages_from_the_Stars.ogg
+
 # Music
 
 - type: jukebox # WD
   id: Thunderdome
-  name: Music - Thunderdome
+  name: "Music - Thunderdome"
   path:
     path: /Audio/White/Music/Lobby/Music/thunderdome.ogg
 
 - type: jukebox # WD
   id: Singuloose
-  name: Music - Singuloose
+  name: "Music - Singuloose"
   path:
     path: /Audio/White/Music/Lobby/Music/singuloose.ogg
 
 - type: jukebox # WD
   id: LasersRipApartTheBulkhead
-  name: Music - Laser rip apart the bulkhead
+  name: "Music - Laser rip apart the bulkhead"
   path:
     path: /Audio/White/Music/Lobby/Music/lasers_rip_apart_the_bulkhead.ogg
 
 - type: jukebox # WD
   id: EveryLightIsBlinkingAtOnce
-  name: Music - Every light is blinking at once
+  name: "Music - Every light is blinking at once"
   path:
     path: /Audio/White/Music/Lobby/Music/every_light_is_blinking_at_once.ogg
 
 - type: jukebox # WD
   id: AtomicAmnesiaMMX
-  name: Music - Atomic amnesia mmx
+  name: "Music - Atomic amnesia mmx"
   path:
     path: /Audio/White/Music/Lobby/Music/atomicamnesiammx.ogg
 
 - type: jukebox # WD
   id: SpacSpac
-  name: Music - Spac Spac
+  name: "Music - Spac Spac"
   path:
     path: /Audio/White/Music/Lobby/Music/Spac_Stac.ogg
 
 - type: jukebox # WD
   id: CometHaley
-  name: Music - Comet Haley
+  name: "Music - Comet Haley"
   path:
     path: /Audio/White/Music/Lobby/Music/comet_haley.ogg
 
 - type: jukebox # WD
   id: Delirium
-  name: Music - Delirium
+  name: "Music - Delirium"
   path:
     path: /Audio/White/Music/Lobby/Music/delirium.ogg
 
 - type: jukebox # WD
   id: MagicFly
-  name: Music - Magic Fly
+  name: "Music - Magic Fly"
   path:
     path: /Audio/White/Music/Lobby/Music/magicfly.ogg
 
 - type: jukebox # WD
   id: CrokketTheme
-  name: Music - Crokket theme
+  name: "Music - Crokket theme"
   path:
     path: /Audio/White/Music/crokett_39_s_theme.ogg
 
 - type: jukebox # WD
   id: Guts
-  name: Music - Guts
+  name: "Music - Guts"
   path:
     path: /Audio/White/Music/guts.ogg
 
 - type: jukebox # WD
   id: VoyageNeverEnding
-  name: Music - Voyage Never Ending
+  name: "Music - Voyage Never Ending"
   path:
     path: /Audio/Ambience/voyage_neverending.ogg
 
 - type: jukebox # HONK
   id: CosmicTemperance
-  name: Music - Cosmic Temperance
+  name: "Music - Cosmic Temperance"
   path:
-    path: /Audio/_Honk/Jukebox/blinch_Cosmic_Temperance.ogg
+    path: /Audio/_Honk//blinch_Cosmic_Temperance.ogg
 
 - type: jukebox # WD
   id: LibetsDelay
-  name: Music - Libets Delay
+  name: "Music - Libets Delay"
   path:
     path: /Audio/White/Music/Lobby/Music/Libets_Delay.ogg
 
 - type: jukebox # WD
   id: ItsJustABurningMemory
-  name: Music - Its just a burning memory
+  name: "Music - Its just a burning memory"
   path:
     path: /Audio/White/Music/Lobby/Music/Its_just_a_burning_memory.ogg
 
 - type: jukebox # HONK
   id: AnamnesisoftheworldsSin
-  name: "[NEW] Music - Anamnesis of the world's Sin"
+  name: "Music - Anamnesis of the world's Sin"
   path:
     path: /Audio/_Honk/Jukebox/blinch_Anamnesis_of_the worlds_Sin.ogg
 
 - type: jukebox # HONK
   id: DarkMatterMoon
-  name: "[NEW] Music - Dark Matter Moon"
+  name: "Music - Dark Matter Moon"
   path:
     path: /Audio/_Honk/Jukebox/blinch_Dark_Matter_Moon.ogg
 
 - type: jukebox # HONK
   id: EmptyOcean
-  name: "[NEW] Music - Empty Ocean"
+  name: "Music - Empty Ocean"
   path:
     path: /Audio/_Honk/Jukebox/blinch_Empty_Ocean.ogg
 
 - type: jukebox # HONK
   id: GoldenWinPiano
-  name: "[NEW] Music - Golden Win Piano"
+  name: "Music - Golden Win Piano"
   path:
     path: /Audio/_Honk/Jukebox/blinch_Golden_Win_Piano.ogg
 
 - type: jukebox # HONK
   id: KillerXChase
-  name: "[NEW] Music - Killer X Chase"
+  name: "Music - Killer X Chase"
   path:
     path: /Audio/_Honk/Jukebox/blinch_Killer_X_Chase.ogg
 
 - type: jukebox # HONK
   id: PathLootCrusaders
-  name: "[NEW] Music - PathLoot Crusaders"
+  name: "Music - PathLoot Crusaders"
   path:
     path: /Audio/_Honk/Jukebox/blinch_PathLoot_Crusaders.ogg
 
 - type: jukebox # HONK
   id: PristintheMirror
-  name: "[NEW] Music - Prist in the Mirror"
+  name: "Music - Prist in the Mirror"
   path:
     path: /Audio/_Honk/Jukebox/blinch_Prist_in_the_Mirror.ogg
 
 - type: jukebox # HONK
   id: StarJudgment
-  name: "[NEW] Music - Star Judgment"
+  name: "Music - Star Judgment"
   path:
     path: /Audio/_Honk/Jukebox/blinch_Star_Judgment.ogg
 
 - type: jukebox # HONK
   id: WheelofFaith
-  name: "[NEW] Music - Wheel of Faith"
+  name: "Music - Wheel of Faith"
   path:
     path: /Audio/_Honk/Jukebox/blinch_Wheel_of_Faith.ogg
 
 - type: jukebox # HONK
   id: TheUnknown
-  name: "[NEW] Music - The Unknown"
+  name: "Music - The Unknown"
   path:
     path: /Audio/_Honk/Jukebox/The_Unknown.ogg
 
 - type: jukebox # HONK
   id: EscapeintheNight
-  name: "[NEW] Music - Escape in the Night"
+  name: "Music - Escape in the Night"
   path:
     path: /Audio/_Honk/Jukebox/Escape_in_the_Night.ogg
 
 - type: jukebox # HONK
   id: BossTheme
-  name: "[NEW] Music - Boss Theme"
+  name: "Music - Boss Theme"
   path:
     path: /Audio/_Honk/Jukebox/Boss_Theme.ogg
 
 - type: jukebox # HONK
   id: BattleThemeII
-  name: "[NEW] Music - Battle Theme II"
+  name: "Music - Battle Theme II"
   path:
     path: /Audio/_Honk/Jukebox/Battle_Theme_II.ogg
 
 - type: jukebox # HONK
   id: GameOver
-  name: "[NEW] Music - Game_Over..."
+  name: "Music - Game_Over..."
   path:
     path: /Audio/_Honk/Jukebox/Game_Over.ogg
 
 - type: jukebox # HONK
   id: TryAgain
-  name: "[NEW] Music - Try Again?"
+  name: "Music - Try Again?"
   path:
     path: /Audio/_Honk/Jukebox/Try_Again.ogg
 
 - type: jukebox # HONK
   id: BeastsandBetrayal
-  name: "[NEW] Music - Beasts_and_Betrayal"
+  name: "Music - Beasts_and_Betrayal"
   path:
     path: /Audio/_Honk/Jukebox/Beasts_and_Betrayal.ogg
 
 - type: jukebox # HONK
   id: BattleThemeI
-  name: "[NEW] Music - Battle Theme I"
+  name: "Music - Battle Theme I"
   path:
     path: /Audio/_Honk/Jukebox/Battle_Theme_I.ogg
 
 - type: jukebox # HONK
   id: HEAVENSAYSMANDELA
-  name: "[NEW] Music - HEAVEN SAYS MANDELA"
+  name: "Music - HEAVEN SAYS MANDELA"
   path:
     path: /Audio/_Honk/Jukebox/HEAVEN_SAYS_MANDELA.ogg
 
 - type: jukebox # HONK
   id: CYBERSWORLD
-  name: "[NEW] Music - CYBERS WORLD?"
+  name: "Music - CYBERS WORLD?"
   path:
     path: /Audio/_Honk/Jukebox/Toby_Fox_A_CYBERS_WORLD.ogg
 
 - type: jukebox # HONK
   id: BIGSHOT
-  name: "[NEW] Music - BIG SHOT"
+  name: "Music - BIG SHOT"
   path:
     path: /Audio/_Honk/Jukebox/Toby_Fox_BIG_SHOT.ogg
 
 - type: jukebox # HONK
   id: NOWSYOURCHANCETOBEA
-  name: "[NEW] Music - NOWS YOUR CHANCE TO BE A"
+  name: "Music - NOWS YOUR CHANCE TO BE A"
   path:
     path: /Audio/_Honk/Jukebox/Toby_Fox_NOWS_YOUR_CHANCE_TO_BE_A.ogg
 
 - type: jukebox # HONK
-  id: Pandora Palace
+  id: PandoraPalace
-  name: "[NEW] Music - Pandora Palace"
+  name: "Music - Pandora Palace"
   path:
     path: /Audio/_Honk/Jukebox/Toby_Fox_Pandora_Palace.ogg
 
 - type: jukebox # HONK
   id: AttackoftheKillerQueen
-  name: "[NEW] Music - Attack of the Killer Queen"
+  name: "Music - Attack of the Killer Queen"
   path:
     path: /Audio/_Honk/Jukebox/Toby_Fox_feat_Lena_Raine_Marcy_Nabors_Attack_of_the_Killer_Queen.ogg
+
+- type: jukebox # WD
+  id: AGazeThatInvitedDisaster
+  name: "[NEW] Music - A Gaze That Invited Disaster"
+  path:
+    path: /Audio/White/Jukebox/Music/A_Gaze_That_Invited_Disaster.ogg
+
+- type: jukebox # WD
+  id: ANeonGlowLightstheWay
+  name: "[NEW] Music - A Neon Glow Lights the Way"
+  path:
+    path: /Audio/White/Juskebox/Music/A_Neon_Glow_Lights_the_Way.ogg
+
+- type: jukebox # WD
+  id: AnotherMedium
+  name: "[NEW] Music - Another Medium"
+  path:
+    path: /Audio/White/Jukebox/Music/Another_Medium.ogg
+
+- type: jukebox # WD
+  id: CORE
+  name: "[NEW] Music - CORE"
+  path:
+    path: /Audio/White/Jukebox/Music/CORE.ogg
+
+- type: jukebox # WD
+  id: Crystals
+  name: "[NEW] Music - Crystals"
+  path:
+    path: /Audio/White/Jukebox/Music/Crystals.ogg
+
+- type: jukebox # WD
+  id: DriveMeWild
+  name: "[NEW] Music - Drive Me Wild"
+  path:
+    path: /Audio/White/Jukebox/Music/Drive_Me_Wild.ogg
+
+- type: jukebox # WD
+  id: Dust
+  name: "[NEW] Music - Dust"
+  path:
+    path: /Audio/White/Jukebox/Music/Dust.ogg
+
+- type: jukebox # WD
+  id: EveryDayIsNight
+  name: "[NEW] Music - Every Day Is Night"
+  path:
+    path: /Audio/White/Jukebox/Music/Every_Day_Is_Night.ogg
+
+- type: jukebox # WD
+  id: FieldofHopesandDreams
+  name: "[NEW] Music - Field of Hopes and Dreams"
+  path:
+    path: /Audio/White/Jukebox/Music/Field_of_Hopes_and_Dreams.ogg
+
+- type: jukebox # WD
+  id: Hydrogen
+  name: "[NEW] Music - Hydrogen"
+  path:
+    path: /Audio/White/Jukebox/Music/Hydrogen.ogg
+
+- type: jukebox # WD
+  id: KnockKnock
+  name: "[NEW] Music - Knock Knock"
+  path:
+    path: /Audio/White/Jukebox/Music/Knock_Knock.ogg
+
+- type: jukebox # WD
+  id: NighttimeManeuvers
+  name: "[NEW] Music - Nighttime Maneuvers"
+  path:
+    path: /Audio/White/Jukebox/Music/Nighttime_Maneuvers.ogg
+
+- type: jukebox # WD
+  id: SafeHaven
+  name: "[NEW] Music - Safe Haven"
+  path:
+    path: /Audio/White/Jukebox/Music/Safe_Haven.ogg
+
+- type: jukebox # WD
+  id: SilentFlower
+  name: "[NEW] Music - Silent Flower"
+  path:
+    path: /Audio/White/Jukebox/Music/Silent_Flower.ogg
+
+- type: jukebox # WD
+  id: Voyager
+  name: "[NEW] Music - Voyager"
+  path:
+    path: /Audio/White/Jukebox/Music/Voyager.ogg
+
+- type: jukebox # WD
+  id: WelcometoVA-11Hall-A
+  name: "[NEW] Music - Welcome to VA-11 Hall-A"
+  path:
+    path: /Audio/White/Jukebox/Music/Welcome_to_VA-11_Hall-A.ogg
+
+- type: jukebox # WD
+  id: You'veGotMe
+  name: "[NEW] Music - You've Got Me"
+  path:
+    path: /Audio/White/Jukebox/Music/You've_Got_Me.ogg

Resources/Prototypes/_White/Mobs/Customization/Markings/2shonka-parts.yml

@@ -46,5 +46,5 @@
   markingCategory: Tail
   sponsorOnly: true
   sprites:
-    - sprite: White/Mobs/Customization/nigga.rsi
+    - sprite: White/Mobs/Customization/some_tail_poebat.rsi
       state: ebaniyhvost

Resources/Prototypes/_White/tags.yml

@@ -103,5 +103,20 @@
 - type: Tag
   id: ClusterBang
 
+- type: Tag
+  id: WeaponRubberShotgun
+
+- type: Tag
+  id: MagazineRubberShotgun
+
+- type: Tag
+  id: ShellRubberShotgun
+
+- type: Tag
+  id: Lighting
+
+- type: Tag
+  id: DisposalUnits
+
 - type: Tag
   id: VoiceActivatedBombImplant

Resources/Textures/Objects/Storage/boxes.rsi/meta.json

@@ -1,11 +1,11 @@
 {
-  "version": 1,
+    "version": 1,
-  "license": "CC-BY-SA-3.0",
+    "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/cc65477c04f7403ca8a457bd5bae69a01abadbf0, encryptokey was taken from Baystation12 at https://github.com/infinitystation/Baystation12/blob/073f678cdce92edb8fcd55f9ffc9f0523bf31506/icons/obj/radio.dmi and modified by lapatison. boxwidetoy, shelltoy, swab, flare, inflatable, trashbag, magazine, holo and forensic created by potato1234x (github) for ss14 based on toys.rsi, mouth_swab.rsi, flare.rsi, inflatable_wall.rsi, trashbag.rsi, caseless_pistol_mag.rsi, guardians.rsi and bureaucracy.rsi respectively, candle and darts created by TheShuEd for ss14, vials was drawn by Ubaser, evidence_markers by moomoobeef, ziplock by CaypenNow.",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/cc65477c04f7403ca8a457bd5bae69a01abadbf0, encryptokey was taken from Baystation12 at https://github.com/infinitystation/Baystation12/blob/073f678cdce92edb8fcd55f9ffc9f0523bf31506/icons/obj/radio.dmi and modified by lapatison. boxwidetoy, shelltoy, swab, flare, inflatable, trashbag, magazine, holo and forensic created by potato1234x (github) for ss14 based on toys.rsi, mouth_swab.rsi, flare.rsi, inflatable_wall.rsi, trashbag.rsi, caseless_pistol_mag.rsi, guardians.rsi and bureaucracy.rsi respectively, candle and darts created by TheShuEd for ss14, vials was drawn by Ubaser, evidence_markers by moomoobeef, ziplock by CaypenNow.",
-  "size": {
+    "size": {
-    "x": 32,
+        "x": 32,
-    "y": 32
+        "y": 32
-  },
+    },
     "states": [
         {
             "name": "beaker"
@@ -35,7 +35,7 @@
             "name": "sechud"
         },
         {
-			"name": "bottle"
+            "name": "bottle"
         },
         {
             "name": "box"
@@ -155,12 +155,12 @@
             "name": "writing_of_doom"
         },
         {
-			"name": "headset"
+            "name": "headset"
-		},
+        },
+        {
+            "name": "encryptokey"
+        },
         {
-			"name": "encryptokey"
-		},
-		{
             "name": "inhand-left",
             "directions": 4
         },
@@ -195,7 +195,7 @@
             "name": "shellpractice"
         },
         {
-            "name": "shellresin"
+            "name": "shellrubber"
         },
         {
             "name": "shellslug"
@@ -222,4 +222,4 @@
             "name": "ziplock"
         }
     ]
-}
+}

Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/meta.json

@@ -38,10 +38,10 @@
             "name": "improvised-spent"
         },
         {
-            "name": "resin"
+            "name": "rubber"
         },
         {
-            "name": "resin-spent"
+            "name": "rubber-spent"
         },
         {
             "name": "incendiary"
@@ -68,4 +68,4 @@
             "name": "depleted-uranium-spent"
         }
     ]
-}
+}

Resources/Textures/White/Objects/Weapons/Guns/Shotguns/rubber_pump.rsi/meta.json

@@ -0,0 +1,17 @@
+{
+    "version": 1,
+    "license": "CC-BY-NC-4.0",
+    "copyright": "Taken from https://github.com/tgstation/tgstation/ at commit fb2d71495bfe81446159ef528534193d09dd8d34, bolt-open modified from icon.png by Flareguy",
+    "size": {
+        "x": 48,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "bolt-open"
+        }
+    ]
+}

Resources/Textures/White/Objects/Weapons/Guns/Shotguns/rubber_pump_inhands_64x.rsi/meta.json

@@ -0,0 +1,19 @@
+{
+    "version": 1,
+    "license": "CC-BY-NC-4.0",
+    "copyright": "Taken from https://github.com/tgstation/tgstation/ at commit fb2d71495bfe81446159ef528534193d09dd8d34, wield sprites by RiceMar1244",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
+}

Resources/Textures/White/Objects/Weapons/Guns/Shotguns/rubber_pump_onbody.rsi/meta.json

@@ -0,0 +1,19 @@
+{
+    "version": 1,
+    "license": "CC-BY-NC-4.0",
+    "copyright": "Taken from https://github.com/tgstation/tgstation/ at commit fb2d71495bfe81446159ef528534193d09dd8d34, bolt-open modified from icon.png by Flareguy",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "equipped-BACKPACK",
+            "directions": 4
+        },
+        {
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
+        }
+    ]
+}