should be fixed

DeltaV-Station · Jan 17, 2025 · 12ae4e6 · 12ae4e6
1 parent 7dc4eb7
commit 12ae4e6
Show file tree

Hide file tree

Showing 3 changed files with 53 additions and 49 deletions.
diff --git a/Resources/Locale/en-US/research/technologies.ftl b/Resources/Locale/en-US/research/technologies.ftl
@@ -22,7 +22,7 @@ research-technology-portable-fission = Portable Fission
 research-technology-space-scanning = Space Scanning
 research-technology-excavation = Mass Excavation
 
-research-technology-draconic-munitions = Draonic Munitions
+research-technology-draconic-munitions = Draconic Munitions
 research-technology-uranium-munitions = Uranium Munitions
 research-technology-explosive-technology = Explosive Technology
 research-technology-special-means = Special Means

diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml
@@ -1,39 +1,25 @@
 # Tier 1
 
-- type: technology
-  id: DraconicMunitions
-  name: research-technology-exotic-ammunition # DeltaV - name change to Exotic Ammunition
-  icon:
-    sprite: Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi
-    state: incendiarydisplay
-  discipline: Arsenal
-  tier: 2 # DeltaV moved to t2 from t1
-  cost: 10000
-  recipeUnlocks:
-  - BoxShotgunIncendiary
-  - MagazineRifleIncendiary
-  - MagazinePistolIncendiary
-  - MagazineLightRifleIncendiary
-  - SpeedLoaderMagnumIncendiary
-  - MagazineShotgunIncendiary
-  - MagazineBoxPistolIncendiary
-  - MagazineBoxMagnumIncendiary
-  - MagazineBoxLightRifleIncendiary
-  - MagazineBoxRifleIncendiary
-  - MagazineBoxSpecialIncendiary # DeltaV
-  # DeltaV - Merges uranium and incend ammo techs, adds 38 special uranium rounds
-  - MagazineRifleUranium
-  - MagazinePistolUranium
-  - MagazineLightRifleUranium
-  - SpeedLoaderMagnumUranium
-  - MagazineBoxPistolUranium
-  - MagazineBoxMagnumUranium
-  - MagazineBoxLightRifleUranium
-  - MagazineBoxRifleUranium
-  - BoxShotgunUranium
-  - SpeedLoaderSpecialUranium
-  - MagazineBoxSpecialUranium
-  # End of modified code
+#- type: technology # DeltaV merged draconic and uranium munitions and moved to our namespace
+#  id: DraconicMunitions
+#  name: research-technology-draconic-muntions
+#  icon:
+#    sprite: Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi
+#    state: incendiarydisplay
+#  discipline: Arsenal
+#  tier: 2 # DeltaV moved to t2 from t1
+#  cost: 10000
+#  recipeUnlocks:
+#  - BoxShotgunIncendiary
+#  - MagazineRifleIncendiary
+#  - MagazinePistolIncendiary
+#  - MagazineLightRifleIncendiary
+#  - SpeedLoaderMagnumIncendiary
+#  - MagazineShotgunIncendiary
+#  - MagazineBoxPistolIncendiary
+#  - MagazineBoxMagnumIncendiary
+#  - MagazineBoxLightRifleIncendiary
+#  - MagazineBoxRifleIncendiary
 
 - type: technology
   id: WeaponizedLaserManipulation
@@ -74,7 +60,7 @@
   - MagazineBoxSpecialRubber
   # End of modified code
 
-#- type: technology
+#- type: technology # DeltaV merged draconic and uranium munitions and moved to our namespace
 #  id: UraniumMunitions
 #  name: research-technology-uranium-munitions
 #  icon:

diff --git a/Resources/Prototypes/_DV/Research/arsenal.yml b/Resources/Prototypes/_DV/Research/arsenal.yml
@@ -1,18 +1,36 @@
 # Tier 2
 
-#- type: technology
-#  id: ExoticAmmunition
-#  name: research-technology-exotic-ammunition
-#  icon:
-#    sprite: Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi
-#    state: beanbag
-#  discipline: Arsenal
-#  tier: 1
-#  cost: 7500
-#  recipeUnlocks:
-#  - MagazineBoxSpecialHoly
-#  - MagazineBoxSpecialMindbreaker
-#  - BoxShellSoulbreaker # Nyanotrasen - Soulbreaker shotgun ammo
+- type: technology
+  id: ExoticAmmunition
+  name: research-technology-exotic-ammunition
+  icon:
+    sprite: Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi
+    state: beanbag
+  discipline: Arsenal
+  tier: 1
+  cost: 7500
+  recipeUnlocks:
+  - MagazineRifleUranium
+  - MagazinePistolUranium
+  - MagazineLightRifleUranium
+  - SpeedLoaderMagnumUranium
+  - MagazineBoxPistolUranium
+  - MagazineBoxMagnumUranium
+  - MagazineBoxLightRifleUranium
+  - MagazineBoxRifleUranium
+  - BoxShotgunUranium
+  - SpeedLoaderSpecialUranium
+  - MagazineBoxSpecialUraniummmo
+  - BoxShotgunIncendiary
+  - MagazineRifleIncendiary
+  - MagazinePistolIncendiary
+  - MagazineLightRifleIncendiary
+  - SpeedLoaderMagnumIncendiary
+  - MagazineShotgunIncendiary
+  - MagazineBoxPistolIncendiary
+  - MagazineBoxMagnumIncendiary
+  - MagazineBoxLightRifleIncendiary
+  - MagazineBoxRifleIncendiary
 
 - type: technology
   id: EnergyGuns