diff --git a/Resources/Locale/en-US/_strings/_sunrise/store/uplink-catalog.ftl b/Resources/Locale/en-US/_strings/_sunrise/store/uplink-catalog.ftl
index 7c3e965701..9b42f06371 100644
--- a/Resources/Locale/en-US/_strings/_sunrise/store/uplink-catalog.ftl
+++ b/Resources/Locale/en-US/_strings/_sunrise/store/uplink-catalog.ftl
@@ -20,6 +20,8 @@ uplink-magazine-siar52-desc = Магазин ПП на 30 патронов. Со
 
 uplink-music-boombox-name = Музыкальный набор синдиката
 uplink-music-boombox-desc = Содержит бумбокс синдиката и несколько кассет к нему.
+uplink-mechpaint-mauler-name = балончик краски "МЯУЛЕР"
+uplink-mechpaint-mauler-desc = Содержит краску для Маулера. Превратите огромного МЕХа в милого котика!.
 
 ## Clothing
 
diff --git a/Resources/Locale/ru-RU/_prototypes/_sunrise/catalog/fills/crates/security.ftl b/Resources/Locale/ru-RU/_prototypes/_sunrise/catalog/fills/crates/security.ftl
index c6d2dee8b7..b2bba7bd35 100644
--- a/Resources/Locale/ru-RU/_prototypes/_sunrise/catalog/fills/crates/security.ftl
+++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/catalog/fills/crates/security.ftl
@@ -3,4 +3,6 @@ ent-CrateSecurityWebbing = ящик с РПС охраны
 ent-CrateSecurityGlovesCombat = ящик с боевыми перчатками
     .desc = Ящик, содержащий трое боевых перчаток. Чтобы открыть необходим уровень доступа Служба безопасности.
 ent-CrateSecuritySWAT = ящик с бронёй SWAT
-    .desc = Ящик, Содержит комплект Спецназа. Две брони SWAT, два шлема спецназа, два противогаза спецназа и боевые ботинки спецназа а так же боевые перчатки. Чтобы открыть необходим уровень доступа Службы Безопастности.
\ No newline at end of file
+    .desc = Ящик, Содержит комплект Спецназа. Две брони SWAT, два шлема спецназа, два противогаза спецназа и боевые ботинки спецназа а так же боевые перчатки. Чтобы открыть необходим уровень доступа Службы Безопастности.
+ent-CrateSecurityArmorReflective = ящик с отражающей бронёй
+    .desc = Ящик, Содержит комплект отражающей брони. Две отражающей брони, два щита от лазеров и две энерго пушки. Чтобы открыть необходим уровень доступа Службы Безопастности.
\ No newline at end of file
diff --git a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/ammunition/magazines/light_rifle.ftl b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/ammunition/magazines/light_rifle.ftl
index 9b35043898..d479286fe2 100644
--- a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/ammunition/magazines/light_rifle.ftl
+++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/ammunition/magazines/light_rifle.ftl
@@ -11,7 +11,7 @@ ent-MagazineNewVector = магазин Вектора
 ent-MagazineRPD = короб РПД
     .desc = Короб для РПД с длинной  лентой .30 винтовочных.
 ent-MagazineMachineGunMG42 = Короб MG-342
-    .desc = Короб для MG-342 с длинной  лентой .30 винтовочных.
+    .desc = Малый короб для MG-342 с короткой лентой .20 винтовочных.
 ent-MagazineLightMachineGunMG60 = Короб ПКМ 
     .desc = Короб для ПКМ с длинной  лентой .30 винтовочных.
 ent-MagazineVP70 = магазин пистолета VP-78
diff --git a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/lmgs/lmgs.ftl b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/lmgs/lmgs.ftl
index b4560eb3e1..e862e2e14a 100644
--- a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/lmgs/lmgs.ftl
+++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/lmgs/lmgs.ftl
@@ -3,6 +3,6 @@ ent-WeaponLightMachineGunMG60 = ПКМ-220
 ent-WeaponLightMachineGunRPD = РПД-Ш
     .desc = РПД-Ш Где "Ш" означает Штурмовой. Вариация Ручного пулемета СССП для Штурмовых операций в космическом пространстве где приклад будет только мешать. Остаётся популярным продуктом на чёрном рынке благодаря своей низкой стоимости. Использует патрон калибра .30 винтовочный.
 ent-WeaponMachineGunMG42 = MG-342
-    .desc = Пулемёт ОПЗ периода Второй мировой войны. Разработан в 1942 году. После войны поставки данного пулемёта возобновили в 2342 году. Использует патрон калибра .30 винтовочный.
+    .desc = Пулемёт ОПЗ периода Второй мировой войны. Разработан в 1942 году. После войны поставки данного пулемёта возобновили в 2342 году. Использует патрон калибра .20 винтовочный.
 ent-WeaponDL6902 = Пулемёт DL6902
     .desc = Тяжёлый пулемёт Cybersun. Лучшая версия легендарного пулемета L6 SAW. Использует патрон калибра .30 винтовочный.
diff --git a/Resources/Maps/_Sunrise/CentCommOutpostERT.yml b/Resources/Maps/_Sunrise/CentCommOutpostERT.yml
index 3a04bf1cfc..3fe1a6f382 100644
--- a/Resources/Maps/_Sunrise/CentCommOutpostERT.yml
+++ b/Resources/Maps/_Sunrise/CentCommOutpostERT.yml
@@ -13317,7 +13317,7 @@ entities:
     - type: Transform
       pos: -6.5,2.5
       parent: 2
-- proto: MagazineBoxAntiMaterielBig
+- proto: MagazineBoxMagnum
   entities:
   - uid: 2229
     components:
@@ -13329,7 +13329,7 @@ entities:
     - type: Transform
       pos: -10.337909,-10.608285
       parent: 2
-- proto: MagazineBoxLightRifleBig
+- proto: MagazineBoxRifleBig
   entities:
   - uid: 2116
     components:
@@ -20400,7 +20400,7 @@ entities:
     - type: Transform
       pos: 10.526651,-7.582013
       parent: 2
-- proto: WeaponLightMachineGunRPD
+- proto: WeaponMachineGunMG42
   entities:
   - uid: 2211
     components:
diff --git a/Resources/Maps/_Sunrise/Station/cog.yml b/Resources/Maps/_Sunrise/Station/cog.yml
index 930fcab8b7..0f48170c87 100644
--- a/Resources/Maps/_Sunrise/Station/cog.yml
+++ b/Resources/Maps/_Sunrise/Station/cog.yml
@@ -150031,7 +150031,7 @@ entities:
     - type: Transform
       pos: -61.5,-52.5
       parent: 12
-- proto: MagazineBR64Extended
+- proto: WeaponLaserSvalinn
   entities:
   - uid: 31842
     components:
@@ -203047,7 +203047,7 @@ entities:
     - type: Transform
       pos: -22.272215,65.76165
       parent: 12
-- proto: WeaponLaserSvalinn
+- proto: WeaponEnergyGunPistolSecurity
   entities:
   - uid: 29287
     components:
@@ -203090,7 +203090,7 @@ entities:
       parent: 19430
     - type: Physics
       canCollide: False
-- proto: WeaponRifleBR64
+- proto: WeaponIONRifle
   entities:
   - uid: 31841
     components:
