Uranium Ammo (#22406)

* working on depleted uranium shotgun ammo * added depleted uranium to more ammo * Last changes and additions * Forgot something, theoretically resolved the merge conflict too * Nerfed the DU munitions, renamed em to uranium because it's not really DU * made the ammo more expensive, also fixing the crash at the same time * Fixed the last error, theoretically at least * Revert "Fixed the last error, theoretically at least" This reverts commit a875d2ac320478e4cb407564d704d915d0ef158b. * copyright changes, small sprite changes, last references of depleted uranium removed * Revert "copyright changes, small sprite changes, last references of depleted uranium removed" This reverts commit 93a12bf20bc72581a0bdc32a3cdc7d887f50de3f. * Update meta.json * Update meta.json * Update lathe.yml * Update arsenal.yml
2023-12-21 18:07:44 +01:00
parent 3af39ff0f0
commit 4c081aab04
23 changed files with 296 additions and 23 deletions
--- a/Resources/Locale/en-US/research/technologies.ftl
+++ b/Resources/Locale/en-US/research/technologies.ftl
@@ -33,6 +33,7 @@ research-technology-cloning = Cloning

 research-technology-salvage-weapons = Salvage Weapons
 research-technology-draconic-munitions = Draconic Munitions
+research-technology-uranium-munitions = Uranium Munitions
 research-technology-explosive-technology = Explosive Technology
 research-technology-weaponized-laser-manipulation = Weaponized Laser Manipulation
 research-technology-nonlethal-ammunition = Nonlethal Ammunition
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.yml
@@ -103,3 +103,17 @@
    - state: mag-1
      map: ["enum.GunVisualLayers.Mag"]
    - state: incendiary
+
+- type: entity
+  parent: BaseMagazineBoxLightRifle
+  id: MagazineBoxLightRifleUranium
+  name: ammunition box (.30 rifle uranium)
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgeLightRifleUranium
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/magnum.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/magnum.yml
@@ -82,3 +82,17 @@
    - state: mag-1
      map: ["enum.GunVisualLayers.Mag"]
    - state: incendiary
+
+- type: entity
+  id: MagazineBoxMagnumUranium
+  parent: BaseMagazineBoxMagnum
+  name: ammunition box (.45 magnum uranium)
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgeMagnumUranium
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/pistol.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/pistol.yml
@@ -83,3 +83,18 @@
    - state: mag-1
      map: ["enum.GunVisualLayers.Mag"]
    - state: incendiary
+
+- type: entity
+  id: MagazineBoxPistolUranium
+  parent: BaseMagazineBoxPistol
+  name: ammunition box (.35 auto uranium)
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgePistolUranium
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
+
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml
@@ -123,3 +123,18 @@
    - state: mag-1
      map: ["enum.GunVisualLayers.Mag"]
    - state: incendiary
+
+- type: entity
+  id: MagazineBoxRifleUranium
+  parent: BaseMagazineBoxRifle
+  name: ammunition box (.20 rifle uranium)
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgeRifleUranium
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
+
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/light_rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/light_rifle.yml
@@ -51,3 +51,12 @@
  components:
  - type: CartridgeAmmo
    proto: BulletLightRifleIncendiary
+
+- type: entity
+  id: CartridgeLightRifleUranium
+  name: cartridge (.30 rifle uranium)
+  parent: BaseCartridgeLightRifle
+  components:
+  - type: CartridgeAmmo
+    proto: BulletLightRifleUranium
+
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml
@@ -59,3 +59,11 @@
  components:
  - type: CartridgeAmmo
    proto: BulletMagnumAP
+
+- type: entity
+  id: CartridgeMagnumUranium
+  name: cartridge (.45 magnum uranium)
+  parent: BaseCartridgeMagnum
+  components:
+  - type: CartridgeAmmo
+    proto: BulletMagnumUranium
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml
@@ -51,3 +51,11 @@
  components:
  - type: CartridgeAmmo
    proto: BulletPistolIncendiary
+
+- type: entity
+  id: CartridgePistolUranium
+  name: cartridge (.35 auto uranium)
+  parent: BaseCartridgePistol
+  components:
+  - type: CartridgeAmmo
+    proto: BulletPistolUranium
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml
@@ -51,3 +51,11 @@
  components:
  - type: CartridgeAmmo
    proto: BulletRifleIncendiary
+
+- type: entity
+  id: CartridgeRifleUranium
+  name: cartridge (.20 rifle uranium)
+  parent: BaseCartridgeRifle
+  components:
+  - type: CartridgeAmmo
+    proto: BulletRifleUranium
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml
@@ -149,3 +149,20 @@
    proto: PelletShotgunImprovised
  - type: SpentAmmoVisuals
    state: "improvised"
+
+- type: entity
+  id: ShellShotgunUranium
+  name: uranium shotgun shell
+  parent: BaseShellShotgun
+  components:
+  - type: Sprite
+    layers:
+      - state: depleted-uranium
+        map: [ "enum.AmmoVisualLayers.Base" ]
+  - type: CartridgeAmmo
+    count: 5
+    spread: 6
+    proto: PelletShotgunUranium
+  - type: SpentAmmoVisuals
+    state: "depleted-uranium"
+
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/light_rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/light_rifle.yml
@@ -42,3 +42,15 @@
      types:
        Blunt: 3
        Heat: 16
+
+- type: entity
+  id: BulletLightRifleUranium
+  parent: BaseBullet
+  name: bullet (.20 rifle uranium)
+  noSpawn: true
+  components:
+  - type: Projectile
+    damage:
+      types:
+        Radiation: 9
+        Piercing: 10
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/magnum.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/magnum.yml
@@ -56,3 +56,15 @@
      types:
        Piercing: 26 # 20% decrease
    ignoreResistances: true
+
+- type: entity
+  id: BulletMagnumUranium
+  name: bullet (.45 magnum uranium)
+  parent: BaseBullet
+  noSpawn: true
+  components:
+  - type: Projectile
+    damage:
+      types:
+        Radiation: 15
+        Piercing: 20
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml
@@ -42,3 +42,15 @@
      types:
        Blunt: 2
        Heat: 14
+
+- type: entity
+  id: BulletPistolUranium
+  parent: BaseBullet
+  name: bullet (.35 auto uranium)
+  noSpawn: true
+  components:
+  - type: Projectile
+    damage:
+      types:
+        Radiation: 6
+        Piercing: 10
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml
@@ -43,3 +43,15 @@
        Blunt: 2
        Heat: 15
  
+- type: entity
+  id: BulletRifleUranium
+  parent: BaseBullet
+  name: bullet (0.20 rifle uranium)
+  noSpawn: true
+  components:
+  - type: Projectile
+    damage:
+      types:
+        Radiation: 7
+        Piercing: 8
+        
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml
@@ -160,3 +160,18 @@
    color: "#FF8080"
    radius: 15.0
    energy: 9.0
+
+- type: entity
+  id: PelletShotgunUranium
+  name: pellet (.50 uranium)
+  noSpawn: true
+  parent: BaseBullet
+  components:
+  - type: Sprite
+    sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi
+    state: depleted-uranium
+  - type: Projectile
+    damage:
+      types:
+        Radiation: 3
+        Piercing: 5
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -170,6 +170,15 @@
      - MagazineBoxMagnumIncendiary
      - MagazineBoxLightRifleIncendiary
      - MagazineBoxRifleIncendiary
+      - ShellShotgunUranium
+      - CartridgePistolUranium
+      - CartridgeMagnumUranium
+      - CartridgeLightRifleUranium
+      - CartridgeRifleUranium
+      - MagazineBoxPistolUranium
+      - MagazineBoxMagnumUranium
+      - MagazineBoxLightRifleUranium
+      - MagazineBoxRifleUranium

 - type: entity
  id: Protolathe
@@ -557,11 +566,22 @@
      - TargetHuman
      - TargetSyndicate
      - TargetClown
+      - MagazineBoxLightRiflePractice
+      - MagazineBoxMagnumPractice
+      - MagazineBoxPistolPractice
+      - MagazineBoxRiflePractice
+      - ShellShotgunPractice
+      - WeaponLaserCarbinePractice
+      - WeaponDisablerPractice
    dynamicRecipes:
      - CartridgeLightRifleIncendiary
      - CartridgeMagnumIncendiary
      - CartridgePistolIncendiary
      - CartridgeRifleIncendiary
+      - CartridgeLightRifleUranium
+      - CartridgeMagnumUranium
+      - CartridgePistolUranium
+      - CartridgeRifleUranium
      - CartridgeLightRifleRubber
      - CartridgeMagnumRubber
      - CartridgePistolRubber
@@ -574,17 +594,17 @@
      - MagazineBoxMagnumIncendiary
      - MagazineBoxPistolIncendiary
      - MagazineBoxRifleIncendiary
-      - MagazineBoxLightRiflePractice
-      - MagazineBoxMagnumPractice
-      - MagazineBoxPistolPractice
-      - MagazineBoxRiflePractice
+      - MagazineBoxLightRifleUranium
+      - MagazineBoxMagnumUranium
+      - MagazineBoxPistolUranium
+      - MagazineBoxRifleUranium
      - MagazineBoxLightRifleRubber
      - MagazineBoxMagnumRubber
      - MagazineBoxPistolRubber
      - MagazineBoxRifleRubber
      - ShellShotgunBeanbag
      - ShellShotgunIncendiary
-      - ShellShotgunPractice
+      - ShellShotgunUranium
      - Signaller
      - SignalTrigger
      - TelescopicShield
@@ -592,10 +612,8 @@
      - Truncheon
      - VoiceTrigger
      - WeaponAdvancedLaser
-      - WeaponDisablerPractice
      - WeaponLaserCannon
      - WeaponLaserCarbine
-      - WeaponLaserCarbinePractice
      - WeaponXrayCannon
  - type: MaterialStorage
    whitelist:
--- a/Resources/Prototypes/Recipes/Lathes/security.yml
+++ b/Resources/Prototypes/Recipes/Lathes/security.yml
@@ -463,3 +463,75 @@
    Steel: 500
    Glass: 100
    Plastic: 200
+
+- type: latheRecipe
+  id: ShellShotgunUranium
+  result: ShellShotgunUranium
+  completetime: 2
+  materials:
+    Plastic: 15
+    Uranium: 10
+
+- type: latheRecipe
+  id: CartridgePistolUranium
+  result: CartridgePistolUranium
+  completetime: 2
+  materials:
+    Plastic: 5
+    Uranium: 10
+
+- type: latheRecipe
+  id: CartridgeMagnumUranium
+  result: CartridgeMagnumUranium
+  completetime: 2
+  materials:
+    Plastic: 20
+    Uranium: 10
+
+- type: latheRecipe
+  id: CartridgeLightRifleUranium
+  result: CartridgeLightRifleUranium
+  completetime: 2
+  materials:
+    Plastic: 20
+    Uranium: 10
+
+- type: latheRecipe
+  id: CartridgeRifleUranium
+  result: CartridgeRifleUranium
+  completetime: 2
+  materials:
+    Plastic: 15
+    Uranium: 10
+
+- type: latheRecipe
+  id: MagazineBoxPistolUranium
+  result: MagazineBoxPistolUranium
+  completetime: 5
+  materials:
+    Plastic: 650
+    Uranium: 65
+
+- type: latheRecipe
+  id: MagazineBoxMagnumUranium
+  result: MagazineBoxMagnumUranium
+  completetime: 5
+  materials:
+    Plastic: 1250
+    Uranium: 125
+
+- type: latheRecipe
+  id: MagazineBoxLightRifleUranium
+  result: MagazineBoxLightRifleUranium
+  completetime: 5
+  materials:
+    Plastic: 1800
+    Uranium: 180
+
+- type: latheRecipe
+  id: MagazineBoxRifleUranium
+  result: MagazineBoxRifleUranium
+  completetime: 5
+  materials:
+    Plastic: 950
+    Uranium: 95
--- a/Resources/Prototypes/Research/arsenal.yml
+++ b/Resources/Prototypes/Research/arsenal.yml
@@ -88,22 +88,24 @@
  - MagazineBoxRifleRubber

 - type: technology
-  id: PracticeAmmunition
-  name: research-technology-practice-ammunition
+  id: UraniumMunitions
+  name: research-technology-uranium-munitions
  icon:
-    sprite: Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi
-    state: practice
+    sprite: Objects/Materials/Sheets/other.rsi
+    state: uranium
  discipline: Arsenal
  tier: 1
-  cost: 2000
+  cost: 7500
  recipeUnlocks:
-  - ShellShotgunPractice
-  - MagazineBoxPistolPractice
-  - MagazineBoxMagnumPractice
-  - MagazineBoxLightRiflePractice
-  - MagazineBoxRiflePractice
-  - WeaponLaserCarbinePractice
-  - WeaponDisablerPractice
+  - ShellShotgunUranium
+  - CartridgePistolUranium
+  - CartridgeMagnumUranium
+  - CartridgeLightRifleUranium
+  - CartridgeRifleUranium
+  - MagazineBoxPistolUranium
+  - MagazineBoxMagnumUranium
+  - MagazineBoxLightRifleUranium
+  - MagazineBoxRifleUranium

 # Tier 2

--- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/depleted-uranium-spent.png
+++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/depleted-uranium-spent.png
--- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/depleted-uranium.png
+++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/depleted-uranium.png
--- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/meta.json
@@ -5,7 +5,7 @@
        "y": 32
    },
    "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/e1d495c3faf4642b6ec1c4be8acc7cd5bc51d785/icons/obj/ammo.dmi, improvised ammo from https://github.com/tgstation/tgstation/ at commit fb2d71495bfe81446159ef528534193d09dd8d34",
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/e1d495c3faf4642b6ec1c4be8acc7cd5bc51d785/icons/obj/ammo.dmi, improvised ammo from https://github.com/tgstation/tgstation/ at commit fb2d71495bfe81446159ef528534193d09dd8d34, uranium ammo is a modification of the slug sprite by Boaz1111",
    "states": [
        {
            "name": "base"
@@ -54,6 +54,12 @@
        },
        {
            "name": "slug-spent"
+        },
+        {
+            "name": "depleted-uranium"
+        },
+        {
+            "name": "depleted-uranium-spent"
        }
    ]
 }
--- a/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles2.rsi/depleted-uranium.png
+++ b/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles2.rsi/depleted-uranium.png
--- a/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles2.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles2.rsi/meta.json
@@ -1,7 +1,7 @@
 {
  "version": 1,
  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/56cbafd6ad8c013ccd5472d6c4a0db790f7f872a, ball made by brainfood1183 (Github) for ss14",
+  "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/56cbafd6ad8c013ccd5472d6c4a0db790f7f872a, ball made by brainfood1183 (Github) for ss14, the uranium sprite is a modified version of the buckshot pellet by Boaz1111",
  "size": {
    "x": 32,
    "y": 32
@@ -13,6 +13,9 @@
    {
      "name": "buckshot-flare"
    },
+    { 
+      "name": "depleted-uranium"
+    },
    {
      "name": "ball"
    },