diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml
index 61288abf95c..1b3c0792451 100644
--- a/Resources/Prototypes/Catalog/uplink_catalog.yml
+++ b/Resources/Prototypes/Catalog/uplink_catalog.yml
@@ -5,7 +5,7 @@
   id: UplinkPistolViper
   name: uplink-pistol-viper-name
   description: uplink-pistol-viper-desc
-  productEntity: WeaponPistolViper
+  productEntity: WeaponPistolViperSyndicate # Euphoria - Added Viper Variants
   discountCategory: rareDiscounts
   discountDownTo:
     Telecrystal: 2
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
index 64a677889ec..3ef2ff1b55e 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
@@ -28,7 +28,7 @@
     - suitStorage
     - Belt
   - type: Gun
-    fireRate: 6
+    fireRate: 5
     selectedMode: SemiAuto
     availableModes:
       - SemiAuto
@@ -82,9 +82,9 @@
 
 - type: entity
   name: viper
-  parent: [BaseWeaponPistol, BaseSyndicateContraband]
+  parent: [BaseWeaponPistol, BaseSecurityContraband] # Euphoria
   id: WeaponPistolViper
-  description: A common handgun illegally modified by the Syndicate. The Viper sports a selector switch between semi-auto and ‘rock and roll’. The standard sidearm for any soldier who fights under the three serpents. Feeds from .35 pistol magazines.
+  description: A small, easily concealable, but somewhat underpowered gun, produced by a bulk arms manufacturer now defunct for over a century. Uses .35 auto ammo.
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Pistols/viper.rsi
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml
index 21ac246a367..2c8ff692fbf 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml
@@ -133,9 +133,9 @@
 
 - type: entity
   name: Python
-  parent: [BaseWeaponRevolver, BaseSyndicateContraband]
+  parent: [BaseWeaponRevolver, BaseSecurityContraband] # Euphoria
   id: WeaponRevolverPython
-  description: A powerful double-action revolver manufactured by the Syndicate. Loud and flashy, perfect for any agent looking to make a statement. Loads 6 rounds of .45 magnum.
+  description: An iconic large-framed revolver of ancient Sol' design. It is commonly manufactured by many companies all over the colonies. Uses .45 magnum ammo.
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Revolvers/python.rsi
diff --git a/Resources/Prototypes/Roles/Antags/nukeops.yml b/Resources/Prototypes/Roles/Antags/nukeops.yml
index c57080678ad..00012296f26 100644
--- a/Resources/Prototypes/Roles/Antags/nukeops.yml
+++ b/Resources/Prototypes/Roles/Antags/nukeops.yml
@@ -67,7 +67,7 @@
     belt: ClothingBeltMilitaryWebbing
   storage:
     back:
-    - WeaponPistolViper
+    - WeaponPistolViperSyndicate # Euphoria
     - PinpointerSyndicateNuclear
     # - DeathAcidifierImplanter # DeltaV - more TC less acid
     - BionicVoiceMaskImplanter # DeltaV - Voice masking implant
diff --git a/Resources/Prototypes/Roles/Antags/traitor.yml b/Resources/Prototypes/Roles/Antags/traitor.yml
index 858ca414d9b..8026d7f4364 100644
--- a/Resources/Prototypes/Roles/Antags/traitor.yml
+++ b/Resources/Prototypes/Roles/Antags/traitor.yml
@@ -38,7 +38,7 @@
     gloves: ClothingHandsGlovesColorBlack
   storage:
     back:
-    - WeaponPistolViper
+    - WeaponPistolViperSyndicate # Euphoria
     - PinpointerSyndicateNuclear
     - DeathAcidifierImplanter
 
@@ -54,7 +54,7 @@
   id: SyndicateReinforcementMedic
   parent: SyndicateOperativeClothing
   equipment:
-    pocket1: WeaponPistolViper
+    pocket1: WeaponPistolViperSyndicate # Euphoria
   inhand:
     - MedkitCombatFilled
 
@@ -64,13 +64,13 @@
   equipment:
     id: AgentIDCard
     mask: ClothingMaskGasVoiceChameleon
-    pocket1: WeaponPistolViper
+    pocket1: WeaponPistolViperSyndicate # Euphoria 
 
 - type: startingGear
   id: SyndicateReinforcementThief
   parent: SyndicateOperativeClothing
   equipment:
-    pocket1: WeaponPistolViper
+    pocket1: WeaponPistolViperSyndicate # Euphoria 
   inhand:
     - ToolboxSyndicateFilled
   storage:
diff --git a/Resources/Prototypes/_DV/Catalog/Fills/Lockers/Syndicate.yml b/Resources/Prototypes/_DV/Catalog/Fills/Lockers/Syndicate.yml
index b93c868a4d2..d4a77eb505a 100644
--- a/Resources/Prototypes/_DV/Catalog/Fills/Lockers/Syndicate.yml
+++ b/Resources/Prototypes/_DV/Catalog/Fills/Lockers/Syndicate.yml
@@ -29,7 +29,7 @@
   id: ArmsdealerViper
   table: !type:AllSelector
     children:
-    - id: WeaponPistolViper
+    - id: WeaponPistolViperSyndicate # Euphoria
       amount: !type:RangeNumberSelector
         range: 1, 2
     - id: MagazinePistol