diff --git a/Resources/Maps/_Sunrise/Station/oasis.yml b/Resources/Maps/_Sunrise/Station/oasis.yml
index 94fe61def8..51a7c144d2 100644
--- a/Resources/Maps/_Sunrise/Station/oasis.yml
+++ b/Resources/Maps/_Sunrise/Station/oasis.yml
@@ -114537,7 +114537,7 @@ entities:
     - type: Transform
       pos: -47.520466,-22.794298
       parent: 2
-- proto: MagazineBoxAntiMateriel
+- proto: WeaponLaserSvalinn
   entities:
   - uid: 21148
     components:
@@ -133682,7 +133682,7 @@ entities:
     - type: Transform
       pos: 47.5,-26.5
       parent: 2
-- proto: SpawnMechDurand
+- proto: SpawnMechRipley2
   entities:
   - uid: 21114
     components:
@@ -157740,7 +157740,7 @@ entities:
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
-- proto: WeaponMechSpecialMousetrapMortar
+- proto: MechPaintRipleyCombatRipley
   entities:
   - uid: 447
     components:
diff --git a/Resources/Maps/_Sunrise/Station/planet_delta.yml b/Resources/Maps/_Sunrise/Station/planet_delta.yml
index c6fd0c7644..ff8e2a0d19 100644
--- a/Resources/Maps/_Sunrise/Station/planet_delta.yml
+++ b/Resources/Maps/_Sunrise/Station/planet_delta.yml
@@ -172814,7 +172814,7 @@ entities:
     - type: Transform
       pos: -38.5,-35.5
       parent: 2
-- proto: MagazineBoxAntiMateriel
+- proto: WeaponLaserSvalinn
   entities:
   - uid: 25295
     components:
@@ -239682,7 +239682,7 @@ entities:
     - type: Transform
       pos: 36.47151,18.549223
       parent: 2
-- proto: WeaponRifleBR64
+- proto: WeaponIONRifle
   entities:
   - uid: 36695
     components:
diff --git a/Resources/Prototypes/Damage/modifier_sets.yml b/Resources/Prototypes/Damage/modifier_sets.yml
index c8f33f0da3..e8f37f01bb 100644
--- a/Resources/Prototypes/Damage/modifier_sets.yml
+++ b/Resources/Prototypes/Damage/modifier_sets.yml
@@ -385,11 +385,11 @@
   coefficients:
     Blunt: 0.6
     Slash: 0.6
-    Piercing: 0.65
+    Piercing: 0.55
     Shock: 1.8
-    Heat: 0.7
+    Heat: 0.8
   flatReductions:
-    Blunt: 8
+    Blunt: 10
     Heat: 10
 
 - type: damageModifierSet
@@ -399,31 +399,31 @@
     Slash: 0.5
     Piercing: 0.35
     Shock: 2.8
-    Heat: 0.6
+    Heat: 0.75
   flatReductions:
     Blunt: 15
     Heat: 15
 
 - type: damageModifierSet
-  id: MediumArmorSyndi
+  id: MediumArmorSyndi #40 40 50 -180 20
   coefficients:
     Blunt: 0.6
     Slash: 0.6
-    Piercing: 0.6
+    Piercing: 0.5
     Shock: 1.8
-    Heat: 0.75
+    Heat: 0.8
   flatReductions:
     Blunt: 8
-    Heat: 5
+    Heat: 8
 
 - type: damageModifierSet
-  id: HeavyArmorSyndi
+  id: HeavyArmorSyndi #50 50 60 -280 25
   coefficients:
     Blunt: 0.5
     Slash: 0.5
     Piercing: 0.4
     Shock: 2.8
-    Heat: 0.7
+    Heat: 0.75
   flatReductions:
-    Blunt: 10
-    Heat: 7
+    Blunt: 14
+    Heat: 14
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Objects/Power/powercells.yml b/Resources/Prototypes/Entities/Objects/Power/powercells.yml
index cd02472a3f..4eee842755 100644
--- a/Resources/Prototypes/Entities/Objects/Power/powercells.yml
+++ b/Resources/Prototypes/Entities/Objects/Power/powercells.yml
@@ -367,7 +367,7 @@
     sprite: Objects/Power/power_cages.rsi
     layers:
     - map: [ "enum.PowerCellVisualLayers.Base" ]
-      state: small
+      state: medium
     - map: [ "enum.PowerCellVisualLayers.Unshaded" ]
       state: o2
       shader: unshaded
@@ -384,7 +384,7 @@
     sprite: Objects/Power/power_cages.rsi
     layers:
     - map: [ "enum.PowerCellVisualLayers.Base" ]
-      state: small
+      state: high
     - map: [ "enum.PowerCellVisualLayers.Unshaded" ]
       state: o2
       shader: unshaded
@@ -392,6 +392,25 @@
   - type: Battery
     startingCharge: 0
 
+- type: entity
+  id: PowerCageCombat
+  parent: BasePowerCage
+  name: Combat power cage
+  description: A rechargeable power cage for big devices. Increased capacity for increased power levels.
+  components:
+  - type: Sprite
+    sprite: Objects/Power/power_cages.rsi
+    layers:
+    - map: [ "enum.PowerCellVisualLayers.Base" ]
+      state: combat
+    - map: [ "enum.PowerCellVisualLayers.Unshaded" ]
+      state: o2
+      shader: unshaded
+  - type: Battery
+    maxCharge: 7800
+    startingCharge: 7800
+  - type: EmpImmune
+
 - type: entity
   id: PowerCageSyndicate
   parent: BasePowerCage
@@ -402,11 +421,30 @@
     sprite: Objects/Power/power_cages.rsi
     layers:
     - map: [ "enum.PowerCellVisualLayers.Base" ]
-      state: high
+      state: syndicate
     - map: [ "enum.PowerCellVisualLayers.Unshaded" ]
       state: o2
       shader: unshaded
   - type: Battery
-    maxCharge: 8000
-    startingCharge: 8000
+    maxCharge: 12400
+    startingCharge: 12400
   - type: EmpImmune
+
+- type: entity
+  id: PowerCageERT
+  parent: BasePowerCage
+  name: NanoTrasen combat power cage
+  description: A rechargeable power cage for big devices. Increased capacity for increased power levels. Immune to EMP.
+  components:
+  - type: Sprite
+    sprite: Objects/Power/power_cages.rsi
+    layers:
+    - map: [ "enum.PowerCellVisualLayers.Base" ]
+      state: nanotrasen
+    - map: [ "enum.PowerCellVisualLayers.Unshaded" ]
+      state: o2
+      shader: unshaded
+  - type: Battery
+    maxCharge: 12400
+    startingCharge: 12400
+  - type: EmpImmune
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Mech/Weapons/Gun/combat.yml b/Resources/Prototypes/Entities/Objects/Specific/Mech/Weapons/Gun/combat.yml
index 5001e8d60c..c2053945a7 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Mech/Weapons/Gun/combat.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Mech/Weapons/Gun/combat.yml
@@ -17,7 +17,7 @@
       path: /Audio/Weapons/Guns/Gunshots/laser3.ogg
   - type: HitscanBatteryAmmoProvider
     proto: BulletPulse # Sunrise-Edit
-    fireCost: 50
+    fireCost: 65
   - type: Appearance
   - type: AmmoCounter
 
