Merge branch 'master' into HoS's-Shades

Content.Server/DeltaV/StationEvents/Components/PirateRadioSpawnRuleComponent.cs

@@ -1,4 +1,4 @@
-using Content.Server.StationEvents.Events;
+using Content.Server.StationEvents.Events;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
@@ -8,7 +8,7 @@ namespace Content.Server.StationEvents.Components;
 public sealed partial class PirateRadioSpawnRuleComponent : Component
 {
     [DataField("PirateRadioShuttlePath")]
-    public string PirateRadioShuttlePath = "Maps/Shuttles/pirateradio.yml";
+    public string PirateRadioShuttlePath = "Maps/Shuttles/DeltaV/DV-pirateradio.yml";
 
     [DataField("additionalRule")]
     public EntityUid? AdditionalRule;

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

@@ -1293,3 +1293,35 @@ Entries:
         espionage!
   id: 193
   time: '2023-12-31T16:48:27.0000000+00:00'
+- author: VMSolidus and DangerRevolution
+  changes:
+    - type: Tweak
+      message: >-
+        The Listening Outpost has received several tweaks and balance changes.
+        It should spawn less often now.
+  id: 194
+  time: '2024-01-01T21:33:58.0000000+00:00'
+- author: ps3moira
+  changes:
+    - type: Tweak
+      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/Mobs/NPCs/salvage.yml

@@ -6,6 +6,8 @@
     - type: NpcFactionMember
       factions:
         - Syndicate
+    - type: MindContainer
+      showExamineInfo: False
     - type: Loadout
       prototypes:
         - RadioGuardGear
@@ -37,3 +39,6 @@
       rechargeCooldown: 1
       rechargeSound:
         path: /Audio/Weapons/Guns/MagIn/bullet_insert.ogg
+    - type: AutoImplant
+      implants:
+      - DeathAcidifierImplant

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/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml

@@ -37,9 +37,9 @@
   suffix: Beanbag
   components:
   - type: Sprite
-    sprite: Objects/Weapons/Guns/Shotguns/pump.rsi
+    sprite: DeltaV/Objects/Weapons/Guns/Shotguns/pump.rsi # Delta-V
   - type: Clothing
-    sprite: Objects/Weapons/Guns/Shotguns/pump.rsi
+    sprite: DeltaV/Objects/Weapons/Guns/Shotguns/pump.rsi # Delta-V
   - type: BallisticAmmoProvider
     capacity: 4
     proto: ShellShotgunBeanbag

Resources/Prototypes/DeltaV/GameRules/events.yml

@@ -53,8 +53,8 @@
   components:
   - type: StationEvent
     earliestStart: 20
-    weight: 7.5 # Worth some thought as to how frequent this should be...
+    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/Entities/Objects/Specific/Service/barber.yml

@@ -8,6 +8,10 @@
     sprite: Objects/Tools/scissors.rsi
     state: icon
   - type: MagicMirror
+    addSlotTime: 20
+    removeSlotTime: 20
+    selectSlotTime: 20
+    changeSlotTime: 20
   - type: ActivatableUI
     key: enum.MagicMirrorUiKey.Key
     closeOnHandDeselect: true
@@ -22,4 +26,4 @@
       types:
         Piercing: 6
     soundHit:
-      path: "/Audio/Weapons/bladeslice.ogg"
+      path: "/Audio/Weapons/bladeslice.ogg"

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

@@ -13,7 +13,7 @@
     # If you update this also update the bulldog's size.
     size: 30
   - type: Clothing
-    sprite: Objects/Weapons/Guns/Shotguns/db_shotgun.rsi
+    sprite: DeltaV/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi # Delta-V
     quickEquip: false
     slots:
     - Back
@@ -106,7 +106,7 @@
   description: An immortal classic. Uses .50 shotgun shells.
   components:
   - type: Sprite
-    sprite: Objects/Weapons/Guns/Shotguns/db_shotgun.rsi
+    sprite: DeltaV/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi # Delta-V
   - type: Gun
     fireRate: 2
   - type: BallisticAmmoProvider
@@ -133,12 +133,9 @@
   description: A premium combat shotgun based on the Kammerer design, featuring an upgraded clip capacity. .50 shotgun shells.
   components:
   - type: Sprite
-    sprite: Objects/Weapons/Guns/Shotguns/enforcer.rsi
+    sprite: DeltaV/Objects/Weapons/Guns/Shotguns/enforcer.rsi # Delta-V
   - type: Clothing
-    sprite: Objects/Weapons/Guns/Shotguns/enforcer.rsi
-  - type: Item
-    sprite: Objects/Weapons/Guns/Shotguns/inhands_64x.rsi
-    heldPrefix: enforcer
+    sprite: DeltaV/Objects/Weapons/Guns/Shotguns/enforcer.rsi # Delta-V
   - type: BallisticAmmoProvider
 
 - type: entity
@@ -156,9 +153,9 @@
   description: When an old Remington design meets modern materials, this is the result. A favourite weapon of militia forces throughout many worlds. Uses .50 shotgun shells.
   components:
   - type: Sprite
-    sprite: Objects/Weapons/Guns/Shotguns/pump.rsi
+    sprite: DeltaV/Objects/Weapons/Guns/Shotguns/pump.rsi # Delta-V
   - type: Clothing
-    sprite: Objects/Weapons/Guns/Shotguns/pump.rsi
+    sprite: DeltaV/Objects/Weapons/Guns/Shotguns/pump.rsi # Delta-V
   - type: BallisticAmmoProvider
     capacity: 4
   - type: Tag
@@ -172,9 +169,9 @@
   description: Groovy! Uses .50 shotgun shells.
   components:
   - type: Sprite
-    sprite: Objects/Weapons/Guns/Shotguns/sawn.rsi
+    sprite: DeltaV/Objects/Weapons/Guns/Shotguns/sawn.rsi # Delta-V
   - type: Clothing
-    sprite: Objects/Weapons/Guns/Shotguns/sawn.rsi
+    sprite: DeltaV/Objects/Weapons/Guns/Shotguns/sawn.rsi # Delta-V
   - type: Item
     size: 10
   - type: Gun
@@ -246,9 +243,9 @@
   description: A shitty, hand-made shotgun that uses .50 shotgun shells. It can only hold one round in the chamber.
   components:
   - type: Sprite
-    sprite: Objects/Weapons/Guns/Shotguns/improvised_shotgun.rsi
+    sprite: DeltaV/Objects/Weapons/Guns/Shotguns/improvised_shotgun.rsi # Delta-V
   - type: Clothing
-    sprite: Objects/Weapons/Guns/Shotguns/improvised_shotgun.rsi
+    sprite: DeltaV/Objects/Weapons/Guns/Shotguns/improvised_shotgun.rsi # Delta-V
   - type: Item
     size: 75
   - type: Gun

Resources/Prototypes/Entities/Structures/Wallmounts/shotgun_cabinet.yml

@@ -5,7 +5,7 @@
   description: There is a small label that reads "For Emergency use only" along with details for safe use of the shotgun. As if.
   components:
   - type: Sprite
-    sprite: Structures/Wallmounts/shotgun_cabinet.rsi
+    sprite: DeltaV/Structures/Wallmounts/shotgun_cabinet.rsi # Delta-V
     layers:
     - state: cabinet
     - state: shotgun

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