Speedloader fix (#12417)

* Speedloader fix * Unshitted and commented my code, rain would probably be proud.
2022-11-08 21:09:37 +00:00
parent bc7ef43ffd
commit 0b3038e1f6
9 changed files with 108 additions and 15 deletions
--- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
@@ -566,6 +566,7 @@
    whitelist:
      tags:
        - CartridgeCap
+        - SpeedLoaderCap
    proto: CartridgeCap
    capacity: 6
    chambers: [ True, True, True, True, True, True ]
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/magnum.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/magnum.yml
@@ -4,6 +4,9 @@
  parent: BaseItem
  abstract: true
  components:
+  - type: Tag
+    tags:
+      - SpeedLoaderMagnum
  - type: BallisticAmmoProvider
    whitelist:
      tags:
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/pistol.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/pistol.yml
@@ -4,6 +4,9 @@
  parent: BaseItem
  abstract: true
  components:
+  - type: Tag
+    tags:
+      - SpeedLoaderPistol
  - type: BallisticAmmoProvider
    whitelist:
      tags:
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/rifle_light.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/rifle_light.yml
@@ -3,6 +3,9 @@
  name: "speed loader (.30 rifle)"
  parent: BaseItem
  components:
+  - type: Tag
+    tags:
+      - SpeedLoaderRifle
  - type: BallisticAmmoProvider
    whitelist:
      tags:
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/toy.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/toy.yml
@@ -4,6 +4,9 @@
  parent: BaseItem
  abstract: true
  components:
+  - type: Tag
+    tags:
+      - SpeedLoaderCap
  - type: BallisticAmmoProvider
    whitelist:
      tags:
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml
@@ -30,6 +30,7 @@
    whitelist:
      tags:
        - CartridgeMagnum
+        - SpeedLoaderMagnum
    proto: CartridgeMagnum
    capacity: 7
    chambers: [ True, True, True, True, True, True, True ]
--- a/Resources/Prototypes/tags.yml
+++ b/Resources/Prototypes/tags.yml
@@ -377,6 +377,9 @@
 - type: Tag
  id: NoSpinOnThrow

+- type: Tag
+  id: NoBlockAnchoring
+
 - type: Tag
  id: NukeOpsUplink

@@ -492,6 +495,18 @@
 - type: Tag
  id: Spear

+- type: Tag
+  id: SpeedLoaderCap
+
+- type: Tag
+  id: SpeedLoaderMagnum
+
+- type: Tag
+  id: SpeedLoaderPistol
+
+- type: Tag
+  id: SpeedLoaderRifle
+
 - type: Tag
  id: StringInstrument