@@ -40,7 +40,7 @@
       path: /Audio/Weapons/Guns/Gunshots/laser_cannon.ogg
   - type: HitscanBatteryAmmoProvider
     proto: BulletRedHeavyLaser # Sunrise-Edit
-    fireCost: 45
+    fireCost: 50
   - type: Appearance
   - type: AmmoCounter
 
@@ -55,7 +55,7 @@
     sprite: Objects/Specific/Mech/mecha_equipment.rsi
     state: mecha_antimatrifle
   - type: Gun
-    fireRate: 2
+    fireRate: 1.4
     selectedMode: FullAuto
     availableModes:
       - FullAuto
@@ -63,7 +63,7 @@
       path: /Audio/_Sunrise/Weapons/Guns/Snipers/Bauer127/bauer127_shot.ogg
   - type: ProjectileBatteryAmmoProvider
     proto: CartridgeAntiMateriel
-    fireCost: 45
+    fireCost: 80
   - type: Appearance
   - type: AmmoCounter
 
@@ -136,7 +136,7 @@
         variation: 0.2
   - type: ProjectileBatteryAmmoProvider
     proto: TeslaGunBullet
-    fireCost: 35
+    fireCost: 55
   - type: Appearance
   - type: AmmoCounter
 
@@ -151,7 +151,7 @@
     sprite: Objects/Specific/Mech/mecha_equipment.rsi
     state: mecha_disabler
   - type: Gun
-    fireRate: 1.2
+    fireRate: 1.3
     selectedMode: SemiAuto
     availableModes:
       - SemiAuto
@@ -159,7 +159,7 @@
       path: /Audio/Weapons/Guns/Gunshots/taser2.ogg
   - type: HitscanBatteryAmmoProvider
     proto: BulletDisablerSmgSpread
-    fireCost: 20
+    fireCost: 45
   - type: Appearance
   - type: AmmoCounter
 
@@ -205,7 +205,7 @@
       path: /Audio/Weapons/Guns/Gunshots/shotgun.ogg
   - type: ProjectileBatteryAmmoProvider
     proto: ShellShotgun
-    fireCost: 40
+    fireCost: 50
   - type: Appearance
   - type: AmmoCounter
 
@@ -220,7 +220,7 @@
     sprite: Objects/Specific/Mech/mecha_equipment.rsi
     state: mecha_carbine
   - type: Gun
-    fireRate: 1.6
+    fireRate: 1.5
     selectedMode: FullAuto
     availableModes:
       - FullAuto
@@ -228,7 +228,7 @@
       path: /Audio/Weapons/Guns/Gunshots/shotgun.ogg
   - type: ProjectileBatteryAmmoProvider
     proto: ShellShotgunIncendiary
-    fireCost: 45
+    fireCost: 75
   - type: Appearance
   - type: AmmoCounter
 
@@ -309,7 +309,7 @@
       path: /Audio/Weapons/Guns/Empty/empty.ogg
   - type: HitscanBatteryAmmoProvider
     proto: BulletSyndiPlasmaDouble # Sunrise-Edit
-    fireCost: 10
+    fireCost: 25
   - type: Appearance
   - type: AmmoCounter
 
@@ -347,7 +347,7 @@
     sprite: Objects/Specific/Mech/mecha_equipment.rsi
     state: mecha_missilerack
   - type: Gun
-    fireRate: 1.3
+    fireRate: 1.2
     selectedMode: FullAuto
     availableModes:
       - FullAuto
@@ -355,7 +355,7 @@
       path: /Audio/Weapons/Guns/Gunshots/rpgfire.ogg
   - type: ProjectileBatteryAmmoProvider
     proto: BulletWeakRocket
-    fireCost: 50
+    fireCost: 80
   - type: Appearance
   - type: AmmoCounter
 
@@ -370,7 +370,7 @@
     sprite: Objects/Specific/Mech/mecha_equipment.rsi
     state: mecha_missilerack_six
   - type: Gun
-    fireRate: 0.4
+    fireRate: 0.20
     selectedMode: SemiAuto
     availableModes:
       - SemiAuto
@@ -378,12 +378,12 @@
       path: /Audio/Weapons/Guns/Gunshots/rpgfire.ogg
   - type: ProjectileBatteryAmmoProvider
     proto: GrenadeBlast
-    fireCost: 160
+    fireCost: 260
   - type: Appearance
   - type: AmmoCounter
   - type: Battery
-    maxCharge: 500
-    startingCharge: 500
+    maxCharge: 600
+    startingCharge: 600
 
 - type: entity
   id: WeaponMechCombatFlashbangLauncher
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml b/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml
index 337b6c5ec5..93dba01af3 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml
@@ -76,12 +76,12 @@
     joinSystem: true
   - type: DoAfter
   - type: Repairable
-    doAfterDelay: 2
+    doAfterDelay: 1
     damage:
       types:
-        Blunt: -15
-        Slash: -15
-        Piercing: -15
+        Blunt: -10
+        Slash: -10
+        Piercing: -10
   - type: UserInterface
     interfaces:
       enum.MechUiKey.Key:
@@ -229,7 +229,7 @@
     currentThresholdState : Alive
     thresholds:
       0: Alive
-      320: Critical
+      400: Critical
     showOverlays: false
     allowRevives: true
 
@@ -241,7 +241,7 @@
   - type: ContainerFill
     containers:
       mech-battery-slot:
-      - PowerCageSmall
+      - PowerCageMedium
 
 # Ripley MK-II
 - type: entity
@@ -277,8 +277,8 @@
       types:
         Blunt: 20
   - type: MovementSpeedModifier
-    baseWalkSpeed: 1
-    baseSprintSpeed: 2
+    baseWalkSpeed: 1.5
+    baseSprintSpeed: 2.2
   - type: Damageable
     damageModifierSet: MediumArmorNT
   - type: Reflect
@@ -296,7 +296,7 @@
     currentThresholdState : Alive
     thresholds:
       0: Alive
-      400: Critical
+      520: Critical
     showOverlays: false
     allowRevives: true
 
@@ -308,7 +308,7 @@
   - type: ContainerFill
     containers:
       mech-battery-slot:
-      - PowerCageSmall
+      - PowerCageMedium
 
 # Clarke
 - type: entity
@@ -358,7 +358,7 @@
     currentThresholdState : Alive
     thresholds:
       0: Alive
-      320: Critical
+      380: Critical
     showOverlays: false
     allowRevives: true
   - type: PointLight
@@ -381,7 +381,7 @@
   - type: ContainerFill
     containers:
       mech-battery-slot:
-      - PowerCageSmall
+      - PowerCageMedium
 
 # H.O.N.K.
 - type: entity
@@ -434,7 +434,7 @@
   - type: ContainerFill
     containers:
       mech-battery-slot:
-      - PowerCageSmall
+      - PowerCageMedium
 
 - type: entity
   parent: MechHonkerBattery
@@ -625,11 +625,11 @@
     attackRate: 1
     damage:
       types:
-        Blunt: 25
+        Blunt: 30
         Structural: 180
   - type: MovementSpeedModifier
     baseWalkSpeed: 2
-    baseSprintSpeed: 3
+    baseSprintSpeed: 3.5
   - type: Reflect
     reflectProb: 0.20
     spread: 180
