FractWar апдате (SerbiaStrong-220#851)

* ebent3 * ebent02 * Update meta.json * Update jobs_ERT.yml * Update other_Items_ERT.yml * Update other_Items_IronSquad.yml * Update jobs_IronSquad.yml * Update other_Items_sssp.yml * Update new_Items_sssp.yml * Update meta.json * Update other_Items.yml * Update other_Items.yml * Add files via upload * Update other_Items.yml * Update other_Items.yml * Update other_Items.yml
Kirus59 · Mar 31, 2024 · af1b807 · af1b807
1 parent 6f505e5
commit af1b807
Show file tree

Hide file tree

Showing 62 changed files with 248,377 additions and 242,853 deletions.
diff --git a/Resources/Maps/EventMaps/NTvsSSSP.yml b/Resources/Maps/EventMaps/NTvsSSSP.yml
diff --git a/Resources/Prototypes/SS220/Shitspawn/Ebent/ert/hardsuit_helmets_ERT.yml b/Resources/Prototypes/SS220/Shitspawn/Ebent/ert/hardsuit_helmets_ERT.yml
@@ -18,6 +18,7 @@
   - type: PressureProtection
     highPressureMultiplier: 0.08
     lowPressureMultiplier: 1000
+  - type: BreathMask
   - type: TemperatureProtection
     coefficient: 0.005
   - type: Armor
@@ -49,6 +50,7 @@
   - type: PressureProtection
     highPressureMultiplier: 0.08
     lowPressureMultiplier: 1000
+  - type: BreathMask
   - type: TemperatureProtection
     coefficient: 0.005
   - type: Armor
@@ -80,6 +82,7 @@
   - type: PressureProtection
     highPressureMultiplier: 0.08
     lowPressureMultiplier: 1000
+  - type: BreathMask
   - type: TemperatureProtection
     coefficient: 0.005
   - type: Armor
@@ -111,6 +114,7 @@
   - type: PressureProtection
     highPressureMultiplier: 0.08
     lowPressureMultiplier: 1000
+  - type: BreathMask
   - type: TemperatureProtection
     coefficient: 0.005
   - type: Armor
@@ -142,6 +146,7 @@
   - type: PressureProtection
     highPressureMultiplier: 0.08
     lowPressureMultiplier: 1000
+  - type: BreathMask
   - type: TemperatureProtection
     coefficient: 0.005
   - type: Armor
@@ -173,6 +178,7 @@
   - type: PressureProtection
     highPressureMultiplier: 0.08
     lowPressureMultiplier: 1000
+  - type: BreathMask
   - type: TemperatureProtection
     coefficient: 0.005
   - type: Armor
@@ -204,6 +210,7 @@
   - type: PressureProtection
     highPressureMultiplier: 0.08
     lowPressureMultiplier: 1000
+  - type: BreathMask
   - type: TemperatureProtection
     coefficient: 0.005
   - type: Armor

diff --git a/Resources/Prototypes/SS220/Shitspawn/Ebent/ert/jobs_ERT.yml b/Resources/Prototypes/SS220/Shitspawn/Ebent/ert/jobs_ERT.yml
@@ -77,6 +77,7 @@
     - id: ClothingBackpackERTMedical
     - id: ClothingUniformJumpsuitColorBlack
     - id: ClothingNeckMantleERTLeader
+    - id: ClothingEyesHudMedSec
 
 - type: entity
   parent: LockerEngineer
@@ -121,14 +122,15 @@
     - id: Hypospray
     - id: EmergencyRollerBedSpawnFolded
       amount: 2
+    - id: ClothingEyesHudMedSec
 
 #Leader
 - type: startingGear
   id: EbentSpecOpsLeaderGear
   equipment:
     jumpsuit: ClothingUniformJumpsuitERTLeader
     back: ClothingBackpackSpecOpsFilled
-    shoes: ClothingShoesBootsMagAdv
+    shoes: ClothingShoesBootsMagBlinding
     mask: ClothingMaskGasERT
     eyes: ClothingEyesGlassesSecurity
     gloves: ClothingHandsGlovesCombat
@@ -138,7 +140,7 @@
     id: SpecOpsPDALeader
     ears: ClothingHeadsetAltCentCom
     belt: ClothingBeltWebbingSpecOpsFilled
-    pocket1: WeaponRevolverDeckard
+    pocket1: WeaponRevolverDeckardAP
     pocket2: EnergySaberNT
 
 - type: entity
@@ -182,7 +184,7 @@
   equipment:
     jumpsuit: ClothingUniformJumpsuitERTEngineer
     back: ClothingBackpackSpecOpsFilled
-    shoes: ClothingShoesBootsMagAdv
+    shoes: ClothingShoesBootsMagBlinding
     mask: ClothingMaskGasERT
     eyes: ClothingEyesGlassesSecurity
     gloves: ClothingHandsGlovesCombat
@@ -191,7 +193,7 @@
     id: SpecOpsPDAEngineer
     ears: ClothingHeadsetAltCentCom
     belt: ClothingBeltWebbingSpecOpsFilled
-    pocket1: WeaponRevolverDeckard
+    pocket1: WeaponRevolverDeckardAP
     pocket2: EnergySaberNT
 
 - type: entity
@@ -235,7 +237,7 @@
   equipment:
     jumpsuit: ClothingUniformJumpsuitERTMedic
     back: ClothingBackpackSpecOpsFilled
-    shoes: ClothingShoesBootsMagAdv
+    shoes: ClothingShoesBootsMagBlinding
     mask: ClothingMaskGasERT
     eyes: ClothingEyesGlassesSecurity
     gloves: ClothingHandsGlovesNitrile
@@ -244,7 +246,7 @@
     id: SpecOpsPDACorpsman
     ears: ClothingHeadsetAltCentCom
     belt: ClothingBeltWebbingSpecOpsFilled
-    pocket1: WeaponRevolverDeckard
+    pocket1: WeaponRevolverDeckardAP
     pocket2: EnergySaberNT
 
 - type: entity
@@ -292,7 +294,7 @@
   equipment:
     jumpsuit: ClothingUniformJumpsuitERTMedic
     back: ClothingBackpackSpecOpsFilled
-    shoes: ClothingShoesBootsMagAdv
+    shoes: ClothingShoesBootsMagBlinding
     mask: ClothingMaskGasERT
     eyes: ClothingEyesHudMedical
     gloves: ClothingHandsGlovesNitrile
@@ -301,7 +303,7 @@
     id: SpecOpsPDACMO
     ears: ClothingHeadsetAltCentCom
     belt: ClothingBeltWebbingSpecOpsFilled
-    pocket1: WeaponRevolverDeckard
+    pocket1: WeaponRevolverDeckardAP
     pocket2: EnergySaberNT
 
 - type: entity
@@ -345,7 +347,7 @@
   equipment:
     jumpsuit: ClothingUniformJumpsuitERTSecurity
     back: ClothingBackpackSpecOpsFilled
-    shoes: ClothingShoesBootsMagAdv
+    shoes: ClothingShoesBootsMagBlinding
     mask: ClothingMaskGasERT
     eyes: ClothingEyesHudMedical
     gloves: ClothingHandsGlovesCombat
@@ -354,7 +356,7 @@
     id: SpecOpsPDAFigher
     ears: ClothingHeadsetAltCentCom
     belt: ClothingBeltWebbingSpecOpsFilled
-    pocket1: WeaponRevolverDeckard
+    pocket1: WeaponRevolverDeckardAP
     pocket2: EnergySaberNT
 
 - type: entity
@@ -394,4 +396,4 @@
   accessGroups: [ AllAccess ]
 
 - type: playTimeTracker
-  id: SpecOpsFighter
+  id: SpecOpsFighter
diff --git a/Resources/Prototypes/SS220/Shitspawn/Ebent/ert/new_Items_ERT.yml b/Resources/Prototypes/SS220/Shitspawn/Ebent/ert/new_Items_ERT.yml
@@ -35,4 +35,62 @@
       types:
         Blunt: 4.5
   - type: Item
-    sprite: SS220/Objects/Weapons/Melee/e_saber.rsi
+    sprite: SS220/Objects/Weapons/Melee/e_saber.rsi
+
+- type: entity
+  name: ручной лазерный пулемёт- G&V
+  parent: BaseWeaponBattery
+  id: WeaponErt_machinegun
+  suffix: Shitspawn, Ebent, FractWar
+  description: Кажется, кто-то просто снял легкий лазерный пулемет производства G&V с истребителя москитного флота, приварив к нему ручку для удобства. Определённо взрывоопасен.
+  components:
+  - type: Sprite
+    sprite: SS220/Objects/Weapons/Guns/ert_minigun.rsi
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-unshaded-4
+      map: ["enum.GunVisualLayers.MagUnshaded"]
+      shader: unshaded
+  - type: Clothing
+    sprite: SS220/Objects/Weapons/Guns/ert_minigun.rsi
+    quickEquip: false
+    slots:
+    - Back
+  - type: Wieldable
+  - type: GunWieldBonus
+    minAngle: -20
+    maxAngle: -20
+  - type: Gun
+    selectedMode: FullAuto
+    availableModes:
+      - SemiAuto
+      - FullAuto
+    minAngle: 20
+    maxAngle: 37
+    angleIncrease: 4
+    angleDecay: 16
+    fireRate: 8
+    soundGunshot:
+      path: /Audio/Weapons/Guns/Gunshots/laser_cannon.ogg
+  - type: HitscanBatteryAmmoProvider
+    proto: PulseEbent
+    fireCost: 24
+  - type: Battery
+    maxCharge: 2400
+    startingCharge: 2400
+
+- type: hitscan
+  id: PulseEbent
+  damage:
+    types:
+      Heat: 19
+  muzzleFlash:
+    sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi
+    state: muzzle_beam_heavy
+  travelFlash:
+    sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi
+    state: beam_heavy
+  impactFlash:
+    sprite: SS220/Objects/Weapons/Guns/Projectiles/projectiles.rsi
+    state: impact_beam_heavymagic
diff --git a/Resources/Prototypes/SS220/Shitspawn/Ebent/ert/other_Items_ERT.yml b/Resources/Prototypes/SS220/Shitspawn/Ebent/ert/other_Items_ERT.yml
@@ -9,13 +9,25 @@
   components:
   - type: StorageFill
     contents:
-    - id: SpeedLoaderMagnum
-      amount: 2
     - id: MagazinePistolSubMachineGun
       amount: 2
     - id: CombatMedipen
     - id: DnaScramblerImplanter
 
+- type: entity
+  name: Декард
+  parent: WeaponRevolverDeckard
+  id: WeaponRevolverDeckardAP
+  noSpawn: true
+  description: Редкий, изготавливаемый на заказ револьвер. Используйте, когда нет времени на тест Войта-Кампфа. Использует патроны калибра .45 магнум.
+  components:
+  - type: RevolverAmmoProvider
+    whitelist:
+      tags:
+        - CartridgeMagnum
+        - SpeedLoaderMagnum
+    proto: CartridgeMagnumAP
+
 - type: entity
   parent: ClothingBackpackERTSecurity
   id: ClothingBackpackSpecOpsFilled
@@ -141,4 +153,4 @@
   noSpawn: true
   components:
   - type: Pda
-    id: IDCardSpecOpsFighter
+    id: IDCardSpecOpsFighter
diff --git a/Resources/Prototypes/SS220/Shitspawn/Ebent/iron/hardsuit_helmets_IronSquad.yml b/Resources/Prototypes/SS220/Shitspawn/Ebent/iron/hardsuit_helmets_IronSquad.yml
@@ -18,6 +18,7 @@
   - type: PressureProtection
     highPressureMultiplier: 0.08
     lowPressureMultiplier: 1000
+  - type: BreathMask
   - type: TemperatureProtection
     coefficient: 0.005
   - type: Armor
@@ -49,6 +50,7 @@
   - type: PressureProtection
     highPressureMultiplier: 0.08
     lowPressureMultiplier: 1000
+  - type: BreathMask
   - type: TemperatureProtection
     coefficient: 0.005
   - type: Armor
@@ -80,6 +82,7 @@
   - type: PressureProtection
     highPressureMultiplier: 0.08
     lowPressureMultiplier: 1000
+  - type: BreathMask
   - type: TemperatureProtection
     coefficient: 0.005
   - type: Armor
@@ -111,6 +114,7 @@
   - type: PressureProtection
     highPressureMultiplier: 0.08
     lowPressureMultiplier: 1000
+  - type: BreathMask
   - type: TemperatureProtection
     coefficient: 0.005
   - type: Armor
@@ -142,6 +146,7 @@
   - type: PressureProtection
     highPressureMultiplier: 0.08
     lowPressureMultiplier: 1000
+  - type: BreathMask
   - type: TemperatureProtection
     coefficient: 0.005
   - type: Armor
@@ -173,6 +178,7 @@
   - type: PressureProtection
     highPressureMultiplier: 0.08
     lowPressureMultiplier: 1000
+  - type: BreathMask
   - type: TemperatureProtection
     coefficient: 0.005
   - type: Armor
@@ -204,6 +210,7 @@
   - type: PressureProtection
     highPressureMultiplier: 0.08
     lowPressureMultiplier: 1000
+  - type: BreathMask
   - type: TemperatureProtection
     coefficient: 0.005
   - type: Armor