fix

Resources/Locale/en-US/_corvaxnext/entities/objects/Robotics/security.ftl

@@ -9,8 +9,8 @@ ent-WeaponDisablerROW = disabler-MK3
 ent-WeaponDisablerSMGROW = disabler-SMG+
     .desc = An advanced weapon that exhausts organic targets until they fall off their feet. Powered by cyborg energy.
 
-ent-WeaponRifleLecterROW = Lecter ROW
-    .desc = A high end military grade assault rifle. Synthesizes ammo by powering a cyborg.
+ent-WeaponPistolMk58ROW = mk 59
+    .desc = A cheap, ubiquitous sidearm, produced by a NanoTrasen subsidiary. This version automatically synthesizes ammunition using cyborg energy.
 
 ent-HandHeldCriminalRecords = handheld criminal records
     .desc = A device for remote access to the station's criminal records.

Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/robotics/borg_modules.ftl

@@ -74,7 +74,7 @@ ent-BorgModuleNeutralization = neutralization cyborg module
     .desc = { ent-BaseBorgModuleSecurity.desc }
 ent-BorgModuleNeutralizationAdvanced = advanced neutralization cyborg module
     .desc = { ent-BaseBorgModuleSecurity.desc }
-ent-BorgModuleLecter = lecter cyborg module
+ent-BorgModuleCombat = protective cyborg module
     .desc = { ent-BaseBorgModuleSecurity.desc }
 ent-BorgModuleSecurityControlling = controlling cyborg module
     .desc = { ent-BaseBorgModuleSecurity.desc }

Resources/Locale/ru-RU/_CorvaxNext/entities/objects/Robotics/security.ftl

@@ -9,8 +9,8 @@ ent-WeaponDisablerROW = станнер-MK3
 ent-WeaponDisablerSMGROW = станнер-пулемёт+
     .desc = Усовершенствованное оружие, которое изнуряет органические цели, пока они не свалятся с ног. Питается от энергии киборга.
 
-ent-WeaponRifleLecterROW = Лектер ROW
-    .desc = Первоклассная армейская штурмовая винтовка. Синтезирует боеприпасы за счёт питания киборга.
+ent-WeaponPistolMk58ROW = МК 59
+    .desc = Дешёвый и распространённый пистолет, производимый дочерней компанией Nanotrasen. Эта версия автоматически синтезирует боеприпасы, используя энергию киборга.
 
 ent-HandHeldCriminalRecords = пульт криминальных записей
     .desc = Устройство для дистанционного доступа к криминальным записям станции.

Resources/Locale/ru-RU/borg/borg.ftl

@@ -56,6 +56,6 @@ borg-type-service-name = Сервисный
 borg-type-service-desc = Помогайте членам экипажа в самых разных ситуациях - от подачи закусок и напитков до занятий ботаникой и развлечений.
 borg-type-service-transponder = киборг-официант
 
-borg-type-security-name = Служебный
+borg-type-security-name = Охранный
 borg-type-security-desc = Помогайте отделу Службы безопасности в контроле соблюдения космического закона и устранении угроз станции.
 borg-type-security-transponder = киборг-службы-безопасности

Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/robotics/borg_modules.ftl

@@ -74,8 +74,8 @@ ent-BorgModuleNeutralization = обезвреживающий модуль ки
     .desc = { ent-BaseBorgModuleSecurity.desc }
 ent-BorgModuleNeutralizationAdvanced = продвинутый обезвреживающий модуль киборга
     .desc = { ent-BaseBorgModuleSecurity.desc }
-ent-BorgModuleLecter = Лектер модуль киборга
-    .desc = Техническая деталь, дающая киборгам новые способности. Имеется гравировка "Установка разрешена только в Красный Код и выше!"
+ent-BorgModuleCombat = защитный модуль киборга
+    .desc = { ent-BaseBorgModuleSecurity.desc }
 ent-BorgModuleSecurityControlling = контролирующий модуль киборга
     .desc = { ent-BaseBorgModuleSecurity.desc }
 ent-BorgModuleSyndicateWeapon = кроваво-красный модуль киборга

Resources/Prototypes/Entities/Objects/Devices/holoprojectors.yml