@@ -640,7 +640,7 @@
     currentThresholdState : Alive
     thresholds:
       0: Alive
-      450: Critical
+      560: Critical
     showOverlays: false
     allowRevives: true
   - type: Tag
@@ -657,7 +657,7 @@
   - type: ContainerFill
     containers:
       mech-battery-slot:
-      - PowerCageHigh
+      - PowerCageCombat
 
 # Durand
 - type: entity
@@ -691,11 +691,11 @@
     attackRate: 1
     damage:
       types:
-        Blunt: 40
+        Blunt: 50
         Structural: 250
   - type: MovementSpeedModifier
     baseWalkSpeed: 1.5
-    baseSprintSpeed: 2
+    baseSprintSpeed: 2.5
   - type: Damageable
     damageModifierSet: MediumArmorNT
   - type: CanMoveInAir
@@ -710,7 +710,7 @@
     currentThresholdState : Alive
     thresholds:
       0: Alive
-      650: Critical
+      770: Critical
     showOverlays: false
     allowRevives: true
   - type: Tag
@@ -727,7 +727,7 @@
   - type: ContainerFill
     containers:
       mech-battery-slot:
-      - PowerCageHigh
+      - PowerCageCombat
 
 # Phazon
 
@@ -779,7 +779,7 @@
     currentThresholdState : Alive
     thresholds:
       0: Alive
-      280: Critical
+      300: Critical
     showOverlays: false
     allowRevives: true
   - type: Tag
@@ -833,11 +833,11 @@
     attackRate: 1
     damage:
       types:
-        Blunt: 30
+        Blunt: 35
         Structural: 200
   - type: MovementSpeedModifier
     baseWalkSpeed: 2.4
-    baseSprintSpeed: 3
+    baseSprintSpeed: 3.6
   - type: Reflect
     reflectProb: 0.20
     spread: 180
@@ -846,13 +846,20 @@
     - NonEnergy
   - type: Damageable
     damageModifierSet: MediumArmorNT
+  - type: CanMoveInAir
+  - type: MovementAlwaysTouching
   - type: MobThresholds
     currentThresholdState : Alive
     thresholds:
       0: Alive
-      450: Critical
+      570: Critical
     showOverlays: false
     allowRevives: true
+  - type: Tag
+    tags:
+    - DoorBumpOpener
+    - FootstepSound
+    - Gygax
 
 - type: entity
   id: MechNTGygaxBattery
@@ -862,7 +869,7 @@
   - type: ContainerFill
     containers:
       mech-battery-slot:
-      - PowerCageHigh
+      - PowerCageERT
 
 - type: entity
   id: MechNTGygaxFilled
@@ -873,8 +880,8 @@
     startingEquipment:
       - WeaponMechChainSword
       - WeaponMechCombatPulseRifle
-      - WeaponMechCombatXray
-      - WeaponMechCombatMissileRack6
+      - WeaponMechCombatHeavyRifle
+      - WeaponMechCombatMissileRack8
 
 # Marauder
 - type: entity
@@ -909,7 +916,7 @@
     attackRate: 1
     damage:
       types:
-        Blunt: 40
+        Blunt: 55
         Structural: 350
   - type: MovementSpeedModifier
     baseWalkSpeed: 1
@@ -928,7 +935,7 @@
     currentThresholdState : Alive
     thresholds:
       0: Alive
-      700: Critical
+      800: Critical
     showOverlays: false
     allowRevives: true
 
@@ -940,7 +947,7 @@
   - type: ContainerFill
     containers:
       mech-battery-slot:
-      - PowerCageHigh
+      - PowerCageERT
 
 - type: entity
   id: MechMarauderFilled
@@ -951,7 +958,7 @@
     startingEquipment:
       - WeaponMechChainSword
       - WeaponMechCombatPulseRifle
-      - WeaponMechCombatUltraRifle
+      - WeaponMechCombatHeavyRifle
       - WeaponMechCombatMissileRack8
 
 # Seraph
@@ -997,7 +1004,7 @@
   - type: CanMoveInAir
   - type: MovementAlwaysTouching
   - type: Reflect
-    reflectProb: 0.4
+    reflectProb: 0.30
     spread: 180
     soundOnReflect: /Audio/Weapons/block_metal1.ogg
     reflects:
@@ -1018,7 +1025,7 @@
   - type: ContainerFill
     containers:
       mech-battery-slot:
-      - PowerCageHigh
+      - PowerCageERT
 
 - type: entity
   id: MechSeraphFilled
@@ -1029,9 +1036,9 @@
     startingEquipment:
       - WeaponMechChainSword
       - WeaponMechCombatPulseRifle
-      - WeaponMechCombatShotgun
+      - WeaponMechCombatVindictor
       - WeaponMechCombatMissileRack6
-      - WeaponMechCombatUltraRifle
+      - WeaponMechCombatDuster
 
 # Syndicate Combat Mech
 
@@ -1072,7 +1079,7 @@
         Structural: 280
   - type: MovementSpeedModifier
     baseWalkSpeed: 2.2
-    baseSprintSpeed: 3.7
+    baseSprintSpeed: 3.8
   - type: Damageable
     damageModifierSet: MediumArmorSyndi
   - type: CanMoveInAir
@@ -1087,9 +1094,14 @@
     currentThresholdState : Alive
     thresholds:
       0: Alive
-      500: Critical
+      580: Critical
     showOverlays: false
     allowRevives: true
+  - type: Tag
+    tags:
+    - DoorBumpOpener
+    - FootstepSound
+    - Gygax
 
 - type: entity
   id: MechGygaxSyndieBattery
@@ -1144,17 +1156,17 @@
     attackRate: 1
     damage:
       types:
-        Blunt: 40
+        Blunt: 50
         Structural: 380
   - type: MovementSpeedModifier
     baseWalkSpeed: 2
-    baseSprintSpeed: 3
+    baseSprintSpeed: 2.8
   - type: Damageable
     damageModifierSet: MediumArmorSyndi
   - type: CanMoveInAir
   - type: MovementAlwaysTouching
   - type: Reflect
-    reflectProb: 0.30
+    reflectProb: 0.25
     spread: 180
     soundOnReflect: /Audio/Weapons/block_metal1.ogg
     reflects:
@@ -1163,7 +1175,7 @@
     currentThresholdState : Alive
     thresholds:
       0: Alive
-      650: Critical
+      780: Critical
     showOverlays: false
     allowRevives: true
 
@@ -1220,7 +1232,7 @@
     attackRate: 1
     damage:
       types:
-        Blunt: 50
+        Blunt: 60
         Structural: 450
   - type: MovementSpeedModifier
     baseWalkSpeed: 1
@@ -1230,11 +1242,16 @@
   - type: CanMoveInAir
   - type: MovementAlwaysTouching
   - type: Reflect
-    reflectProb: 0.30
+    reflectProb: 0.25
     spread: 180
     soundOnReflect: /Audio/Weapons/block_metal1.ogg
     reflects:
     - NonEnergy
+  - type: Tag
+    tags:
+    - DoorBumpOpener
+    - FootstepSound
+    - Mauler
   - type: MobThresholds
     currentThresholdState : Alive
     thresholds:
diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index 3ca4a8c917..7b95288973 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -368,6 +368,7 @@
       - MechPhasicScanningModule
       - HandCraftedNVD
       - BasicNVD
+      - PowerCageCombat
       - PowerCageHigh
       - PowerCageMedium
       # PowerCageSmall
@@ -688,6 +689,9 @@
     - PhazonLLeg
     - PhazonRArm
     - PhazonRLeg
+    - PowerCageCombat
+    - PowerCageHigh
+    - PowerCageMedium
     - MechEquipmentDrill
     - MechEquipmentDrillDiamond
     - MechEquipmentKineticAccelerator
@@ -697,10 +701,10 @@
     - WeaponMechCombatFlashbangLauncher
     - WeaponMechCombatSolarisLaser
     - WeaponMechCombatFiredartLaser
+    - WeaponMechCombatUltraRifle
   - type: EmagLatheRecipes
     emagDynamicRecipes:
     - WeaponMechCombatImmolationGun
-    - WeaponMechCombatUltraRifle
     - WeaponMechCombatShotgun
     - WeaponMechCombatShotgunIncendiary
     - WeaponMechCombatMissileRack8
diff --git a/Resources/Prototypes/Recipes/Lathes/powercells.yml b/Resources/Prototypes/Recipes/Lathes/powercells.yml
index 82c7b96aff..f830d8ab61 100644
--- a/Resources/Prototypes/Recipes/Lathes/powercells.yml
+++ b/Resources/Prototypes/Recipes/Lathes/powercells.yml
@@ -67,3 +67,13 @@
     Glass: 800
     Plastic: 400
     Gold: 100
+
+- type: latheRecipe
+  id: PowerCageCombat
+  result: PowerCageCombat
+  completetime: 15
+  materials:
+    Steel: 700
+    Glass: 1200
+    Plastic: 500
+    Gold: 200
\ No newline at end of file
diff --git a/Resources/Prototypes/Recipes/Lathes/security.yml b/Resources/Prototypes/Recipes/Lathes/security.yml
index a9f3c5a1cc..daba3352eb 100644
--- a/Resources/Prototypes/Recipes/Lathes/security.yml
+++ b/Resources/Prototypes/Recipes/Lathes/security.yml
@@ -94,7 +94,7 @@
   result: WeaponLaserSvalinn
   materials:
     Steel: 2000
-    Gold: 500
+    Gold: 200 #sunrise-Edit
 
 - type: latheRecipe
   parent: BaseWeaponRecipeLong
diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml
index b315b04774..12eedb79e6 100644
--- a/Resources/Prototypes/Research/arsenal.yml
+++ b/Resources/Prototypes/Research/arsenal.yml
@@ -206,7 +206,7 @@
   recipeUnlocks:
   - PowerCageRechargerCircuitboard
   #PowerCageSmall
-  - PowerCageMedium
+  #PowerCageMedium
   - MagazineGrenadeEmpty
   - ShellFlashArtillery
   - ShellBlastArtillery
@@ -310,5 +310,6 @@
   - DurandTargetingElectronics
   - WeaponMechCombatShotgun
   - WeaponMechCombatShotgunIncendiary
+  - PowerCageCombat
   technologyPrerequisites:
   - Gygax
diff --git a/Resources/Prototypes/Research/experimental.yml b/Resources/Prototypes/Research/experimental.yml
index 434f491a3f..009be8b549 100644
--- a/Resources/Prototypes/Research/experimental.yml
+++ b/Resources/Prototypes/Research/experimental.yml
@@ -150,6 +150,7 @@
   - PhazonTargetingElectronics
   technologyPrerequisites:
   - Ripley2
+  - Gygax
 
 - type: technology
   id: GravityManipulation
diff --git a/Resources/Prototypes/Research/industrial.yml b/Resources/Prototypes/Research/industrial.yml
index c0d2582c2b..604c3984e7 100644
--- a/Resources/Prototypes/Research/industrial.yml
+++ b/Resources/Prototypes/Research/industrial.yml
@@ -42,6 +42,7 @@
   recipeUnlocks:
   - PowerCellHigh
   - TurboItemRechargerCircuitboard
+  - PowerCageMedium
 
 - type: technology
   id: MechanicalCompression
@@ -191,7 +192,7 @@
     state: ripleymkii
   discipline: Industrial
   tier: 2
-  cost: 8000
+  cost: 5000
   recipeUnlocks:
   - RipleyMKIIHarness
   - RipleyUpgradeKit
@@ -206,7 +207,7 @@
     state: clarke
   discipline: Industrial
   tier: 2
-  cost: 10000
+  cost: 9000
   recipeUnlocks:
   - ClarkeHarness
   - ClarkeHead
diff --git a/Resources/Prototypes/_Sunrise/Catalog/Cargo/cargo_security.yml b/Resources/Prototypes/_Sunrise/Catalog/Cargo/cargo_security.yml
index 8e62d42179..d268ac015a 100644
--- a/Resources/Prototypes/_Sunrise/Catalog/Cargo/cargo_security.yml
+++ b/Resources/Prototypes/_Sunrise/Catalog/Cargo/cargo_security.yml
@@ -4,7 +4,7 @@
     sprite: Clothing/Belt/securitywebbing.rsi
     state: icon
   product: CrateSecurityWebbing
-  cost: 2500
+  cost: 1500
   category: cargoproduct-category-name-security
   group: market
 
@@ -26,4 +26,14 @@
   product: CrateSecuritySWAT
   cost: 6000
   category: cargoproduct-category-name-security
+  group: market
+
+- type: cargoProduct
+  id: SecurityReflective
+  icon:
+    sprite: Clothing/OuterClothing/Armor/armor_reflec.rsi
+    state: icon
+  product: CrateSecurityArmorReflective
+  cost: 4000
+  category: cargoproduct-category-name-security
   group: market
\ No newline at end of file
diff --git a/Resources/Prototypes/_Sunrise/Catalog/Fills/Crates/security.yml b/Resources/Prototypes/_Sunrise/Catalog/Fills/Crates/security.yml
index 932345e2cd..cf9cf72d63 100644
--- a/Resources/Prototypes/_Sunrise/Catalog/Fills/Crates/security.yml
+++ b/Resources/Prototypes/_Sunrise/Catalog/Fills/Crates/security.yml
@@ -37,4 +37,19 @@
       - id: ClothingHeadHelmetSwat 
         amount: 2
       - id: ClothingHandsGlovesCombat
+        amount: 2 
+
+- type: entity
+  id: CrateSecurityArmorReflective
+  parent: CrateSecgear
+  name: reflective armor crate 
+  description: Contains a reflective armor. 2 reflective armor, 2 RiotLaserShield, 2 EnergyGun. To open it, the Security Service access level is required.
+  components:
+  - type: StorageFill
+    contents:
+      - id: ClothingOuterArmorReflective
+        amount: 2
+      - id: RiotLaserShield 
+        amount: 2
+      - id: WeaponEnergyGun
         amount: 2 
\ No newline at end of file
diff --git a/Resources/Prototypes/_Sunrise/Catalog/Fills/Lockers/pilot.yml b/Resources/Prototypes/_Sunrise/Catalog/Fills/Lockers/pilot.yml
index 6a9e93388b..8585f28bf7 100644
--- a/Resources/Prototypes/_Sunrise/Catalog/Fills/Lockers/pilot.yml
+++ b/Resources/Prototypes/_Sunrise/Catalog/Fills/Lockers/pilot.yml
@@ -6,12 +6,12 @@
   - type: StorageFill
     contents:
     - id: ClothingHeadsetSecurity
