фиксы апстрима

space-sunrise · Feb 9, 2025 · 7abc8ef · 7abc8ef
1 parent 3355feb
commit 7abc8ef
Show file tree

Hide file tree

Showing 49 changed files with 525 additions and 473 deletions.
diff --git a/Content.Server/_Sunrise/TapePlayer/TapePlayerSystem.cs b/Content.Server/_Sunrise/TapePlayer/TapePlayerSystem.cs
@@ -85,7 +85,7 @@ private void OnTapePlayerPlay(EntityUid uid, TapePlayerComponent component, ref
                 return;
             }
 
-            var volume = SharedAudioSystem.GainToVolume(component.Volume) - component.DecreaseVolume;
+            var volume = SharedAudioSystem.GainToVolume(component.Volume);
 
             var audioParams = AudioParams.Default
                 .WithVolume(volume)
@@ -123,7 +123,7 @@ private void OnTapePlayerSetTime(EntityUid uid, TapePlayerComponent component, T
     private void OnTapePlayerSetVolume(EntityUid uid, TapePlayerComponent component, TapePlayerSetVolumeMessage args)
     {
         component.Volume = args.Volume;
-        var volume = SharedAudioSystem.GainToVolume(component.Volume) - component.DecreaseVolume;
+        var volume = SharedAudioSystem.GainToVolume(component.Volume);
         Audio.SetVolume(component.AudioStream, volume);
         Dirty(uid, component);
     }

diff --git a/Content.Shared/_Sunrise/TapePlayer/TapePlayerComponent.cs b/Content.Shared/_Sunrise/TapePlayer/TapePlayerComponent.cs
@@ -24,10 +24,6 @@ public sealed partial class TapePlayerComponent : Component
     [ViewVariables]
     public float Volume = 0.5f;
 
-    [DataField]
-    [ViewVariables]
-    public float DecreaseVolume = 0f;
-
     [DataField]
     [ViewVariables(VVAccess.ReadWrite)]
     public float RolloffFactor = 1f;

diff --git a/Resources/Changelog/ChangelogSunrise.yml b/Resources/Changelog/ChangelogSunrise.yml
@@ -11943,3 +11943,34 @@
     type: Tweak
   id: 822
   time: '2025-02-09T18:42:47.316577+00:00'
+- author: VigersRay
+  changes:
+  - message: "\u0421\u043A\u043E\u0440\u043E\u0445\u043E\u0434\u044B \u0432\u043E\u0437\
+      \u0432\u0440\u0430\u0449\u0435\u043D\u044B \u0432 \u0442\u0435\u0445\u043D\u043E\
+      \u043B\u043E\u0433\u0438\u0438 \u0420\u041D\u0414."
+    type: Add
+  - message: "\u0410\u043D\u0430\u043B\u0438\u0437\u0430\u0442\u043E\u0440 \u043A\u0438\
+      \u0431\u043E\u0440\u0433\u043E\u0432 \u0438 \u043D\u0430\u043D\u043E\u043F\u0430\
+      \u0441\u0442\u0443 \u0442\u0435\u043F\u0435\u0440\u044C \u043D\u0443\u0436\u043D\
+      \u043E \u0438\u0437\u0443\u0447\u0430\u0442\u044C."
+    type: Tweak
+  - message: "\u0423\u0434\u0430\u043B\u0435\u043D\u0430 \u0431\u043E\u0435\u0432\u0430\
+      \u044F \u0431\u0430\u0442\u0430\u0440\u0435\u0439\u043A\u0430 \u0438 \u044F\u0447\
+      \u0435\u0439\u043A\u0430 \u0438\u0437 \u0442\u0435\u0445\u043D\u043E\u043B\u043E\
+      \u0433\u0438\u0439 \u0420\u041D\u0414."
+    type: Remove
+  id: 823
+  time: '2025-02-09T20:33:59.816641+00:00'
+- author: VigersRay
+  changes:
+  - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u043E 143 \u043D\u043E\
+      \u0432\u044B\u0445 \u043A\u0430\u0441\u0441\u0435\u0442\u044B \u043E\u0442\u043E\
+      \u0431\u0440\u0430\u043D\u044B\u0445 \u0441\u043E\u043E\u0431\u0449\u0435\u0441\
+      \u0442\u0432\u043E\u043C."
+    type: Add
+  - message: "\u0413\u0440\u043E\u043C\u043A\u043E\u0441\u0442\u044C \u0432\u0441\u0435\
+      \u0445 \u043A\u0430\u0441\u0441\u0435\u0442 \u0431\u044B\u043B\u0430 \u0443\u0441\
+      \u0440\u0435\u0434\u043D\u0435\u043D\u0430."
+    type: Tweak
+  id: 824
+  time: '2025-02-09T20:34:47.904779+00:00'
diff --git a/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/power/powercells.ftl b/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/power/powercells.ftl
@@ -4,9 +4,3 @@ ent-PowerCellSyndicate = syndicate power cell
 ent-PowerCellNanoTrasen = ERT power cell
     .desc = A rechargeable standardized power cell. This one looks like a rare and powerful NanoTrasen combat variant.
     .suffix = Full
-ent-PowerCellCombat = combat power cell
-    .desc = A rechargeable standardized power cell. This one looks like a rare combat variant.
-    .suffix = Full
-ent-PowerCellCombatPrinted = { ent-PowerCellCombat }
-    .suffix = Empty
-    .desc = { ent-PowerCellCombat.desc }
diff --git a/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/weapons/guns/smgs/smgs.ftl b/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/weapons/guns/smgs/smgs.ftl
@@ -1,9 +1,6 @@
 ent-WeaponSubMachineGunDrozdRubber = Drozd
     .suffix = Non-Lethal
     .desc = { ent-WeaponSubMachineGunDrozd.desc }
-ent-WeaponSubMachineGunVectorRubber = Vector
-    .desc = An excellent fully automatic Heavy SMG. Uses .45 magnum ammo.
-    .suffix = Non-Lethal
 ent-WeaponSubMachineGunP90 = P-90
     .desc = { ent-BaseWeaponSubMachineGun.desc }
 ent-WeaponSubMachineGunMP38 = MP-38

diff --git a/Resources/Locale/en-US/_prototypes/entities/objects/power/powercells.ftl b/Resources/Locale/en-US/_prototypes/entities/objects/power/powercells.ftl
@@ -51,8 +51,6 @@ ent-PowerCageMediumEmpty = { ent-PowerCageMedium }
 ent-PowerCageHighEmpty = { ent-PowerCageHigh }
     .suffix = Empty
     .desc = { ent-PowerCageHigh.desc }
-ent-PowerCageCombat = Combat power cage
-    .desc = A rechargeable power cage for big devices. Increased capacity for increased power levels.
 ent-PowerCageSyndicate = syndicate power cage
     .desc = A rechargeable power cage for big devices. Increased capacity for increased power levels.
 ent-PowerCageERT = NanoTrasen combat power cage

diff --git a/Resources/Locale/en-US/_prototypes/entities/objects/weapons/guns/smgs/smgs.ftl b/Resources/Locale/en-US/_prototypes/entities/objects/weapons/guns/smgs/smgs.ftl
@@ -6,8 +6,5 @@ ent-WeaponSubMachineGunC20r = C-20r submachine gun
     .desc = A firearm that is often used by the infamous nuclear operatives. Uses .35 auto ammo.
 ent-WeaponSubMachineGunDrozd = Drozd
     .desc = An excellent fully automatic Heavy SMG.
-ent-WeaponSubMachineGunVector = Vector
-    .desc = An excellent fully automatic Heavy SMG. Uses .45 magnum ammo.
-    .suffix = Deprecated use Drozd
 ent-WeaponSubMachineGunWt550 = WT550
     .desc = An excellent SMG, produced by NanoTrasen's Small Arms Division. Uses .35 auto ammo.
diff --git a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/power/powercells.ftl b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/power/powercells.ftl
@@ -1,21 +1,12 @@
-ent-PowerCellCombat = военная батарея гипер ёмкости
-    .desc = Стандартизированный перезаряжаемый элемент питания. накопитель гипер ёмкости военного типа, имеет встроенную ЭМИ защиту.
-    .suffix = Полный
-ent-PowerCellCombatPrinted = { ent-PowerCellCombat }
-    .suffix = Пустой
-    .desc = { ent-PowerCellCombat.desc }
 ent-PowerCellNanoTrasen = батарея гипер ёмкости NanoTrasen
-    .desc = { ent-PowerCellCombat.desc }
+    .desc = Стандартизированный перезаряжаемый элемент питания. накопитель гипер ёмкости военного типа, имеет встроенную ЭМИ защиту.
     .suffix = Полный
 ent-PowerCellSyndicate = батарея гипер ёмкости Syndicate
-    .desc = { ent-PowerCellCombat.desc }
-    .suffix = Полный
-ent-PowerCageCombat = военная энергоячейка гипер ёмкости
-    .desc = Перезаряжаемая энергетическая ячейка для больших устройств. Увеличенная ёмкость для увеличенного уровня мощности. Встроенная ЭМИ защита.
+    .desc = { ent-PowerCellNanoTrasen.desc }
     .suffix = Полный
 ent-PowerCageERT = энергоячейка гипер ёмкости NanoTrasen
-    .desc = { ent-PowerCageCombat.desc }
+    .desc = { ent-PowerCellNanoTrasen.desc }
     .suffix = Полный
 ent-PowerCageSyndicate = энергоячейка гипер ёмкости Syndicate
-    .desc = { ent-PowerCageCombat.desc }
+    .desc = { ent-PowerCellNanoTrasen.desc }
     .suffix = Полный
diff --git a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/smgs/smgs.ftl b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/smgs/smgs.ftl
@@ -1,9 +1,6 @@
 ent-WeaponSubMachineGunDrozdRubber = Дрозд
     .desc = Превосходный, тяжёлый пистолет-пулемёт. Использует патроны калибра .35 авто.
     .suffix = ПП, Не летальный
-ent-WeaponSubMachineGunVectorRubber = Вектор
-    .desc = Превосходный тяжёлый пистолет-пулемёт. Использует патроны калибра .45 магнум.
-    .suffix = Неактуален, Не летальный , используйте Дрозд
 ent-WeaponSubMachineGunP90 = P-90
     .desc = P-90 - это SMG стандартного выпуска EarthGov. Он известен своими компактными размерами и простотой использования в полевых условиях. Использует патрон калибра .35 авто.
 ent-WeaponSubMachineGunMP38 = MP-38

diff --git a/Resources/Locale/ru-RU/_prototypes/entities/objects/weapons/guns/smgs/smgs.ftl b/Resources/Locale/ru-RU/_prototypes/entities/objects/weapons/guns/smgs/smgs.ftl
@@ -8,12 +8,9 @@ ent-WeaponSubMachineGunC20r = C-20r
     .suffix = Пистолет-пулемёт
 ent-WeaponSubMachineGunDrozd = Дрозд
     .desc = Превосходный, полностью автоматический, тяжёлый пистолет-пулемёт. Использует патроны калибра .35 авто.
-ent-WeaponSubMachineGunVector = Вектор
-    .desc = Превосходный тяжёлый пистолет-пулемёт. Использует патроны калибра .45 магнум.
-    .suffix = Неактуален, используйте Дрозд
 ent-WeaponSubMachineGunWt550 = WT550
     .desc = Отличный пистолет-пулемёт, производства NanoTrasen's Small Arms Division. Использует патроны калибра .35 авто.
     .suffix = Пистолет-пулемёт
 
 ent-UplinkSubMachineGunUzi = Узи
-    .desc = Старая и любимая тарахтелка с далёких улиц Терра Групп. Использует 35 калибр, при стрельбе высокая скорострельность и низкая отдача может сломать палец.
+    .desc = Старая и любимая тарахтелка с далёких улиц Терра Групп. Использует 35 калибр, при стрельбе высокая скорострельность и низкая отдача может сломать палец.
diff --git a/Resources/Maps/_Sunrise/Ruins/abandoned_lab.yml b/Resources/Maps/_Sunrise/Ruins/abandoned_lab.yml
@@ -6650,20 +6650,6 @@ entities:
     - type: Transform
       pos: -10.5,1.5
       parent: 1
-- proto: CloningConsoleComputerCircuitboard
-  entities:
-  - uid: 1119
-    components:
-    - type: Transform
-      pos: -5.119751,6.456787
-      parent: 1
-- proto: CloningPodMachineCircuitboard
-  entities:
-  - uid: 1120
-    components:
-    - type: Transform
-      pos: -10.891235,-0.43518066
-      parent: 1
 - proto: ClosetL3ScienceFilled
   entities:
   - uid: 1121

diff --git a/Resources/Maps/_Sunrise/Station/dev_map.yml b/Resources/Maps/_Sunrise/Station/dev_map.yml
@@ -10372,13 +10372,6 @@ entities:
     - type: Transform
       pos: 2.327287,1.5347754
       parent: 179
-- proto: WeaponSubMachineGunVector
-  entities:
-  - uid: 1635
-    components:
-    - type: Transform
-      pos: 1.752212,1.6857839
-      parent: 179
 - proto: WeaponSubMachineGunWt550
   entities:
   - uid: 1627

diff --git a/Resources/Maps/_Sunrise/Station/kettle.yml b/Resources/Maps/_Sunrise/Station/kettle.yml
@@ -62063,30 +62063,6 @@ entities:
     - pos: 1.5,40.5
       parent: 82
       type: Transform
-- proto: CloningConsoleComputerCircuitboard
-  entities:
-  - uid: 19831
-    components:
-    - pos: 13.328903,39.689034
-      parent: 82
-      type: Transform
-  - uid: 20233
-    components:
-    - pos: -51.4738,-34.38727
-      parent: 82
-      type: Transform
-- proto: CloningPodMachineCircuitboard
-  entities:
-  - uid: 20169
-    components:
-    - pos: -43.342804,-37.443317
-      parent: 82
-      type: Transform
-  - uid: 21747
-    components:
-    - pos: 13.719528,39.657784
-      parent: 82
-      type: Transform
 - proto: ClosetBase
   entities:
   - uid: 3020

diff --git a/Resources/Maps/_Sunrise/Station/oasis.yml b/Resources/Maps/_Sunrise/Station/oasis.yml
@@ -54230,20 +54230,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 25.5,-4.5
       parent: 2
-- proto: CloningConsoleComputerCircuitboard
-  entities:
-  - uid: 3781
-    components:
-    - type: Transform
-      pos: -47.44629,-20.715351
-      parent: 2
-- proto: CloningPodMachineCircuitboard
-  entities:
-  - uid: 3897
-    components:
-    - type: Transform
-      pos: -47.461914,-20.262226
-      parent: 2
 - proto: ClosetBombFilled
   entities:
   - uid: 4310

diff --git a/Resources/Maps/_Sunrise/Station/tortuga.yml b/Resources/Maps/_Sunrise/Station/tortuga.yml
@@ -56818,19 +56818,6 @@ entities:
     - pos: -76.40576,-14.192599
       parent: 33
       type: Transform
-- proto: CloningConsoleComputerCircuitboard
-  entities:
-  - uid: 5436
-    components:
-    - pos: -95.51823,26.770828
-      parent: 33
-      type: Transform
-  - uid: 8604
-    components:
-    - rot: 3.141592653589793 rad
-      pos: 39.390984,18.32292
-      parent: 33
-      type: Transform
 - proto: ClosetBase
   entities:
   - uid: 6875

diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/misc.yml b/Resources/Prototypes/Entities/Clothing/Shoes/misc.yml
@@ -85,42 +85,42 @@
     sprite: Clothing/Shoes/Misc/snakeskin.rsi
   - type: NoSlip
 
-#- type: entity
-#  parent: [ClothingShoesBase, PowerCellSlotSmallItem, BaseToggleClothing]
-#  id: ClothingShoesBootsSpeed
-#  name: speed boots
-#  description: High-tech boots woven with quantum fibers, able to convert electricity into pure speed!
-#  components:
-#  - type: Sprite
-#    sprite: Clothing/Shoes/Boots/speedboots.rsi
-#    layers:
-#    - state: icon
-#      map: [ "enum.ToggleVisuals.Layer" ]
-#  - type: Clothing
-#    sprite: Clothing/Shoes/Boots/speedboots.rsi
-#  - type: ToggleClothing
-#    action: ActionToggleSpeedBoots
-#  - type: ClothingSpeedModifier
-#    walkModifier: 1.5
-#    sprintModifier: 1.5
-#  - type: Appearance
-#  - type: GenericVisualizer
-#    visuals:
-#      enum.ToggleVisuals.Toggled:
-#        enum.ToggleVisuals.Layer:
-#          True: {state: icon-on}
-#          False: {state: icon}
-#  - type: StaticPrice
-#    price: 500
-#  - type: PowerCellDraw
-#    drawRate: 4
-#  - type: ToggleCellDraw
-#  - type: ItemSlots
-#    slots:
-#      cell_slot:
-#        name: power-cell-slot-component-slot-name-default
-#  - type: Tag
-#    tags: []
+- type: entity
+  parent: [ClothingShoesBase, PowerCellSlotSmallItem, BaseToggleClothing]
+  id: ClothingShoesBootsSpeed
+  name: speed boots
+  description: High-tech boots woven with quantum fibers, able to convert electricity into pure speed!
+  components:
+  - type: Sprite
+    sprite: Clothing/Shoes/Boots/speedboots.rsi
+    layers:
+    - state: icon
+      map: [ "enum.ToggleVisuals.Layer" ]
+  - type: Clothing
+    sprite: Clothing/Shoes/Boots/speedboots.rsi
+  - type: ToggleClothing
+    action: ActionToggleSpeedBoots
+  - type: ClothingSpeedModifier
+    walkModifier: 1.25
+    sprintModifier: 1.25
+  - type: Appearance
+  - type: GenericVisualizer
+    visuals:
+      enum.ToggleVisuals.Toggled:
+        enum.ToggleVisuals.Layer:
+          True: {state: icon-on}
+          False: {state: icon}
+  - type: StaticPrice
+    price: 500
+  - type: PowerCellDraw
+    drawRate: 40
+  - type: ToggleCellDraw
+  - type: ItemSlots
+    slots:
+      cell_slot:
+        name: power-cell-slot-component-slot-name-default
+  - type: Tag
+    tags: []
 
 - type: entity
   id: ActionToggleSpeedBoots

diff --git a/Resources/Prototypes/Entities/Objects/Power/powercells.yml b/Resources/Prototypes/Entities/Objects/Power/powercells.yml
@@ -392,25 +392,6 @@
   - 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

diff --git a/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml b/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml
@@ -475,7 +475,7 @@
   - type: ContainerFill
     containers:
       mech-battery-slot:
-      - PowerCageCombat
+      - PowerCageHigh
 
 # H.O.N.K.
 - type: entity
@@ -751,7 +751,7 @@
   - type: ContainerFill
     containers:
       mech-battery-slot:
-      - PowerCageCombat
+      - PowerCageHigh
 
 # Durand
 - type: entity
@@ -821,7 +821,7 @@
   - type: ContainerFill
     containers:
       mech-battery-slot:
-      - PowerCageCombat
+      - PowerCageHigh
 
 # Phazon