@@ -140,6 +140,7 @@
   id: HoloprojectorSecurityBorg
   name: holobarrier projector
   suffix: Borg
+  categories: [ HideSpawnMenu ]
   description: Creates a solid but fragile holographic barrier. Self-rechargable
   components:
   - type: HolosignProjector

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

@@ -487,7 +487,7 @@
   parent: WeaponDisabler
   id: WeaponDisablerROW
   description: A self-defense weapon that exhausts organic targets, weakening them until they collapse.
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Battery
     maxCharge: 500
@@ -538,7 +538,7 @@
   parent: WeaponDisablerSMG
   id: WeaponDisablerSMGROW
   description: Advanced weapon that exhausts organic targets, weakening them until they collapse.
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Gun
     minAngle: 2

Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml

@@ -201,12 +201,50 @@
   - type: Clothing
     sprite: Objects/Weapons/Guns/Pistols/mk58.rsi
   - type: Gun
+    minAngle: 2
+    maxAngle: 10
     fireRate: 5
     availableModes:
     - SemiAuto
     soundGunshot:
       path: /Audio/Weapons/Guns/Gunshots/mk58.ogg
 
+- type: entity
+  name: mk 59
+  parent: [ BaseItem, BaseRestrictedContraband ]
+  id: WeaponPistolMk58ROW
+  description: A cheap, ubiquitous sidearm, produced by a NanoTrasen subsidiary. This version automatically synthesizes ammunition using cyborg energy.
+  components:
+  - type: Gun
+    fireRate: 5
+    selectedMode: SemiAuto
+    availableModes:
+      - SemiAuto
+      - FullAuto
+    soundGunshot:
+      path: /Audio/Weapons/Guns/Gunshots/mk58.ogg
+  - type: Sprite
+    sprite: Objects/Weapons/Guns/Pistols/mk58.rsi
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-0
+      map: ["enum.GunVisualLayers.Mag"]
+  - type: ContainerContainer
+    containers:
+      ballistic-ammo: !type:Container
+  - type: ProjectileBatteryAmmoProvider
+    proto: BulletPistol
+    fireCost: 100
+  - type: Battery
+    maxCharge: 1000
+    startingCharge: 1000
+  - type: BatterySelfRecharger
+    autoRecharge: true
+    autoRechargeRate: 25
+  - type: AmmoCounter
+
+
 - type: entity
   name: N1984
   parent: [BaseWeaponPistol, BaseRestrictedContraband]

Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml

@@ -191,46 +191,6 @@
     zeroVisible: true
   - type: Appearance
 
-- type: entity
-  name: Lecter ROW
-  parent: BaseItem
-  suffix: Borg
-  id: WeaponRifleLecterROW
-  description: A high end military grade assault rifle. Synthesizes ammo by powering a cyborg.
-  noSpawn: true
-  components:
-  - type: Gun
-    minAngle: 12
-    maxAngle: 18
-    fireRate: 5
-    selectedMode: FullAuto
-    availableModes:
-      - FullAuto
-    soundGunshot:
-      path: /Audio/Weapons/Guns/Gunshots/ltrifle.ogg
-  - type: Sprite
-    sprite: Objects/Weapons/Guns/Rifles/lecter.rsi
-    layers:
-      - state: base
-        map: [ "enum.GunVisualLayers.Base" ]
-      - state: mag-0
-        map: [ "enum.GunVisualLayers.Mag" ]
-  - type: Item
-    size: Huge
-  - type: ContainerContainer
-    containers:
-      ballistic-ammo: !type:Container
-  - type: ProjectileBatteryAmmoProvider
-    proto: CartridgeLightRifle
-    fireCost: 100
-  - type: Battery
-    maxCharge: 1600
-    startingCharge: 1600
-  - type: BatterySelfRecharger
-    autoRecharge: true
-    autoRechargeRate: 20
-  - type: AmmoCounter
-
 - type: entity
   name: Foam Force Astro Ace
   parent: [BaseWeaponShotgun, BaseGunWieldable]

Resources/Prototypes/Entities/Objects/Weapons/security.yml