-    - id: WeaponDisabler
+    - id: WeaponEnergyGunPistolSecurity
     - id: CigarGoldCase
       prob: 0.25
     - id: ClothingOuterHardsuitPilot
     - id: OxygenTankFilled
     - id: ClothingMaskGasPilot
-    - id: ComputerShuttleSecurity
+    # - id: ComputerShuttleSecurity "No shuttle. cry about it"
     - id: ClothingShoesBootsMag
     - id: ClothingHandsGlovesCombat
diff --git a/Resources/Prototypes/_Sunrise/Catalog/uplink_catalog.yml b/Resources/Prototypes/_Sunrise/Catalog/uplink_catalog.yml
index 56f27f20c5..8475aacfa1 100644
--- a/Resources/Prototypes/_Sunrise/Catalog/uplink_catalog.yml
+++ b/Resources/Prototypes/_Sunrise/Catalog/uplink_catalog.yml
@@ -434,6 +434,21 @@
   categories:
   - UplinkPointless
 
+- type: listing
+  id: UplinkMechPaintMaulerMeowler
+  name: uplink-mechpaint-mauler-name
+  description: uplink-mechpaint-mauler-desc
+  productEntity: MechPaintMaulerMeowler
+  cost:
+    Telecrystal: 1
+  categories:
+  - UplinkPointless
+  conditions:
+  - !type:StoreWhitelistCondition
+    whitelist:
+      tags:
+      - NukeOpsUplink
+
 - type: listing
   id: UplinkClothingBackpackSyndie
   name: uplink-clothing-backpack-syndie-name
@@ -894,7 +909,7 @@
   discountDownTo:
     Telecrystal: 5
   cost:
-    Telecrystal: 7
+    Telecrystal: 10
   categories:
   - UplinkMechs
   conditions:
@@ -913,7 +928,7 @@
   discountDownTo:
     Telecrystal: 6
   cost:
-    Telecrystal: 12
+    Telecrystal: 10
   categories:
   - UplinkMechs
   conditions:
@@ -949,9 +964,9 @@
   productEntity: WeaponMechCombatShotgunIncendiary
   discountCategory: rareDiscounts
   discountDownTo:
-    Telecrystal: 6
+    Telecrystal: 7
   cost:
-    Telecrystal: 12
+    Telecrystal: 14
   categories:
   - UplinkMechs
   conditions:
@@ -968,9 +983,9 @@
   productEntity: WeaponMechCombatUltraRifle
   discountCategory: rareDiscounts
   discountDownTo:
-    Telecrystal: 3
+    Telecrystal: 2
   cost:
-    Telecrystal: 5
+    Telecrystal: 4
   categories:
   - UplinkMechs
   conditions:
@@ -1027,7 +1042,7 @@
   discountDownTo:
     Telecrystal: 15
   cost:
-    Telecrystal: 28
+    Telecrystal: 35
   categories:
   - UplinkMechs
   conditions:
@@ -1044,9 +1059,9 @@
   productEntity: WeaponMechCombatUVM31
   discountCategory: rareDiscounts
   discountDownTo:
-    Telecrystal: 9
+    Telecrystal: 15
   cost:
-    Telecrystal: 18
+    Telecrystal: 25
   categories:
   - UplinkMechs
   conditions:
diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Fun/mech_spray_paint.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Fun/mech_spray_paint.yml
index abdcd5f153..530f6f9a22 100644
--- a/Resources/Prototypes/_Sunrise/Entities/Objects/Fun/mech_spray_paint.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Fun/mech_spray_paint.yml
@@ -522,3 +522,33 @@
         enum.OpenableVisuals.Layer:
           True: {state: "executioner"}
           False: {state: "executioner-cap"}
+
+#Mauler-Meowler
+
+- type: entity
+  parent: MechPaintBase
+  suffix: DEBUG, Mauler , Meowler
+  id: MechPaintMaulerMeowler
+  components:
+  - type: Sprite
+    sprite: _Sunrise/Objects/Fun/mech_spraycans/mauler.rsi
+    layers:
+      - state: mauler-meow-cap
+        map: ["enum.OpenableVisuals.Layer"]
+  - type: Item
+    sprite: _Sunrise/Objects/Fun/mech_spraycans/mauler.rsi
+    heldPrefix: meowler
+  - type: MechPaint
+    used: false
+    whitelist:
+      tags:
+        - Mauler
+    baseState: meowler
+    openState: meowler-open
+    brokenState: meowler-broken
+  - type: GenericVisualizer
+    visuals:
+      enum.OpenableVisuals.Opened:
+        enum.OpenableVisuals.Layer:
+          True: {state: "mauler-meow"}
+          False: {state: "mauler-meow-cap"}
diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Power/powercells.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Power/powercells.yml
index 386ff2199d..1a6806f282 100644
--- a/Resources/Prototypes/_Sunrise/Entities/Objects/Power/powercells.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Power/powercells.yml
@@ -1,6 +1,6 @@
 - type: entity
   name: syndicate power cell
-  description: A rechargeable standardized power cell. This one looks like a rare and powerful prototype.
+  description: A rechargeable standardized power cell. This one looks like a rare and powerful Syndicate combat variant.
   id: PowerCellSyndicate
   suffix: Full
   parent: BasePowerCell
@@ -8,7 +8,7 @@
   - type: Sprite
     layers:
     - map: [ "enum.PowerCellVisualLayers.Base" ]
-      state: hyper
+      state: syndicate
     - map: [ "enum.PowerCellVisualLayers.Unshaded" ]
       state: o2
       shader: unshaded
@@ -16,3 +16,41 @@
     maxCharge: 2800
     startingCharge: 2800
   - type: EmpImmune
+
+- type: entity
+  name: ERT power cell
+  description: A rechargeable standardized power cell. This one looks like a rare and powerful NanoTrasen combat variant.
+  id: PowerCellNanoTrasen
+  suffix: Full
+  parent: BasePowerCell
+  components:
+  - type: Sprite
+    layers:
+    - map: [ "enum.PowerCellVisualLayers.Base" ]
+      state: nanotrasen
+    - map: [ "enum.PowerCellVisualLayers.Unshaded" ]
+      state: o2
+      shader: unshaded
+  - type: Battery
+    maxCharge: 2800
+    startingCharge: 2800
+  - type: EmpImmune
+
+- type: entity
+  name: combat power cell
+  description: A rechargeable standardized power cell. This one looks like a rare combat variant.
+  id: PowerCellCombat
+  suffix: Full
+  parent: BasePowerCell
+  components:
+  - type: Sprite
+    layers:
+    - map: [ "enum.PowerCellVisualLayers.Base" ]
+      state: combat
+    - map: [ "enum.PowerCellVisualLayers.Unshaded" ]
+      state: o2
+      shader: unshaded
+  - type: Battery
+    maxCharge: 2700
+    startingCharge: 2700
+  - type: EmpImmune
diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Mech/Weapons/Gun/combat.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Mech/Weapons/Gun/combat.yml
index e434ffc603..7862aa10dc 100644
--- a/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Mech/Weapons/Gun/combat.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Mech/Weapons/Gun/combat.yml
@@ -18,7 +18,7 @@
       path: /Audio/_Sunrise/Weapons/Guns/HMGs/minigun_shot.ogg
   - type: ProjectileBatteryAmmoProvider
     proto: CartridgeRifle