diff --git a/Resources/Prototypes/_DV/Catalog/fugitive_sets.yml b/Resources/Prototypes/_DV/Catalog/fugitive_sets.yml
index b2e2328693a..d30db5b2686 100644
--- a/Resources/Prototypes/_DV/Catalog/fugitive_sets.yml
+++ b/Resources/Prototypes/_DV/Catalog/fugitive_sets.yml
@@ -6,7 +6,7 @@
     sprite: Objects/Weapons/Guns/Pistols/viper.rsi
     state: icon
   content:
-  - WeaponPistolViper
+  - WeaponPistolViperSyndicate # Euphoria
   - MagazinePistol
   - BriefcaseBrown
 
diff --git a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
index 544236466bd..b171253d045 100644
--- a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
+++ b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
@@ -1,6 +1,6 @@
 - type: entity
   name: viper
-  parent: BaseWeaponPistol
+  parent: WeaponPistolViper # Euphoria - Added Parent so the code is cleaner
   id: WeaponPistolViperWood
   description: A small, low-power pistol with pleasant lacquered wooden grips. Uses .35 auto ammo.
   suffix: Wood
@@ -9,28 +9,6 @@
     sprite: _DV/Objects/Weapons/Guns/Pistols/viperwood.rsi
   - type: Clothing
     sprite: _DV/Objects/Weapons/Guns/Pistols/viperwood.rsi
-  - type: ItemSlots
-    slots:
-      gun_magazine:
-        name: Magazine
-        startingItem: MagazinePistol
-        insertSound: /Audio/Weapons/Guns/MagIn/pistol_magin.ogg
-        ejectSound: /Audio/Weapons/Guns/MagOut/pistol_magout.ogg
-        priority: 2
-        whitelist:
-          tags:
-            - MagazinePistol
-      gun_chamber:
-        name: Chamber
-        startingItem: CartridgePistol
-        priority: 1
-        whitelist:
-          tags:
-            - CartridgePistol
-  - type: ContainerContainer
-    containers:
-      gun_magazine: !type:ContainerSlot
-      gun_chamber: !type:ContainerSlot
 
 - type: entity
   name: Pollock
diff --git a/Resources/Prototypes/_DV/Roles/Antags/nukeops.yml b/Resources/Prototypes/_DV/Roles/Antags/nukeops.yml
index 914045b067c..43eac2fdabe 100644
--- a/Resources/Prototypes/_DV/Roles/Antags/nukeops.yml
+++ b/Resources/Prototypes/_DV/Roles/Antags/nukeops.yml
@@ -12,7 +12,7 @@
     shoes: ClothingShoesBootsCombatFilled
     id: SyndiPDA
     pocket1: WeaponDisabler
-    pocket2: WeaponPistolViper
+    pocket2: WeaponPistolViperSyndicate # Euphoria
     belt: ClothingBeltMilitaryWebbingHostageWarden
   storage:
     back:
diff --git a/Resources/Prototypes/_Floof/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/_Floof/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
new file mode 100644
index 00000000000..69b2ded2efe
--- /dev/null
+++ b/Resources/Prototypes/_Floof/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
@@ -0,0 +1,8 @@
+- type: entity # Syndicate Viper
+  name: viper
+  parent: [WeaponPistolViper, BaseSyndicateContraband]
+  id: WeaponPistolViperSyndicate
+  description: A small, easily concealable, but somewhat underpowered gun, produced by a bulk arms manufacturer now defunct for over a century. This one has been modified for improved firerate. Uses .35 auto ammo.
+  components:
+   - type: Gun
+     fireRate: 6
\ No newline at end of file
diff --git a/Resources/Prototypes/_Floof/Loadouts/Groups/security_weapons.yml b/Resources/Prototypes/_Floof/Loadouts/Groups/security_weapons.yml
index 89abfb0851e..28ec76bce8a 100644
--- a/Resources/Prototypes/_Floof/Loadouts/Groups/security_weapons.yml
+++ b/Resources/Prototypes/_Floof/Loadouts/Groups/security_weapons.yml
@@ -12,6 +12,8 @@
   - FloofWeaponLaserSvalinn
   - FloofPlasteelArmingSword
   - FloofWeaponEnergyGunMini
+  - FloofWeaponPistolViper
+  - FloofWeaponPistolViperWood
   - FloofClothingBeltKatanaSheathFilled
 
 - type: loadoutGroup
diff --git a/Resources/Prototypes/_Floof/Loadouts/Jobs/Security/security_weapons.yml b/Resources/Prototypes/_Floof/Loadouts/Jobs/Security/security_weapons.yml
index d2ac0cced13..d77a545b42e 100644
--- a/Resources/Prototypes/_Floof/Loadouts/Jobs/Security/security_weapons.yml
+++ b/Resources/Prototypes/_Floof/Loadouts/Jobs/Security/security_weapons.yml
@@ -9,6 +9,16 @@
   equipment:
     pocket1: WeaponLaserSvalinn
 
+- type: loadout
+  id: FloofWeaponPistolViper
+  equipment:
+    pocket1: WeaponPistolViper
+
+- type: loadout
+  id: FloofWeaponPistolViperWood
+  equipment:
+    pocket1: WeaponPistolViperWood
+
 # Ammo
 - type: loadout
   id: FloofSecurityFirearmMagazinePistolRubber