constitution rifle, magnum disabler, railgun

Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml

@@ -889,7 +889,80 @@
     price: 750
 
 - type: entity
-  name: energy shotgun
+  name: railgun
+  parent: [BaseWeaponBattery, BaseGunWieldable]
+  id: WeaponFakeAssRailgunFBI
+  description: A weapon that fires projectiles at speeds high enough to turn them into lasers.
+  components:
+  - type: Sprite
+    sprite: Objects/Weapons/Guns/Battery/railgun_fbi.rsi
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-unshaded-4
+      map: ["enum.GunVisualLayers.MagUnshaded"]
+      shader: unshaded
+  - type: Clothing
+    sprite: Objects/Weapons/Guns/Battery/railgun_fbi.rsi
+  - type: Gun
+    fireRate: 0.7
+    soundGunshot:
+      path: /Audio/Weapons/Guns/Gunshots/laser3.ogg
+  - type: HitscanBatteryAmmoProvider
+    proto: Pulse
+    fireCost: 100
+  - type: Battery
+    maxCharge: 400
+    startingCharge: 400
+  - type: BatterySelfRecharger
+    autoRecharge: true
+    autoRechargeRate: 5
+
+- type: entity
+  name: disabler magnum
+  parent: BaseWeaponBatterySmall
+  id: WeaponDisablerMagnum
+  description: A respectable tool for any captain when security won't do their jobs.
+  components:
+    - type: Tag
+      tags:
+        - Taser
+        - Sidearm
+    - type: Sprite
+      sprite: Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi
+      layers:
+        - state: base
+          map: ["enum.GunVisualLayers.Base"]
+        - state: mag-unshaded-0
+          map: ["enum.GunVisualLayers.MagUnshaded"]
+          shader: unshaded
+    - type: Clothing
+      sprite: Objects/Weapons/Guns/Battery/disabler.rsi
+      quickEquip: false
+      slots:
+        - suitStorage
+        - Belt
+    - type: Gun
+      fireRate: 2
+      soundGunshot:
+        path: /Audio/Weapons/Guns/Gunshots/taser2.ogg
+    - type: Battery
+      maxCharge: 600
+      startingCharge: 600
+    - type: ProjectileBatteryAmmoProvider
+      proto: BulletDisablerMagnum
+      fireCost: 100
+    - type: MagazineVisuals
+      magState: mag
+      steps: 5
+      zeroVisible: true
+    - type: Appearance
+    - type: GuideHelp
+      guides:
+      - Security
+
+- type: entity      
+- name: energy shotgun
   parent: [BaseWeaponBattery, BaseGunWieldable]
   id: WeaponEnergyShotgun
   description: A one-of-a-kind prototype energy weapon that uses various shotgun configurations. It offers the possibility of both lethal and non-lethal shots, making it a versatile weapon.
@@ -939,3 +1012,5 @@
     autoRechargeRate: 24
     autoRechargePause: true
     autoRechargePauseTime: 10
+
+

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

@@ -261,6 +261,49 @@
       collection: WeakHit
     forceSound: true
 
+- type: entity
+  name : magnum disabler bolt
+  id: BulletDisablerMagnum
+  parent: BaseBullet
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Reflective
+    reflective:
+    - Energy
+  - type: FlyBySound
+    sound:
+      collection: EnergyMiss
+      params:
+        volume: 5
+  - type: Sprite
+    sprite: Objects/Weapons/Guns/Projectiles/projectiles_tg.rsi
+    layers:
+    - state: omnilaser
+      shader: unshaded
+  - type: Physics
+  - type: Fixtures
+    fixtures:
+      projectile:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.15,-0.3,0.15,0.3"
+        hard: false
+        mask:
+        - Impassable
+        - BulletImpassable
+      fly-by: *flybyfixture
+  - type: Ammo
+  - type: StaminaDamageOnCollide
+    damage: 45
+  - type: Projectile
+    impactEffect: BulletImpactEffectDisabler
+    damage:
+      types:
+        Heat: 8
+    soundHit:
+      collection: WeakHit
+    forceSound: true
+
 - type: entity
   name : disabler bolt practice
   id: BulletDisablerPractice

Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml

@@ -209,6 +209,29 @@
     proto: CartridgeAntiMateriel
   - type: StaticPrice
     price: 0
+
+- type: entity
+  name: antique rifle
+  parent: [BaseWeaponSniper, BaseGunWieldable]
+  id: WeaponSniperHdFbi
+  description: A weapon given to good citizens of a now defunct nation, prized for reliability in a pinch. Uses .30 rifle ammo.
+  components:
+  - type: Sprite
+    sprite: Objects/Weapons/Guns/Snipers/bolt_gun_hd_fbi.rsi
+  - type: Gun
+    fireRate: 1
+    selectedMode: SemiAuto
+    availableModes:
+    - SemiAuto
+    soundGunshot:
+      path: /Audio/Weapons/Guns/Gunshots/sniper.ogg
+    fireOnDropChance: 1
+  - type: BallisticAmmoProvider
+    capacity: 5
+    proto: CartridgeLightRifle
+    whitelist:
+      tags:
+      - CartridgeLightRifle
   - type: MeleeWeapon
     attackRate: 1.2
     damage:
@@ -218,3 +241,4 @@
     wideAnimationRotation: 135
   - type: DamageOtherOnHit
     staminaCost: 5
+

Resources/Textures/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/meta.json

@@ -0,0 +1,81 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "taken from tg station at commit https://github.com/tgstation/tgstation/blob/832ae532766d491d91db53746d15b4b55be3f2b0, slightly edited by FBI to be revolver",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "base"
+        },
+        {
+            "name": "mag-unshaded-4"
+        },
+        {
+            "name": "mag-unshaded-3"
+        },
+        {
+            "name": "mag-unshaded-2"
+        },
+        {
+            "name": "mag-unshaded-1"
+        },
+        {
+            "name": "mag-unshaded-0",
+            "delays": [
+                [
+                    0.3,
+                    0.3
+                ]
+            ]
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-0"
+        },
+        {
+            "name": "inhand-left-1"
+        },
+        {
+            "name": "inhand-left-2"
+        },
+        {
+            "name": "inhand-left-3"
+        },
+        {
+            "name": "inhand-left-4"
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-0"
+        },
+        {
+            "name": "inhand-right-1"
+        },
+        {
+            "name": "inhand-right-2"
+        },
+        {
+            "name": "inhand-right-3"
+        },
+        {
+            "name": "inhand-right-4"
+        },
+		{
+			"name": "equipped-BELT",
+			"directions": 4
+		},
+		{
+			"name": "equipped-SUITSTORAGE",
+			"directions": 4
+		}
+    ]
+}

Resources/Textures/Objects/Weapons/Guns/Battery/railgun_fbi/meta.json

@@ -0,0 +1,53 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Made by FBI",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "base"
+        },
+        {
+            "name": "mag-unshaded-1"
+        },
+        {
+            "name": "mag-unshaded-2"
+        },
+        {
+            "name": "mag-unshaded-3"
+        },
+        {
+            "name": "mag-unshaded-4"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "equipped-BACKPACK",
+            "directions": 4
+        },
+        {
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
+        }
+    ]
+}

Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_hd_fbi.rsi/meta.json

@@ -0,0 +1,41 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from InterBay13 at https://github.com/AndySok/InterBay13/commit/84824582fe1381d9ea6282b9da407994ab8ab509, backpack sling sprite edited by Boaz1111, wield sprites by RiceMar1244, recolored by FederalBureau",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "base"
+        },
+        {
+            "name": "bolt-open"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "equipped-BACKPACK",
+            "directions": 4
+        },
+        {
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
+        }
+    ]
+}