-    fireCost: 6
+    fireCost: 7
   - type: Appearance
   - type: AmmoCounter
 
@@ -35,15 +35,15 @@
   - type: Gun
     minAngle: -15
     maxAngle: 25
-    fireRate: 4
+    fireRate: 6.8
     selectedMode: FullAuto
     availableModes:
       - FullAuto
     soundGunshot:
       path: /Audio/_Sunrise/Weapons/Guns/SMGs/mp38/mp38_shot.ogg
   - type: ProjectileBatteryAmmoProvider
-    proto: ShellShotgunSlug
-    fireCost: 7
+    proto: CartridgeLightRifle
+    fireCost: 8
   - type: Appearance
   - type: AmmoCounter
 
@@ -68,7 +68,7 @@
       path: /Audio/Weapons/Guns/Gunshots/mateba.ogg
   - type: ProjectileBatteryAmmoProvider
     proto: CannonBall
-    fireCost: 85
+    fireCost: 160
   - type: Appearance
   - type: AmmoCounter
 
@@ -93,7 +93,7 @@
       path: /Audio/Weapons/Guns/Gunshots/mateba.ogg
   - type: ProjectileBatteryAmmoProvider
     proto: CannonBallGrapeshot
-    fireCost: 35
+    fireCost: 50
   - type: Appearance
   - type: AmmoCounter
 
@@ -118,7 +118,7 @@
       path: /Audio/Weapons/Guns/Gunshots/mateba.ogg
   - type: ProjectileBatteryAmmoProvider
     proto: CannonBallGlassshot
-    fireCost: 55
+    fireCost: 80
   - type: Appearance
   - type: AmmoCounter
 
@@ -146,8 +146,8 @@
       params:
         volume: -1
   - type: HitscanBatteryAmmoProvider
-    proto: BulletSyndiPlasmaDouble
-    fireCost: 6
+    proto: BulletSyndiPlasma
+    fireCost: 7
   - type: Appearance
   - type: AmmoCounter
 
@@ -170,6 +170,6 @@
       path: /Audio/Weapons/Guns/Gunshots/ship_duster.ogg
   - type: ProjectileBatteryAmmoProvider
     proto: GrenadeFrag
-    fireCost: 140
+    fireCost: 250
   - type: Appearance
   - type: AmmoCounter
diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Tools/energydome.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Tools/energydome.yml
index d7e12c3eca..92d22ceb22 100644
--- a/Resources/Prototypes/_Sunrise/Entities/Objects/Tools/energydome.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Tools/energydome.yml
@@ -63,10 +63,10 @@
     slots:
       cell_slot:
         name: power-cell-slot-component-slot-name-default
-        startingItem: PowerCellMedium
+        startingItem: PowerCellNanoTrasen
         whitelist:
           tags:
-            - PowerCell
+            - PowerCell 
   - type: EnergyDomeGenerator
     damageEnergyDraw: 3
     domePrototype: EnergyDomeMediumBlue
@@ -101,10 +101,10 @@
     slots:
       cell_slot:
         name: power-cell-slot-component-slot-name-default
-        startingItem: PowerCellMedium
+        startingItem: PowerCellNanoTrasen
         whitelist:
           tags:
-            - PowerCell
+            - PowerCell 
   - type: EnergyDomeGenerator
     damageEnergyDraw: 5
     domePrototype: EnergyDomeSmallBlue
diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml
index 39b20698cf..2098c42ffd 100644
--- a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml
@@ -173,11 +173,11 @@
     - MagazineMachineGunMG42
   - type: BallisticAmmoProvider
     mayTransfer: true
-    proto: CartridgeLightRifle  # 762x39
+    proto: CartridgeRifle  # 556
     whitelist:
       tags:
-      - CartridgeLightRifle  # 762x39
-    capacity: 200
+      - CartridgeRifle  # 556
+    capacity: 75
   - type: Item
     size: Normal
   - type: ContainerContainer
diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml
index 72819c7ece..4e7ed915a1 100644
--- a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml
@@ -144,7 +144,7 @@
   - type: Gun
     minAngle: 30
     maxAngle: 90
-    fireRate: 8
+    fireRate: 8.5
     soundGunshot:
       path: /Audio/_Sunrise/Weapons/Guns/LMGs/shot.ogg
       params:
@@ -160,14 +160,13 @@
         whitelist:
           tags:
           - MagazineMachineGunMG42
-          - MagazineLightRifleBox
       gun_chamber:
         name: Chamber
-        startingItem: CartridgeLightRifle  # 762x39
+        startingItem: CartridgeRifle  # 556
         priority: 1
         whitelist:
           tags:
-          - CartridgeLightRifle  # 762x39
+          - CartridgeRifle  # 556
   - type: ContainerContainer
     containers:
       gun_magazine: !type:ContainerSlot
diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml
index d5418f3e26..59315833bd 100644
--- a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml
@@ -138,7 +138,8 @@
   id: BulletMagnum
   damage:
     types:
-      Blunt: 35
+      Piercing: 27
+      Blunt: 8
   collisionMask: BulletImpassable
   reflective: NonEnergy
   bulletTracer:
@@ -379,7 +380,7 @@
     types:
       Piercing: 38
       Structural: 15
-    staminaDamage: 5
+  staminaDamage: 5
   collisionMask: BulletImpassable
   reflective: NonEnergy
   bulletTracer:
diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Snipers/snipers.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
index 10c0ecd7b0..a53a3d853e 100644
--- a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
@@ -84,7 +84,7 @@
     minAngle: -20
     maxAngle: -40
   - type: Gun
-    fireRate: 3
+    fireRate: 2
     minAngle: 28
     maxAngle: 48
     soundGunshot:
@@ -122,7 +122,7 @@
   - type: Appearance
   - type: Wieldable
   - type: UseDelay
-    delay: 0.5
+    delay: 1
   - type: ZoomableGun
   - type: ChamberMagazineAmmoProvider
     autoEject: true
diff --git a/Resources/Prototypes/_Sunrise/Recipes/Lathes/mech_parts.yml b/Resources/Prototypes/_Sunrise/Recipes/Lathes/mech_parts.yml
index c46dc0fcd1..9be9d2ab6b 100644
--- a/Resources/Prototypes/_Sunrise/Recipes/Lathes/mech_parts.yml
+++ b/Resources/Prototypes/_Sunrise/Recipes/Lathes/mech_parts.yml
@@ -72,7 +72,6 @@
     Steel: 1500
     Glass: 800
     Silver: 250
-    Diamond: 100
 
 - type: latheRecipe
   id: DurandLArm
diff --git a/Resources/Prototypes/_Sunrise/tags.yml b/Resources/Prototypes/_Sunrise/tags.yml
index 9b7aee37e7..bb00f81770 100644
--- a/Resources/Prototypes/_Sunrise/tags.yml
+++ b/Resources/Prototypes/_Sunrise/tags.yml
@@ -179,6 +179,9 @@
 - type: Tag
   id: Gygax
 
