Merge branch 'master' into Miami-Bundle

Content.Server/Whitelist/WhitelistCommands.cs

@@ -11,7 +11,7 @@
 
 namespace Content.Server.Whitelist;
 
-[AdminCommand(AdminFlags.Ban)]
+[AdminCommand(AdminFlags.Whitelist)] // DeltaV - Custom permission for whitelist
 public sealed class AddWhitelistCommand : LocalizedCommands
 {
     public override string Command => "whitelistadd";
@@ -71,7 +71,7 @@ public override CompletionResult GetCompletion(IConsoleShell shell, string[] arg
     }
 }
 
-[AdminCommand(AdminFlags.Ban)]
+[AdminCommand(AdminFlags.Ban | AdminFlags.Whitelist)] // DeltaV - Custom permission for whitelist. Hopefully this is an or, not an and
 public sealed class RemoveWhitelistCommand : LocalizedCommands
 {
     public override string Command => "whitelistremove";

Content.Shared/Administration/AdminFlags.cs

@@ -89,6 +89,11 @@ public enum AdminFlags : uint
         /// </summary>
         EditNotes = 1 << 14,
 
+        /// <summary>
+        ///     DeltaV - The ability to whitelist people. Either this permission or +BAN is required for remove.
+        /// </summary>
+        Whitelist = 1 << 15,
+
         /// <summary>
         ///     Dangerous host permissions like scsi.
         /// </summary>

Resources/Changelog/DeltaVChangelog.yml

@@ -1307,3 +1307,21 @@ Entries:
       message: Reverted Shotgun sprites
   id: 195
   time: '2024-01-01T21:48:08.0000000+00:00'
+- author: Velcroboy
+  changes:
+    - type: Add
+      message: Added BB guns! Don't shoot your eye out.
+  id: 196
+  time: '2024-01-02T22:03:49.0000000+00:00'
+- author: deltanedas
+  changes:
+    - type: Tweak
+      message: On very high pop revolution rounds, there can be 2 head revolutionaries.
+  id: 197
+  time: '2024-01-02T22:06:22.0000000+00:00'
+- author: VMSolidus
+  changes:
+    - type: Fix
+      message: There should only ever be one Listening Outpost spawning at a time
+  id: 198
+  time: '2024-01-02T23:05:25.0000000+00:00'

Resources/Locale/en-US/deltav/prototypes/catalog/cargo/cargo-fun.ftl

@@ -0,0 +1,2 @@
+ent-CrateFunBBGun = { ent-CrateFunBBGun }
+    .desc = { ent-CrateFunBBGun.desc }

Resources/Locale/en-US/deltav/prototypes/catalog/fills/crates/fun-crates.ftl

@@ -0,0 +1,2 @@
+ent-CrateFunBBGun = BB gun crate
+    .desc = Contains 1 BB gun and 2 boxes of BBs.

Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_fun.yml

@@ -0,0 +1,9 @@
+- type: cargoProduct
+  id: CrateFunBBGun
+  icon:
+    sprite: Objects/Weapons/Guns/Pistols/water_pistol.rsi
+    state: display
+  product: CrateFunBBGun
+  cost: 1000
+  category: Fun
+  group: market

Resources/Prototypes/DeltaV/Catalog/Fills/Crates/fun.yml

@@ -0,0 +1,10 @@
+- type: entity
+  id: CrateFunBBGun
+  parent: CrateGenericSteel
+  components:
+  - type: StorageFill
+    contents:
+      - id: WeaponRifleBB
+        amount: 1
+      - id: BoxCartridgeBB
+        amount: 2

Resources/Prototypes/DeltaV/Entities/Objects/Fun/toy_guns.yml

@@ -0,0 +1,42 @@
+- type: entity
+  name: BB Gun
+  parent: BaseItem
+  id: WeaponRifleBB
+  description: The classic Red Ryder BB gun. Don't shoot your eye out.
+  components:
+  - type: Sprite
+    netsync: false
+    size: 50
+    sprite: DeltaV/Objects/Weapons/Guns/Rifles/bbgun.rsi
+    layers:
+      - state: base
+        map: ["enum.GunVisualLayers.Base"]
+  - type: Clothing
+    sprite: DeltaV/Objects/Weapons/Guns/Rifles/bbgun.rsi ##
+    quickEquip: false
+    slots:
+    - Back
+    - suitStorage
+  - type: AmmoCounter
+  - type: Gun
+    selectedMode: SemiAuto
+    availableModes:
+      - SemiAuto
+    fireRate: 2
+    soundGunshot:
+      path: /Audio/Weapons/click.ogg
+  - type: BallisticAmmoProvider
+    cycleable: false
+    proto: BulletBB
+    whitelist:
+      tags:
+        - BulletBB
+    soundInsert:
+      path: /Audio/Weapons/drawbow2.ogg #here
+  - type: ContainerContainer
+    containers:
+      ballistic-ammo: !type:Container
+        ents: []
+  - type: Appearance
+  - type: StaticPrice
+    price: 275

Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Ammunition/Boxes/toy_guns.yml

@@ -0,0 +1,17 @@
+- type: entity
+  parent: BoxDonkSoftBase
+  id: BoxCartridgeBB
+  name: box of BBs
+  components:
+  - type: SpeedLoader
+  - type: BallisticAmmoProvider
+    whitelist:
+      tags:
+        - BulletBB
+    proto: BulletBB
+  - type: Sprite
+    sprite: DeltaV/Objects/Weapons/Guns/Ammunition/Boxes/bbgun.rsi
+    layers:
+      - state: bbbox
+  - type: StaticPrice
+    price: 25

Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Projectiles/toy_projectiles.yml

@@ -0,0 +1,69 @@
+- type: entity
+  id: BulletBB
+  description: Don't shoot your eye out.
+  name: BB
+  parent: BaseItem
+  components:
+    - type: Item
+      size: 1
+    - type: Reflective
+    - type: Appearance
+    - type: FlyBySound
+    - type: Sprite
+      sprite: DeltaV/Objects/Weapons/Guns/Ammunition/Boxes/bbgun.rsi
+      layers:
+        - state: bbbullet
+    - type: Tag
+      tags:
+        - BulletBB
+        - Trash
+    - type: Physics
+      bodyType: Dynamic
+      linearDamping: 0.1
+      angularDamping: 0.1
+    - type: Fixtures
+      fixtures:
+        fix1:
+          shape: !type:PhysShapeCircle
+            radius: 0.01
+          density: 1
+          mask:
+          - ItemMask
+          restitution: 0.3 #bounce
+          friction: 0.2
+        projectile:
+          shape:
+            !type:PhysShapeAabb
+            bounds: "-0.15,-0.15,0.15,0.15"
+          hard: false
+          mask:
+          - Impassable
+          - BulletImpassable
+        fly-by: &flybyfixture
+          shape: !type:PhysShapeCircle
+            radius: 1.5
+          layer:
+          - Impassable
+          - MidImpassable
+          - HighImpassable
+          - LowImpassable
+          hard: False
+    - type: TileFrictionModifier
+      modifier: 0.01
+    - type: Projectile
+      impactEffect: BulletImpactEffect
+      deleteOnCollide: false
+      onlyCollideWhenShot: true
+      damage:
+        types:
+          Blunt: 1
+      soundHit:
+        path: /Audio/Weapons/Guns/Hits/bullet_hit.ogg
+    - type: Ammo
+      muzzleFlash: null
+    - type: PhysicalComposition
+      materialComposition:
+        Steel: 1
+    - type: SpaceGarbage
+    #- type: StaticPrice
+    #  price: 0.05

Resources/Prototypes/DeltaV/GameRules/events.yml

@@ -55,6 +55,6 @@
     earliestStart: 20
     weight: 5
     minimumPlayers: 25
-    maxOccurences: 1
+    maxOccurrences: 1
     duration: 1
   - type: PirateRadioSpawnRule

Resources/Prototypes/DeltaV/tags.yml

@@ -3,6 +3,9 @@
 - type: Tag
   id: BeltSlotNotBelt #not a 'belt'
 
+- type: Tag
+  id: BulletBB
+
 - type: Tag
   id: CartridgeSpecial # For the .38 special ammo and revolver
 

Resources/Prototypes/GameRules/roundstart.yml

@@ -81,7 +81,8 @@
   noSpawn: true
   components:
   - type: RevolutionaryRule
-    maxHeadRevs: 1 # DeltaV
+    maxHeadRevs: 2 # DeltaV
+    playersPerHeadRev: 30 # DeltaV - need highpop readied up for multiple headrevs
 
 - type: entity
   id: Sandbox

Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/Boxes/bbgun.rsi/meta.json

@@ -0,0 +1,17 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Velcroboy",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "bbbullet"
+        },
+        {
+            "name": "bbbox"
+        }
+    ]
+}

Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/bbgun.rsi/meta.json

@@ -0,0 +1,29 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Base by ∆∆Molotovthief, equipped sprites by Velcroboy",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "base"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "equipped-BACKPACK",
+            "directions": 4
+        }
+    ]
+}

Tools/Nyanotrasen/TidyToolHowTo.txt

@@ -1,6 +1,5 @@
 The Python add-on Ruamel is needed for this.
 
-Type 'python', hit Enter.
 Run 'pip install ruamel' or 'pip install ruamel.yml' in Windows Command Prompt
 
 If you need to update pip use cmnd 'py -m ensurepip --upgrade'

Tools/Nyanotrasen/tidy_map.py

@@ -23,6 +23,7 @@ def capitalized_bool_dumper(representer, data):
     "Fixtures",
     "GravityShake",
     "HandheldLight", # Floodlights are serializing these?
+    "PlaySoundBehaviour",
 ]
 
 # The component will have these fields removed, and if there is no other data