Issue Cleanup

Dusts off some of the code and makes some balance changes, along with better parenting.
DeltaV-Station · Jan 24, 2024 · 626910d · 626910d
1 parent 837f33a
commit 626910d
Show file tree

Hide file tree

Showing 12 changed files with 45 additions and 43 deletions.
diff --git a/Resources/Locale/en-US/deltav/store/uplink-catalog.ftl b/Resources/Locale/en-US/deltav/store/uplink-catalog.ftl
@@ -6,4 +6,4 @@ uplink-bionic-syrinx-implanter-name = Bionic Syrinx Implanter
 uplink-bionic-syrinx-implanter-desc = An implant that enhances a harpy's natural talent for mimicry to let you adjust your voice to whoever you can think of.
 # Bundles
 uplink-decimator-bundle-name = Decimator Bundle
-uplink-decimator-bundle-desc = The Decimator railgun and nine extra rebar. Favored by Gorlex snipers.
+uplink-decimator-bundle-desc = The Decimator railgun and three extra rebar. Favored by Gorlex snipers.
diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
@@ -336,15 +336,3 @@
       - id: ClothingHandsGlovesNitrile
       - id: SyringeTranexamicAcid
       - id: SyringeHyronalin
-
-- type: entity
-  parent: ClothingBackpackDuffelSyndicateBundle
-  id: ClothingBackpackDuffelSyndicateFilledRailgun
-  name: decimator bundle
-  description: "Favored by Gorlex Maurauder snipers, this railcannon packs a punch. Comes with 9 shots."
-  components:
-  - type: StorageFill
-    contents:
-      - id: WeaponRailgunDecimator
-      - id: BulletRailgunBasic
-        amount: 9
diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml
@@ -9,5 +9,3 @@
       - id: EmergencyRollerBedSpawnFolded
       - id: BodyBag_Folded
       - id: Portafib
-
-
diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/duffelbag.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/duffelbag.yml
@@ -0,0 +1,11 @@
+- type: entity
+  parent: ClothingBackpackDuffelSyndicateBundle
+  id: ClothingBackpackDuffelSyndicateFilledRailgun
+  name: Decimator bundle
+  description: "Favored by Gorlex Maurauder snipers, this railcannon packs a punch. Comes with 3 shots."
+  components:
+  - type: StorageFill
+    contents:
+      - id: WeaponRailgunDecimator
+      - id: BulletRailgunBasic
+        amount: 3
diff --git a/Resources/Prototypes/DeltaV/Catalog/uplink_catalog.yml b/Resources/Prototypes/DeltaV/Catalog/uplink_catalog.yml
@@ -16,7 +16,7 @@
   productEntity: ClothingBackpackDuffelSyndicateFilledRailgun
   icon: { sprite: DeltaV/Objects/Weapons/Guns/Railguns/railgun.rsi, state: icon }
   cost:
-    Telecrystal: 20
+    Telecrystal: 14
   categories:
   - UplinkBundles
 

diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
@@ -262,9 +262,10 @@
   name: Decimator Laser
   parent: BaseWeaponBattery
   id: WeaponLaserRailgun
-  size: Huge
   description: Limited run energy variant of the Decimator railcannon. Self recharging, slow firing but extremely powerful.
   components:
+  - type: Item
+    size: Huge
   - type: Sprite
     sprite: DeltaV/Objects/Weapons/Guns/Railguns/railgun_laser.rsi
     layers:
@@ -282,7 +283,7 @@
     delay: 5
   - type: GunRequiresWield
   - type: Gun
-    fireRate: 0.25
+    fireRate: 0.30
     selectedMode: SemiAuto
     availableModes:
     - SemiAuto

diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Projectiles/railgun_ammo.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Projectiles/railgun_ammo.yml
@@ -67,7 +67,8 @@
 - type: entity
   parent: BulletRailgun
   id: BulletRailgunAdmeme
