oops

space-sunrise · Dec 12, 2024 · a073256 · a073256
1 parent b9328d5
commit a073256
Show file tree

Hide file tree

Showing 35 changed files with 221 additions and 99 deletions.
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
@@ -3,4 +3,6 @@ ent-CrateSecurityWebbing = ящик с РПС охраны
 ent-CrateSecurityGlovesCombat = ящик с боевыми перчатками
     .desc = Ящик, содержащий трое боевых перчаток. Чтобы открыть необходим уровень доступа Служба безопасности.
 ent-CrateSecuritySWAT = ящик с бронёй SWAT
-    .desc = Ящик, Содержит комплект Спецназа. Две брони SWAT, два шлема спецназа, два противогаза спецназа и боевые ботинки спецназа а так же боевые перчатки. Чтобы открыть необходим уровень доступа Службы Безопастности.
+    .desc = Ящик, Содержит комплект Спецназа. Две брони SWAT, два шлема спецназа, два противогаза спецназа и боевые ботинки спецназа а так же боевые перчатки. Чтобы открыть необходим уровень доступа Службы Безопастности.
+ent-CrateSecurityArmorReflective = ящик с отражающей бронёй
+    .desc = Ящик, Содержит комплект отражающей брони. Две отражающей брони, два щита от лазеров и две энерго пушки. Чтобы открыть необходим уровень доступа Службы Безопастности.
diff --git a/...U/_prototypes/_sunrise/entities/objects/weapons/guns/ammunition/magazines/light_rifle.ftl b/...U/_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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/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,14 +384,33 @@
     sprite: Objects/Power/power_cages.rsi
     layers:
     - map: [ "enum.PowerCellVisualLayers.Base" ]
-      state: small
+      state: high
     - map: [ "enum.PowerCellVisualLayers.Unshaded" ]
       state: o2
       shader: unshaded
       visible: false
   - 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
diff --git 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,15 +55,15 @@
     sprite: Objects/Specific/Mech/mecha_equipment.rsi
     state: mecha_antimatrifle
   - type: Gun
-    fireRate: 2
+    fireRate: 1.4
     selectedMode: FullAuto
     availableModes:
       - FullAuto
     soundGunshot:
       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,15 +151,15 @@
     sprite: Objects/Specific/Mech/mecha_equipment.rsi
     state: mecha_disabler
   - type: Gun
-    fireRate: 1.2
+    fireRate: 1.3
     selectedMode: SemiAuto
     availableModes:
       - SemiAuto
     soundGunshot:
       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,15 +220,15 @@
     sprite: Objects/Specific/Mech/mecha_equipment.rsi
     state: mecha_carbine
   - type: Gun
-    fireRate: 1.6
+    fireRate: 1.5
     selectedMode: FullAuto
     availableModes:
       - FullAuto
     soundGunshot:
       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,15 +347,15 @@
     sprite: Objects/Specific/Mech/mecha_equipment.rsi
     state: mecha_missilerack
   - type: Gun
-    fireRate: 1.3
+    fireRate: 1.2
     selectedMode: FullAuto
     availableModes:
       - FullAuto
     soundGunshot:
       path: /Audio/Weapons/Guns/Gunshots/rpgfire.ogg
   - type: ProjectileBatteryAmmoProvider
     proto: BulletWeakRocket
-    fireCost: 50
+    fireCost: 80
   - type: Appearance
   - type: AmmoCounter
 
@@ -370,20 +370,20 @@
     sprite: Objects/Specific/Mech/mecha_equipment.rsi
     state: mecha_missilerack_six
   - type: Gun
-    fireRate: 0.4
+    fireRate: 0.20
     selectedMode: SemiAuto
     availableModes:
       - SemiAuto
     soundGunshot:
       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