@@ -94,7 +94,7 @@
   parent: Stunbaton
   id: StunbatonROW
   description: A stun baton for incapacitating people with. It is charged by cyborg power
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Stunbaton
     energyPerUse: 200
@@ -187,7 +187,7 @@
 
 - type: entity
   name: flash
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   parent: [BaseItem, Flash]
   id: FlashBorg
   suffix: Borg

Resources/Prototypes/Entities/Structures/Machines/lathe.yml

@@ -813,7 +813,7 @@
       - WeaponXrayCannon
       - SecurityCyberneticEyes # _CorvaxNext: surgery Change
       - MedicalCyberneticEyes # _CorvaxNext: surgery Change
-      - BorgModuleLecter # _CorvaxNext: Security Borg
+      - BorgModuleCombat # _CorvaxNext: Security Borg
       - BorgModuleSecurityControlling # _CorvaxNext: Security Borg
       - BorgModuleNeutralizationAdvanced # _CorvaxNext: Security Borg
   - type: MaterialStorage

Resources/Prototypes/Research/arsenal.yml

@@ -97,7 +97,6 @@
   - HoloprojectorSecurity
   - WeaponDisablerSMG
   - BorgModuleSecurityControlling
-  - BorgModuleLecter
 
 - type: technology
   id: ExplosiveTechnology
@@ -143,6 +142,7 @@
   recipeUnlocks:
   - WeaponLaserCannon
   - BorgModuleNeutralizationAdvanced
+  - BorgModuleCombat
 
 - type: technology
   id: WaveParticleHarnessing

Resources/Prototypes/_CorvaxNext/Entities/Objects/Specific/Robotics/borg_modules.yml

@@ -43,24 +43,23 @@
     icon: { sprite: _CorvaxNext/Interface/Actions/actions_borg.rsi, state: security-neutralization-adv-module }
 
 - type: entity
-  id: BorgModuleLecter
+  id: BorgModuleCombat
   parent: [ BaseBorgModuleSecurity, BaseProviderBorgModule ]
-  name: lecter cyborg module
-  description: A piece of tech that gives cyborgs new abilities. Installation is allowed only in  red code and above.
+  name: combat cyborg module
   components:
   - type: Sprite
     layers:
     - state: security
-    - state: icon-lecter
+    - state: icon-combat
   - type: ItemBorgModule
     items:
-    - WeaponRifleLecterROW
+    - WeaponPistolMk58ROW
     - CombatKnife
   - type: Tag
     tags:
     - BorgModuleSec
   - type: BorgModuleIcon
-    icon: { sprite: _CorvaxNext/Interface/Actions/actions_borg.rsi, state: security-lecter-module }
+    icon: { sprite: _CorvaxNext/Interface/Actions/actions_borg.rsi, state: security-combat-module }
 
 - type: entity
   id: BorgModuleSecurityControlling

Resources/Prototypes/_CorvaxNext/Entities/Objects/Tools/HandheldComputers/handheld_criminal_Records.yml

@@ -36,7 +36,7 @@
   id: HandHeldCriminalRecordsBorg
   parent: HandHeldCriminalRecords
   suffix: Borg
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: ItemSlots
     slots:

Resources/Prototypes/_CorvaxNext/Recipes/Lathes/robotics.yml

@@ -29,10 +29,10 @@
 
 - type: latheRecipe
   parent: BaseBorgModuleRecipe
-  id: BorgModuleLecter
-  result: BorgModuleLecter
+  id: BorgModuleCombat
+  result: BorgModuleCombat
   materials:
-    Steel: 2000
+    Steel: 1500
     Glass: 1500
     Plastic: 1000
     Gold: 50

Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/meta.json

@@ -134,7 +134,7 @@
       "name": "syndicate"
     },
     {
-      "name": "icon-lecter"
+      "name": "icon-combat"
     },
     {
       "name": "icon-neutralization"

Resources/Textures/_CorvaxNext/Interface/Actions/actions_borg.rsi/meta.json

@@ -8,7 +8,7 @@
   },
   "states": [
     {
-      "name": "security-lecter-module"
+      "name": "security-combat-module"
     },
     {
       "name": "security-neutralization-module"