wield sprites

Author: MilonPL

Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Examine.cs

@@ -64,7 +64,7 @@ private FormattedMessage GetGunExamine(Entity<GunComponent> ent)
         msg.PushNewline();
         msg.AddMarkupOrThrow(Loc.GetString("gun-examine-fire-rate",
             ("color", FireRateExamineColor),
-            ("value", MathF.Round(ent.Comp.FireRateModified * 60f, 0))
+            ("value", MathF.Round(ent.Comp.FireRateModified, 1))
         ));
 
         // Muzzle Velocity (ProjectileSpeed * 10)

Resources/Locale/en-US/_emberfall/weapons/gun-examine.ftl

@@ -5,6 +5,6 @@ gun-examine-recoil = - [color={$color}]Recoil[/color]: [color=lightblue]{$value}
 gun-examine-stability = - [color={$color}]Stability[/color]: [color=lightblue]{$value}°[/color] per second
 gun-examine-max-angle = - [color={$color}]Maximum spread[/color]: [color=lightblue]{$value}°[/color]
 gun-examine-min-angle = - [color={$color}]Minimum spread[/color]: [color=lightblue]{$value}°[/color]
-gun-examine-fire-rate = - [color={$color}]Fire rate[/color]: [color=lightblue]{$value} RPM[/color]
+gun-examine-fire-rate = - [color={$color}]Fire rate[/color]: [color=lightblue]{$value} RPS[/color]
 gun-examine-muzzle-velocity = - [color={$color}]Muzzle velocity[/color]: [color=lightblue]{$value} m/s[/color]
 gun-examine-caliber = It's chambered in [color={$color}]{$caliber}[/color].

Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml

@@ -1053,7 +1053,6 @@
     count: 3 #bit stronger than a disabler if you hit your shots you goober, still not a 2 hit stun though
     spread: 9
 
-
 # Emberfall projectiles: yes they have to be here
 
 # Tracers

Resources/Prototypes/Entities/Structures/Machines/lathe.yml

@@ -232,7 +232,7 @@
       - MagazineHeavyPistolEmpty
       - MagazineHeavyPistolSubMachineGun
       - MagazineHeavyPistolSubMachineGunEmpty
-      # End Emberfall additions
+      # End Emberfall
   - type: BlueprintReceiver
     whitelist:
       tags:
@@ -766,6 +766,7 @@
       - MagazineHeavyPistolPractice
       - MagazineBoxHeavyPistol
       - MagazineBoxHeavyPistolPractice
+      # End Emberfall
     dynamicRecipes:
       - BoxBeanbag
       - BoxShotgunIncendiary

Resources/Prototypes/_Emberfall/Catalog/Fills/Lockers/security.yml

@@ -83,7 +83,7 @@
       amount: 8
 
 - type: entity
-  parent: [GunSafeBaseSecure, BaseRestrictedContraband]
+  parent: [ GunSafeBaseSecure, BaseRestrictedContraband ]
   id: GunSafePistolPollock
   name: pollock safe
   components:

Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Rifles/rifles.yml

@@ -16,7 +16,7 @@
   - type: GunRequiresWield
   - type: GunWieldBonus
     minAngle: -19.5 # 1.5 deg min
-    maxAngle: -23 # 9 deg max
+    maxAngle: -23.5 # 8.5 deg max
   - type: Gun
     projectileSpeed: 45
     fireRate: 5.5
@@ -65,7 +65,7 @@
   - type: GunRequiresWield
   - type: GunWieldBonus
     minAngle: -20 # 1 deg min
-    maxAngle: -24.5 # 7.5 deg max
+    maxAngle: -25 # 7 deg max
   - type: Gun
     projectileSpeed: 45
     fireRate: 4.5

Resources/Prototypes/_Emberfall/Recipies/Lathes/security.yml

@@ -1,5 +1,4 @@
 # 10mm auto magazines
-
 - type: latheRecipe
   parent: BaseEmptyAmmoRecipe
   id: MagazineHeavyPistolEmpty
@@ -107,7 +106,6 @@
     Plastic: 350
     Uranium: 700
 
-
 # Tracers: magazines
 
 # 9x19mm

Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/meta.json

@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from Delta-v at https://github.com/DeltaV-Station/Delta-v/commit/87c70a89a67d0521a56388e6b1c3f2cb947943e4",
+  "copyright": "Taken from Delta-v at https://github.com/DeltaV-Station/Delta-v/commit/87c70a89a67d0521a56388e6b1c3f2cb947943e4, edited by MilonPL",
   "size": {
     "x": 32,
     "y": 32
@@ -34,6 +34,14 @@
     {
       "name": "equipped-SUITSTORAGE",
       "directions": 4
+    },
+    {
+      "name": "wielded-inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "wielded-inhand-left",
+      "directions": 4
     }
   ]
 }

Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/wielded-inhand-left.png

@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC0-1.0",
-  "copyright": "Taken from Delta-v at https://github.com/DeltaV-Station/Delta-v/commit/87c70a89a67d0521a56388e6b1c3f2cb947943e4",
+  "copyright": "Taken from Delta-v at https://github.com/DeltaV-Station/Delta-v/commit/87c70a89a67d0521a56388e6b1c3f2cb947943e4, edited by MilonPL",
   "size": {
     "x": 32,
     "y": 32
@@ -34,6 +34,14 @@
     {
       "name": "equipped-SUITSTORAGE",
       "directions": 4
+    },
+    {
+      "name": "wielded-inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "wielded-inhand-left",
+      "directions": 4
     }
   ]
 }

Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/wielded-inhand-right.png

@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC0-1.0",
-  "copyright": "Taken from Delta-v at https://github.com/DeltaV-Station/Delta-v/commit/87c70a89a67d0521a56388e6b1c3f2cb947943e4",
+  "copyright": "Taken from Delta-v at https://github.com/DeltaV-Station/Delta-v/commit/87c70a89a67d0521a56388e6b1c3f2cb947943e4, edited by MilonPL",
   "size": {
     "x": 32,
     "y": 32
@@ -34,6 +34,14 @@
     {
       "name": "equipped-SUITSTORAGE",
       "directions": 4
+    },
+    {
+      "name": "wielded-inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "wielded-inhand-left",
+      "directions": 4
     }
   ]
 }

Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/nightshade.rsi/equipped-BACKPACK.png

@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-4.0",
-  "copyright": "Taken from Delta-v at https://github.com/DeltaV-Station/Delta-v/commit/87c70a89a67d0521a56388e6b1c3f2cb947943e4",
+  "copyright": "Taken from Delta-v at https://github.com/DeltaV-Station/Delta-v/commit/87c70a89a67d0521a56388e6b1c3f2cb947943e4, edited by MilonPL",
   "size": {
     "x": 32,
     "y": 32
@@ -34,6 +34,14 @@
     {
       "name": "equipped-SUITSTORAGE",
       "directions": 4
+    },
+    {
+      "name": "wielded-inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "wielded-inhand-left",
+      "directions": 4
     }
   ]
 }