Merge pull request #14 from Vault-Overseers/master

up
Vonsant · Jul 9, 2024 · fae36ad · fae36ad
2 parents 2c19586 + ca23abe
commit fae36ad
Show file tree

Hide file tree

Showing 151 changed files with 31,079 additions and 14,440 deletions.
diff --git a/Content.Shared/CCVar/CCVars.cs b/Content.Shared/CCVar/CCVars.cs
@@ -1335,7 +1335,7 @@ public static readonly CVarDef<bool>
         ///     Controls whether the server will deny any players that are not whitelisted in the DB.
         /// </summary>
         public static readonly CVarDef<bool> WhitelistEnabled =
-            CVarDef.Create("whitelist.enabled", false, CVar.SERVERONLY);
+            CVarDef.Create("whitelist.enabled", true, CVar.SERVERONLY);
 
         /// <summary>
         ///     The loc string to display as a disconnect reason when someone is not whitelisted.

diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Ballistic.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Ballistic.cs
@@ -45,10 +45,48 @@ private void OnBallisticInteractUsing(EntityUid uid, BallisticAmmoProviderCompon
             return;
 
         if (GetBallisticShots(component) >= component.Capacity)
+        {
+            Popup(Loc.GetString("gun-ballistic-transfer-target-full", ("entity", args.Target)), uid, args.User);
             return;
+        }
+
+        if (EntityManager.HasComponent<SpeedLoaderComponent>(args.Used))
+        {
+            var emptySlots = component.Capacity - component.UnspawnedCount - component.Entities.Count; // Number of empty slots in the shotgun
+
+            var ammo = new List<(EntityUid? Entity, IShootable Shootable)>();
+            var ev = new TakeAmmoEvent(emptySlots, ammo, Transform(uid).Coordinates, args.User);
+            RaiseLocalEvent(args.Used, ev);
+
+            // empty speedloader
+            if (ev.Ammo.Count == 0)
+            {
+                Popup(Loc.GetString("gun-speedloader-empty"), uid, args.User);
+                return;
+            }
+
+            foreach (var (ent, _) in ammo)
+            {
+                if (ent == null)
+                    continue;
+
+                component.Entities.Add(ent.Value);
+                Containers.Insert(ent.Value, component.Container);
+
+                if (IsClientSide(ent.Value))
+                    Del(ent.Value);
+
+                if (ev.Ammo.Count == 0)
+                    break;
+            }
+        }
+        // if not a speedloader just insert
+        else
+        {
+            component.Entities.Add(args.Used);
+            Containers.Insert(args.Used, component.Container);
+        }
 
-        component.Entities.Add(args.Used);
-        Containers.Insert(args.Used, component.Container);
         // Not predicted so
         Audio.PlayPredicted(component.SoundInsert, uid, args.User);
         args.Handled = true;

diff --git a/Resources/Audio/_Nuclear14/Weapons/Firing/attributions.yml b/Resources/Audio/_Nuclear14/Weapons/Firing/attributions.yml
@@ -0,0 +1,4 @@
+- files: ["brushgunfire.ogg"]
+  license: "CC-BY-NC-SA-3.0"
+  copyright: "BigIron github and it's sources"
+  source: "https://www.myinstants.com/en/instant/war-never-changes-fallouts-narrator-15365/" # unsure what to attribute when there ain't link source
diff --git a/Resources/Audio/_Nuclear14/Weapons/Firing/brushgunfire.ogg b/Resources/Audio/_Nuclear14/Weapons/Firing/brushgunfire.ogg
diff --git a/Resources/Locale/en-US/_Nuclear14/department.ftl b/Resources/Locale/en-US/_Nuclear14/department.ftl
@@ -15,7 +15,7 @@ department-BrotherhoodMidwest-description = Midwest branch of the Brotherhood of
 department-BrotherhoodWashington-description = Washington branch of the Brotherhood of Steel
 department-CaravanCompany-description = The local Caravan Company responsible for import and export of goods.
 department-NCR-description = A settler detachment sent by the New California Republic
-department-NCRRanger-description = A special detachment of NCR which overtake near impossible duties to aid New California Republic in their victory over slavery and raiders.
+department-Ranger-description = Desert Rangers which haven't joined the NCR and instead kept being their own faction. Their view of NCR isn't the best, but they tolerate them.
 department-Tribe-description = A local tribal group trying to get by.
 department-Vault-description = The local Vault Dwellers
 department-Wastelander-description = Wastelanders living in the pacific northwest.

diff --git a/Resources/Maps/N14/sunnyvale2.yml b/Resources/Maps/N14/sunnyvale2.yml
diff --git a/Resources/Prototypes/Entities/Mobs/Player/human.yml b/Resources/Prototypes/Entities/Mobs/Player/human.yml
@@ -3,8 +3,10 @@
   name: Urist McHands
   parent: BaseMobHuman
   id: MobHuman
-  #components:
-  #- type: PotentialPsionic #Nyano - Summary: makes potentially psionic.
+  components:
+    - type: NpcFactionMember
+      factions:
+      - Wastelander
 
 #Syndie
 - type: entity

diff --git a/Resources/Prototypes/Entities/Mobs/Species/base.yml b/Resources/Prototypes/Entities/Mobs/Species/base.yml
@@ -188,7 +188,7 @@
   - type: CanHostGuardian
   - type: NpcFactionMember
     factions:
-    - NanoTrasen
+    - Wastelander
   - type: CreamPied
   - type: Stripping
   - type: Strippable

diff --git a/Resources/Prototypes/Entities/Mobs/Species/human.yml b/Resources/Prototypes/Entities/Mobs/Species/human.yml
@@ -6,6 +6,10 @@
   abstract: true
   components:
   - type: Hunger
+    starvationDamage:
+      types:
+        Cold: 0.5
+        Bloodloss: 0.5
   - type: Icon # It will not have an icon in the adminspawn menu without this. Body parts seem fine for whatever reason.
     sprite: Mobs/Species/Human/parts.rsi
     state: full

diff --git a/Resources/Prototypes/Maps/N14/sunnyvale.yml b/Resources/Prototypes/Maps/N14/sunnyvale.yml
@@ -47,8 +47,8 @@
             # BoSWashingtonResearcher: [ 2, 0 ]
             # BoSWashingtonSoldier: [ 2, 2 ]
             # BoSWashingtonRecruit: [ 0, 2 ]
-            # BoSMidPaladinCommander: [ 1, 0 ]
-            # BoSMidPaladin: [ 2, 0 ]
-            # BoSMidKnight: [ 2, 0 ]
-            # BoSMidScribe: [ 2, 0 ]
-            # BoSMidSquire: [ 2, 1 ]
+            BoSMidPaladinCommander: [ 1, 1 ]
+            BoSMidPaladin: [ 2, 1 ]
+            BoSMidKnight: [ 2, 1 ]
+            BoSMidScribe: [ 2, 1 ]
+            BoSMidSquire: [ 2, 1 ]
diff --git a/Resources/Prototypes/_Nuclear14/Catalog/Fills/Boxes/mre.yml b/Resources/Prototypes/_Nuclear14/Catalog/Fills/Boxes/mre.yml
@@ -0,0 +1,111 @@
+- type: entity
+  name: cardboard box
+  parent: BoxBase
+  id: N14BoxCardboardMREBox
+  description: An old cardboard box for storing things.
+  components:
+  - type: Sprite
+    sprite: _Nuclear14/Objects/Misc/storage.rsi
+    state: c-ration
+
+- type: entity
+  name: C ration
+  parent: N14BoxCardboardMREBox
+  id: N14BoxCardboardMREBoxCFilled
+  components:
+    - type: StorageFill
+      contents:
+        - id: N14FoodTinC1
+        - id: N14FoodTinC2
+        - id: N14FoodTinC3
+        - id: FoodCondimentPacketHotsauce
+          prob: 0.2
+          orGroup: Condiment
+        - id: FoodCondimentPacketKetchup
+          prob: 0.2
+          orGroup: Condiment
+        - id: FoodCondimentPacketBbq
+          prob: 0.2
+          orGroup: Condiment
+        - id: FoodCondimentPacketHorseradish
+          prob: 0.2
+          orGroup: Condiment
+        - id: FoodCondimentPacketMustard
+          prob: 0.2
+          orGroup: Condiment
+        - id: DrinkWaterBottleFull
+          prob: 0.9
+          orGroup: Bottle
+        - id: DrinkBeerBottleFull
+          prob: 0.1
+          orGroup: Bottle
+        - id: N14CigaretteWinston
+          prob: 0.1
+          orGroup: Cigarette
+        - id: N14CigaretteSalem
+          prob: 0.1
+          orGroup: Cigarette
+        - id: N14CigaretteRepublic
+          prob: 0.1
+          orGroup: Cigarette
+        - id: N14CigaretteMarlboro
+          prob: 0.2
+          orGroup: Cigarette
+        - id: N14CigaretteKool
+          prob: 0.1
+          orGroup: Cigarette
+        - id: Matchbox
+
+- type: entity
+  name: K ration
+  parent: N14BoxCardboardMREBox
+  id: N14BoxCardboardMREBoxKFilled
+  components:
+    - type: StorageFill
+      contents:
+        - id: N14FoodTinK
+        - id: N14FoodTinKCracker
+        - id: N14FoodTinC3
+        - id: FoodCondimentPacketHotsauce
+          prob: 0.2
+          orGroup: Condiment
+        - id: FoodCondimentPacketKetchup
+          prob: 0.2
+          orGroup: Condiment
+        - id: FoodCondimentPacketBbq
+          prob: 0.2
+          orGroup: Condiment
+        - id: FoodCondimentPacketHorseradish
+          prob: 0.2
+          orGroup: Condiment
+        - id: FoodCondimentPacketMustard
+          prob: 0.2
+          orGroup: Condiment
+        - id: DrinkWaterBottleFull
+          prob: 0.6
+          orGroup: Bottle
+        - id: DrinkBeerBottleFull
+          prob: 0.2
+          orGroup: Bottle
+        - id: DrinkMREFlask
+          prob: 0.1
+          orGroup: Bottle
+        - id: DrinkSodaWaterBottleFull
+          prob: 0.1
+          orGroup: Bottle
+        - id: N14CigarettePackWinston
+          prob: 0.1
+          orGroup: Cigarette
+        - id: N14CigarettePackSalem
+          prob: 0.1
+          orGroup: Cigarette
+        - id: N14CigarettePackRepublics
+          prob: 0.1
+          orGroup: Cigarette
+        - id: N14CigarettePackMarlboro
+          prob: 0.2
+          orGroup: Cigarette
+        - id: N14CigarettePackKool
+          prob: 0.1
+          orGroup: Cigarette
+        - id: Lighter
diff --git a/Resources/Prototypes/_Nuclear14/Entities/Markers/Spawners/Conditional/timed.yml b/Resources/Prototypes/_Nuclear14/Entities/Markers/Spawners/Conditional/timed.yml
@@ -381,3 +381,23 @@
       intervalSeconds: 600
       minimumEntitiesSpawned: 1
       maximumEntitiesSpawned: 3
+
+- type: entity
+  parent: N14TimedSpawnerMolerat
+  id: N14TimedSpawnerChicken
+  name: Chicken Timed Spawner
+  components:
+    - type: Sprite
+      layers:
+        - state: blue
+        - sprite: _Nuclear14/Mobs/Animals/chicken.rsi
+          state: chicken
+        - state: timed
+    - type: Timer
+    - type: TimedSpawner
+      prototypes:
+        - N14MobChicken
+      chance: 0.95
+      intervalSeconds: 600
+      minimumEntitiesSpawned: 1
+      maximumEntitiesSpawned: 3
diff --git a/Resources/Prototypes/_Nuclear14/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/_Nuclear14/Entities/Markers/Spawners/jobs.yml
@@ -50,12 +50,12 @@
       - state: passenger # TODO make new icons
 
 - type: entity
-  id: N14SpawnPointBoSMidInitiate
+  id: N14SpawnPointBoSMidInitiate # change this when I care
   parent: N14SpawnPointWastelander
-  name: BOS midwest initiate
+  name: BOS midwest squire
   components:
   - type: SpawnPoint
-    job_id: BoSMidInitiate
+    job_id: BoSMidSquire
   - type: Sprite
     layers:
       - state: green

diff --git a/Resources/Prototypes/_Nuclear14/Entities/Markers/Spawners/mobs.yml b/Resources/Prototypes/_Nuclear14/Entities/Markers/Spawners/mobs.yml
@@ -14,6 +14,21 @@
     prototypes:
       - N14MobBrahmin
 
+- type: entity
+  name: Chicken Spawner
+  id: N14SpawnMobChicken
+  parent: MarkerBase
+  components:
+  - type: Sprite
+    layers:
+      - state: green
+      - sprite: _Nuclear14/Mobs/Animals/chicken.rsi
+        state: chicken
+      - state: ai
+  - type: ConditionalSpawner
+    prototypes:
+      - N14MobChicken
+
 - type: entity
   name: Bighorner Spawner
   id: N14SpawnMobBighorner