-  name: Unholy Rod [Admeme]
+  suffix: "DO NOT MAP"
+  name: Unholy Rod
   description: By the time you're able to pick this up, the station's probably already destroyed.
   components:
   - type: Sprite

diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Railguns/railgun.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Railguns/railgun.yml
@@ -7,6 +7,11 @@
   components:
   - type: Item
     size: Huge
+  - type: Sprite
+    sprite: DeltaV/Objects/Weapons/Guns/Railguns/railgun.rsi
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
   - type: Clothing
     sprite: DeltaV/Objects/Weapons/Guns/Railguns/railgun.rsi
     quickEquip: false
@@ -16,14 +21,14 @@
   - type: Wieldable
     wieldSound:
       path: /Audio/DeltaV/Effects/railgun_charge.ogg
+  - type: GunRequiresWield
   - type: UseDelay
     delay: 5
   - type: HeldSpeedModifier
     walkModifier: 0.75
     sprintModifier: 0.75
-  - type: GunRequiresWield
   - type: Gun
-    fireRate: 0.20
+    fireRate: 0.30
     selectedMode: SemiAuto
     availableModes:
     - SemiAuto
@@ -52,45 +57,40 @@
   - type: BallisticAmmoProvider
     cycleable: false
     capacity: 3
-  - type: Sprite
-    sprite: DeltaV/Objects/Weapons/Guns/Railguns/railgun.rsi
-    layers:
-    - state: base
-      map: ["enum.GunVisualLayers.Base"]
-  - type: Wieldable
-  - type: GunRequiresWield
-    wieldSound:
-      path: /Audio/DeltaV/Effects/railgun_charge.ogg
 
 
+
+- type: entity
+  name: ERT Railgun
+  parent: BaseWeaponRailgun
+  id: WeaponRailgunERT
+  description: A mighty railgun that packs a hefty punch. Heavy, yet destructive.
+  components:
+  - type: BallisticAmmoProvider
+    cycleable: false
+    capacity: 3
+
 #admeme variant
 
 - type: entity
-  name: Unmaker Railgun [Admeme]
+  name: Unmaker Railgun
   parent: BaseWeaponRailgun
   id: WeaponRailgunAdmeme
+  suffix: "Admeme"
   description: So pants shittingly terrifying that it was banished to the bluespace dimension by Nar'Sie. It's back now.
   components:
   - type: BallisticAmmoProvider
     cycleable: false
     proto: BulletRailgunAdmeme
     capacity: 4200 #PANIC
-  - type: Sprite
-    sprite: DeltaV/Objects/Weapons/Guns/Railguns/railgun.rsi
-    layers:
-    - state: base
-      map: ["enum.GunVisualLayers.Base"]
   - type: Gun
     fireRate: 99 #the only thing they fear is you
     selectedMode: SemiAuto
     availableModes:
     - SemiAuto
     - FullAuto
     soundGunshot:
-      path: /Audio/Items/Toys/ian.ogg
-  - type: Wieldable
-    wieldSound:
-      path: /Audio/Items/Toys/ian.ogg
+      path: /Audio/Items/Toys/ian.ogg #barks so your ears are saved from BRRRRRRRRRRRRRRRR
 
 #clown variant, not finished
 

diff --git a/Resources/Prototypes/DeltaV/tags.yml b/Resources/Prototypes/DeltaV/tags.yml
@@ -38,3 +38,6 @@
 
 - type: Tag
   id: PaperSlip
+
+- type: Tag
+  id: BulletRailgun
diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/Cartridges/railrod.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/Cartridges/railrod.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Still-Icarus",
+    "copyright": "Made by Still-Icarus on Discord",
     "size": {
       "x": 32,
       "y": 32

diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Railguns/railgun.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Railguns/railgun.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Still-Icarus",
+    "copyright": "Made by Still-Icarus on Discord",
     "size": {
       "x": 32,
       "y": 32

diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Railguns/railgun_laser.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Railguns/railgun_laser.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Still-Icarus",
+    "copyright": "Made by Still-Icarus on Discord",
     "size": {
       "x": 32,
       "y": 32