Merge branch 'master' into Maybe-Fix-Antag-Crashes

Simple-Station · Jan 13, 2025 · 99004c9 · 99004c9
2 parents 0355b3c + 140055d
commit 99004c9
Show file tree

Hide file tree

Showing 9 changed files with 57 additions and 14 deletions.
diff --git a/Content.Shared/CCVar/CCVars.cs b/Content.Shared/CCVar/CCVars.cs
@@ -445,7 +445,7 @@ public static readonly CVarDef<bool>
         ///     If you are intending to decrease the trait points availability, or modify the costs of traits, consider temporarily disabling this.
         /// </summary>
         public static readonly CVarDef<bool> TraitsPunishCheaters =
-            CVarDef.Create("game.traits_punish_cheaters", true, CVar.REPLICATED);
+            CVarDef.Create("game.traits_punish_cheaters", false, CVar.REPLICATED);
 
         /// <summary>
         ///     Whether to allow characters to select loadout items.

diff --git a/Resources/Locale/en-US/weapons/extenddescriptions/descriptions.ftl b/Resources/Locale/en-US/weapons/extenddescriptions/descriptions.ftl
@@ -0,0 +1 @@
+gun-legality-salvage = This weapon is licensed for use in planetary expeditions. It is unlawful to brandish this weapon aboard NanoTrasen stations, and may be confiscated by Security if removed from the station's Salvage Department.
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml b/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml
@@ -15,8 +15,6 @@
       - id: RadioHandheld
       - id: FlashlightSeclite
       - id: Pickaxe
-      - id: SeismicCharge
-        amount: 2
       - id: ClothingShoesBootsWinterMiner #Delta V: Add departmental winter boots
       - id: JetpackMiniFilled # DeltaV - Salv lost their shuttle
       - id: OreBag
@@ -45,8 +43,6 @@
       - id: RadioHandheld
       - id: FlashlightSeclite
       - id: Pickaxe
-      - id: SeismicCharge
-        amount: 2
       - id: ClothingShoesBootsWinterMiner #Delta V: Add departmental winter boots
       - id: JetpackMiniFilled # DeltaV - Salv lost their shuttle
       - id: OreBag

diff --git a/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Inventories/salvage_points.yml b/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Inventories/salvage_points.yml
@@ -11,7 +11,7 @@
   - id: Soap
     cost: 200
   - id: SeismicCharge
-    cost: 250
+    cost: 1500
   - id: WeaponGrapplingGun
     cost: 300
   # TODO: laser pointer 300, toy facehugger 300
@@ -40,17 +40,17 @@
     cost: 1000
   # TODO: lazarus injector for 1k
   - id: WeaponSniperMosinEmpty
-    cost: 750 # Literally the worst gun in the game.
+    cost: 1500
   - id: WeaponRevolverArgentiEmpty
-    cost: 1100
+    cost: 4400
   - id: WeaponRifleNovaliteC1Empty
-    cost: 1300
+    cost: 5200
   - id: ClothingBackpackDuffelSalvageConscription
     cost: 1500
   - id: WeaponRifleGestioEmpty
-    cost: 1600
+    cost: 6400
   - id: WeaponRifleSVTEmpty
-    cost: 1600
+    cost: 6400
   - id: SpaceCash1000
     cost: 2000
   # TODO: super resonator for 2500

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_legality.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_legality.yml
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/pka.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/pka.yml
@@ -11,5 +11,11 @@
     - state: animation-icon
       visible: false
       map: [ "empty-icon" ]
+  - type: ExtendDescription
+    descriptionList:
+      - description: "gun-legality-salvage"
+        fontSize: 12
+        color: "#ff4f00"
+        requireDetailRange: false
   # todo: add itemcomponent with inhandVisuals states using unused texture and animation assets in kinetic_accelerator.rsi
   # todo: add clothingcomponent with clothingVisuals states using unused texture and animations assets in kinetic_accelerator.rsi
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
@@ -119,6 +119,12 @@
   components:
   - type: BallisticAmmoProvider
     proto: null
+  - type: ExtendDescription
+    descriptionList:
+      - description: "gun-legality-salvage"
+        fontSize: 12
+        color: "#ff4f00"
+        requireDetailRange: false
 
 - type: entity
   name: Hristov

diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml
@@ -38,8 +38,15 @@
 - type: entity
   parent: WeaponRevolverArgenti
   id: WeaponRevolverArgentiEmpty
+  suffix: Empty
   components:
   - type: RevolverAmmoProvider
     capacity: 8
     chambers: [ False, False, False, False, False, False, False, False ]
     ammoSlots: [ null, null, null, null, null, null, null, null ]
+  - type: ExtendDescription
+    descriptionList:
+      - description: "gun-legality-salvage"
+        fontSize: 12
+        color: "#ff4f00"
+        requireDetailRange: false
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
@@ -15,7 +15,7 @@
   - type: Clothing
     sprite: _NF/Objects/Weapons/Guns/Rifles/gestio.rsi
   - type: Gun
-    fireRate: 3.75
+    fireRate: 1.5
     projectileSpeed: 30
     angleDecay: 4 #in testing 3 was more balanced
     angleIncrease: 6
@@ -88,11 +88,13 @@
 - type: entity
   parent: WeaponRifleGestio
   id: WeaponRifleGestioEmpty
+  suffix: Empty
   components:
   - type: ItemSlots
     slots:
       gun_magazine:
         name: Magazine
+        startingItem: null
         insertSound: /Audio/Weapons/Guns/MagIn/ltrifle_magin.ogg
         ejectSound: /Audio/Weapons/Guns/MagOut/ltrifle_magout.ogg
         priority: 2
@@ -101,10 +103,17 @@
             - MagazineLightRifle
       gun_chamber:
         name: Chamber
+        startingItem: null
         priority: 1
         whitelist:
           tags:
             - CartridgeLightRifle
+  - type: ExtendDescription
+    descriptionList:
+      - description: "gun-legality-salvage"
+        fontSize: 12
+        color: "#ff4f00"
+        requireDetailRange: false
 
 - type: entity
   parent: BaseWeaponRifle
@@ -122,7 +131,7 @@
   - type: Clothing
     sprite: _NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi
   - type: Gun
-    fireRate: 4
+    fireRate: 2
     selectedMode: SemiAuto
     availableModes:
       - SemiAuto
@@ -184,11 +193,13 @@
 - type: entity
   parent: WeaponRifleNovaliteC1
   id: WeaponRifleNovaliteC1Empty
+  suffix: Empty
   components:
   - type: ItemSlots
     slots:
       gun_magazine:
         name: Magazine
+        startingItem: null
         insertSound: /Audio/Weapons/Guns/MagIn/ltrifle_magin.ogg
         ejectSound: /Audio/Weapons/Guns/MagOut/ltrifle_magout.ogg
         priority: 2
@@ -197,10 +208,17 @@
             - MagazineNovaliteC1
       gun_chamber:
         name: Chamber
+        startingItem: null
         priority: 1
         whitelist:
           tags:
             - CartridgeRifle
+  - type: ExtendDescription
+    descriptionList:
+      - description: "gun-legality-salvage"
+        fontSize: 12
+        color: "#ff4f00"
+        requireDetailRange: false
 
 - type: entity
   id: WeaponRifleSVT
@@ -223,7 +241,7 @@
     - Back
     - suitStorage
   - type: Gun
-    fireRate: 4
+    fireRate: 3
     selectedMode: SemiAuto
     availableModes:
       - SemiAuto
@@ -262,11 +280,13 @@
 - type: entity
   parent: WeaponRifleSVT
   id: WeaponRifleSVTEmpty
+  suffix: Empty
   components:
   - type: ItemSlots
     slots:
       gun_magazine:
         name: Magazine
+        startingItem: null
         insertSound: /Audio/Weapons/Guns/MagIn/ltrifle_magin.ogg
         ejectSound: /Audio/Weapons/Guns/MagOut/ltrifle_magout.ogg
         priority: 2
@@ -275,7 +295,14 @@
             - MagazineLightRifle
       gun_chamber:
         name: Chamber
+        startingItem: null
         priority: 1
         whitelist:
           tags:
             - CartridgeLightRifle
+  - type: ExtendDescription
+    descriptionList:
+      - description: "gun-legality-salvage"
+        fontSize: 12
+        color: "#ff4f00"
+        requireDetailRange: false
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		gun-legality-salvage = This weapon is licensed for use in planetary expeditions. It is unlawful to brandish this weapon aboard NanoTrasen stations, and may be confiscated by Security if removed from the station's Salvage Department.