+- type: Tag
+  id: Mauler
+
 - type: Tag
   id: Durand
 
diff --git a/Resources/Textures/Objects/Power/power_cages.rsi/combat.png b/Resources/Textures/Objects/Power/power_cages.rsi/combat.png
new file mode 100644
index 0000000000..186a8e88b0
Binary files /dev/null and b/Resources/Textures/Objects/Power/power_cages.rsi/combat.png differ
diff --git a/Resources/Textures/Objects/Power/power_cages.rsi/meta.json b/Resources/Textures/Objects/Power/power_cages.rsi/meta.json
index 705a82df96..190407a536 100644
--- a/Resources/Textures/Objects/Power/power_cages.rsi/meta.json
+++ b/Resources/Textures/Objects/Power/power_cages.rsi/meta.json
@@ -16,6 +16,15 @@
         {
             "name": "high"
         },
+        {
+            "name": "syndicate"
+        },
+        {
+            "name": "combat"
+        },
+        {
+            "name": "nanotrasen"
+        },
         {
             "name": "inhand-left",
             "directions": 4
diff --git a/Resources/Textures/Objects/Power/power_cages.rsi/nanotrasen.png b/Resources/Textures/Objects/Power/power_cages.rsi/nanotrasen.png
new file mode 100644
index 0000000000..d0eda4efc9
Binary files /dev/null and b/Resources/Textures/Objects/Power/power_cages.rsi/nanotrasen.png differ
diff --git a/Resources/Textures/Objects/Power/power_cages.rsi/syndicate.png b/Resources/Textures/Objects/Power/power_cages.rsi/syndicate.png
new file mode 100644
index 0000000000..0611f0cdb8
Binary files /dev/null and b/Resources/Textures/Objects/Power/power_cages.rsi/syndicate.png differ
diff --git a/Resources/Textures/Objects/Power/power_cells.rsi/combat.png b/Resources/Textures/Objects/Power/power_cells.rsi/combat.png
new file mode 100644
index 0000000000..822b98a538
Binary files /dev/null and b/Resources/Textures/Objects/Power/power_cells.rsi/combat.png differ
diff --git a/Resources/Textures/Objects/Power/power_cells.rsi/meta.json b/Resources/Textures/Objects/Power/power_cells.rsi/meta.json
index 6ed575b6f0..25a172d7b6 100644
--- a/Resources/Textures/Objects/Power/power_cells.rsi/meta.json
+++ b/Resources/Textures/Objects/Power/power_cells.rsi/meta.json
@@ -25,6 +25,15 @@
         {
             "name": "microreactor"
         },
+        {
+            "name": "combat"
+        },
+        {
+            "name": "nanotrasen"
+        },
+        {
+            "name": "syndicate"
+        },
         {
             "name": "antique"
         },
diff --git a/Resources/Textures/Objects/Power/power_cells.rsi/nanotrasen.png b/Resources/Textures/Objects/Power/power_cells.rsi/nanotrasen.png
new file mode 100644
index 0000000000..9a07516a0e
Binary files /dev/null and b/Resources/Textures/Objects/Power/power_cells.rsi/nanotrasen.png differ
diff --git a/Resources/Textures/Objects/Power/power_cells.rsi/syndicate.png b/Resources/Textures/Objects/Power/power_cells.rsi/syndicate.png
new file mode 100644
index 0000000000..dd142fe25d
Binary files /dev/null and b/Resources/Textures/Objects/Power/power_cells.rsi/syndicate.png differ
diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/meowler-broken.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/meowler-broken.png
new file mode 100644
index 0000000000..50cb61b606
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/meowler-broken.png differ
diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/meowler-open.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/meowler-open.png
new file mode 100644
index 0000000000..9bbf000c17
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/meowler-open.png differ
diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/meowler.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/meowler.png
new file mode 100644
index 0000000000..b423af7ca4
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/meowler.png differ
diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/meta.json b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/meta.json
index 7cc8980369..a751f9a488 100644
--- a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/meta.json
@@ -218,6 +218,101 @@
     {
       "name": "mauler-broken"
     },
+{
+      "name": "meowler",
+      "directions": 4,
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "meowler-open",
+      "delays": [
+        [
+          0.5,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "meowler-broken"
+    },
     {
       "name": "odysseus",
       "directions": 4
diff --git a/Resources/Textures/_Sunrise/Objects/Fun/mech_spraycans/mauler.rsi/mauler-meow-cap.png b/Resources/Textures/_Sunrise/Objects/Fun/mech_spraycans/mauler.rsi/mauler-meow-cap.png
new file mode 100644
index 0000000000..9cfad3c795
Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Fun/mech_spraycans/mauler.rsi/mauler-meow-cap.png differ
diff --git a/Resources/Textures/_Sunrise/Objects/Fun/mech_spraycans/mauler.rsi/mauler-meow.png b/Resources/Textures/_Sunrise/Objects/Fun/mech_spraycans/mauler.rsi/mauler-meow.png
new file mode 100644
index 0000000000..077b13b771
Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Fun/mech_spraycans/mauler.rsi/mauler-meow.png differ
diff --git a/Resources/Textures/_Sunrise/Objects/Fun/mech_spraycans/mauler.rsi/meta.json b/Resources/Textures/_Sunrise/Objects/Fun/mech_spraycans/mauler.rsi/meta.json
new file mode 100644
index 0000000000..4e483f6682
--- /dev/null
+++ b/Resources/Textures/_Sunrise/Objects/Fun/mech_spraycans/mauler.rsi/meta.json
@@ -0,0 +1,17 @@
+{
+  "copyright" : "SUNRISE",
+  "license" : "CLA",
+  "version": 1,
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+        "name": "mauler-meow"
+    },
+    {
+        "name": "mauler-meow-cap"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/migration.yml b/Resources/migration.yml
index 058bd9e991..639c57e7d1 100644
--- a/Resources/migration.yml
+++ b/Resources/migration.yml
@@ -492,14 +492,14 @@ AirlockHatchSyndicate: AirlockHatchSyndicateLocked
 SurveillanceCameraWirelessRouterBase: SurveillanceCameraWirelessRouterConstructed
 CryogenicSleepUnitSpawner: CryogenicSleepUnitSpawnerLateJoin
 WeaponLaserCannon: WeaponEarthGovLaserSniper
-WeaponRifleLecter: WeaponRifleFamas
+WeaponRifleLecter: WeaponRifleM16A4
 WeaponDisabler: WeaponEnergyGunMini
 MagazinePistolSubMachineGunTopMounted: MagazineM16A4
 WeaponSubMachineGunWt550: WeaponRifleM16A4
 WeaponRevolverMateba: WeaponRevolverMatebaNew
-WeaponSniperHristov: WeaponRifleBR64
+WeaponSniperHristov: WeaponIONRifle
 WeaponLaserCarbine: WeaponEarthGovLaserCarbine
-WeaponPistolMk58: WeaponPistolACP14
+WeaponPistolMk58: WeaponEnergyGunPistolSecurity
 WeaponRifleAk: WeaponRifleAKM
 WeaponRifleM90GrenadeLauncher: WeaponRifleM28
 WeaponShotgunEnforcer: WeaponShotgunSPAS12