Merge branch 'refs/heads/master' into flesh_cult

space-sunrise · Dec 31, 2024 · 1cd0df3 · 1cd0df3
2 parents 784703d + e5a856d
commit 1cd0df3
Show file tree

Hide file tree

Showing 44 changed files with 417 additions and 75 deletions.
diff --git a/Resources/Changelog/ChangelogSunrise.yml b/Resources/Changelog/ChangelogSunrise.yml
@@ -9206,3 +9206,41 @@
     type: Fix
   id: 643
   time: '2024-12-31T07:30:44.322953+00:00'
+- author: KaiserMaus
+  changes:
+  - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D \u0431\u0430\u0442\u0430\
+      \u0440\u0435\u0439\u043D\u044B\u0439 \u043B\u0430\u0437\u0435\u0440 \u0418\u041A\
+      -30."
+    type: Add
+  - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D \u0431\u0430\u0442\u0430\
+      \u0440\u0435\u0439\u043D\u044B\u0439 \u043B\u0430\u0437\u0435\u0440 LNT-620."
+    type: Add
+  - message: "\u0418\u041A-60 \u0442\u0435\u043F\u0435\u0440\u044C \u0438\u0441\u043F\
+      \u043E\u043B\u044C\u0437\u0443\u0435\u0442 \u0431\u0430\u0442\u0430\u0440\u0435\
+      \u0439\u043A\u0438."
+    type: Tweak
+  - message: "\u0426\u0435\u043D\u044B \u043D\u0430 \u044F\u0449\u0438\u043A Mp5,\
+      \ M16\u04101 \u0438 \u0410\u041A\u041C\u0421 \u0431\u044B\u043B\u0438 \u0441\
+      \u043D\u0438\u0436\u0435\u043D\u044B."
+    type: Tweak
+  - message: "\u0426\u0435\u043D\u044B \u043D\u0430 \u0418\u043C\u043F\u0443\u043B\
+      \u044C\u0441\u043D\u043E\u0435 \u0432\u043E\u043E\u0440\u0443\u0436\u0435\u043D\
+      \u0438\u0435 \u0432 \u0410\u043F\u043B\u0438\u043D\u043A\u0435 \u041E\u0411\u0420\
+      \ \u0431\u044B\u043B\u0438 \u043F\u043E\u0432\u044B\u0448\u0435\u043D\u044B."
+    type: Tweak
+  id: 644
+  time: '2024-12-31T17:43:40.0000000+00:00'
+  url: https://github.com/space-sunrise/space-station-14/pull/987
+- author: KaiserMaus
+  changes:
+  - message: "\u041E\u0411\u0420 \u0438 \u042D\u0441\u043A\u0430\u0434\u0440\u043E\
+      \u043D \u0442\u0435\u043F\u0435\u0440\u044C \u0442\u043E\u043B\u044C\u043A\u043E\
+      \ \u041B\u044E\u0434\u0438."
+    type: Tweak
+  - message: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u044B \u0430\u0432\
+      \u0430\u0440\u0438\u0439\u043D\u044B\u0435 \u043D\u0430\u0431\u043E\u0440\u044B\
+      \ \u0434\u043B\u044F \u041E\u0411\u0420."
+    type: Fix
+  id: 645
+  time: '2024-12-31T17:51:58.0000000+00:00'
+  url: https://github.com/space-sunrise/space-station-14/pull/989
diff --git a/Resources/Locale/en-US/_prototypes/_sunrise/catalog/fills/crates/armory.ftl b/Resources/Locale/en-US/_prototypes/_sunrise/catalog/fills/crates/armory.ftl
@@ -4,6 +4,8 @@ ent-CrateArmoryAKMS = AKMS crate
     .desc = Contains two AKMS assault rifle with four mags. Requires Armory access to open.
 ent-CrateArmoryMP5 = MP5 crate
     .desc = Contains two MP5 submachine gun with four mags. Requires Armory access to open.
+ent-CrateArmoryIK30 = IK-30 crate
+    .desc = Contains three IK-30 semi laser battery gun. Requires Armory access to open.
 ent-CrateArmoryMagazineBoxLightRifleBig = MagazineBoxLightRifleBig crate
     .desc = Contains two MagazineBoxLightRifleBig. Requires Armory access to open.
 ent-CrateArmoryMagazineBoxRifleBig = MagazineBoxRifleBig crate

diff --git a/.../Locale/en-US/_prototypes/_sunrise/entities/objects/weapons/guns/battery/battery_guns.ftl b/.../Locale/en-US/_prototypes/_sunrise/entities/objects/weapons/guns/battery/battery_guns.ftl
@@ -7,7 +7,9 @@ ent-WeaponEnergyGunMini = miniature energy gun
 ent-WeaponEnergyGunPistol = PDW-9 Energy Pistol
     .desc = A military grade sidearm, used by many militia forces throughout the local sector.
 ent-WeaponGunLaserCarbineAutomatic = IK-60 laser carbine
-    .desc = A 20 round semi-automatic laser carbine.
+    .desc = A semi-automatic battery laser burst carbine.
+ent-WeaponGunLaserCarbineSemi = IK-30 laser carbine
+    .desc = A semi-automatic battery laser carbine.
 ent-WeaponEnergyGunPistolSecurity = Energy Pistol «Judge»
     .desc = A Security grade sidearm, used by many security forces throughout the local sector. Prepare to Judgement.
 ent-WeaponEnergyGunTactical = Tactical Energy Gun
@@ -35,3 +37,5 @@ ent-WeaponSyndieLaserPistol = SAM-300
     .desc = The Syndicate's laser pistol, developed from the NT Captain's pistol.
 ent-WeaponLaserMinigun = UVL-21 «Vivern»
     .desc = A heavy weapon of mass destruction based on the minigun.
+ent-WeaponLaserLNT620 = LNT620 «Spark»
+    .desc = { ent-BaseWeaponBattery.desc }
diff --git a/Resources/Locale/ru-RU/_prototypes/_sunrise/catalog/fills/crates/armory.ftl b/Resources/Locale/ru-RU/_prototypes/_sunrise/catalog/fills/crates/armory.ftl
@@ -4,6 +4,8 @@ ent-CrateArmoryAKMS = ящик AKMS
     .desc = Содержит две штурмовые винтовки AKMS и четыре магазина. Чтобы открыть необходим доступ уровня Оружейной.
 ent-CrateArmoryMP5 = ящик MP5
     .desc = Содержит два пистолета-пулемёта MP5 и четыре магазина. Чтобы открыть необходим доступ уровня Оружейной.
+ent-CrateArmoryIK30 = ящик ИК-30
+    .desc = Содержит три батарейных лазера ИК-30. Чтобы открыть необходим доступ уровня Оружейной.
 ent-CrateArmoryMagazineBoxLightRifleBig = ящик патронов .30 винтовочные
     .desc = Содержит три ящика патрон калибра .30, в сумме 600 патрон. Чтобы открыть необходим доступ уровня Оружейной.
 ent-CrateArmoryMagazineBoxRifleBig = ящик патронов .20 винтовочные

diff --git a/.../Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/battery/battery_guns.ftl b/.../Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/battery/battery_guns.ftl
@@ -7,7 +7,9 @@ ent-WeaponEnergyGunMini = миниатюрная энергетическая п
 ent-WeaponEnergyGunPistol = энергетический пистолет PDW-9
     .desc = Военное оружие, используемое многими ополченцами в местном секторе.
 ent-WeaponGunLaserCarbineAutomatic = лазерный карабин ИК-60
-    .desc = Лазерный полуавтоматический карабин на 20 патронов.
+    .desc = Лазерный карабин ведущий огонь очередями и используемый батарейки как источник питания.
+ent-WeaponGunLaserCarbineSemi = лазерный карабин ИК-30
+    .desc = Лазерный полуавтоматический карабин используемый батарейки как источник питания.
 ent-WeaponEnergyGunPistolSecurity = энергетический пистолет «Судья»
     .desc = Энерго пистолет Службы Безопасности, используемое многими правоохранительными ораганами в местном секторе. Тебя ждет Суд!.
 ent-WeaponEnergyGunTactical = тактическая энергетическая пушка
@@ -34,3 +36,5 @@ ent-WeaponLaserMinigun = UVL-21 «Виверна»
     .desc = Тяжёлое оружие массового поражения разработанное на основе минигана.
 ent-WeaponSyndieLaserGun = S-13 «Чёрная мамба»
     .desc = Модернизированный «Лектер», переделаный под плазменый энергомодуль.
+ent-WeaponLaserLNT620 = LNT620 «Искра»
+    .desc = Автоматический батарейный лазер NanoTrasen LNT620 "Искра"
diff --git a/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml b/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml
@@ -42,6 +42,10 @@
   - Reptilian
   - Vulpkanin
   - Swine
+  - Tajaran
+  - Demon
+  - SlimePerson
+  - Dwarf
   parent: EventHumanoidMindShielded
   randomizeName: false
   components:
@@ -88,6 +92,10 @@
   - Reptilian
   - Vulpkanin
   - Swine
+  - Tajaran
+  - Demon
+  - SlimePerson
+  - Dwarf
   parent: EventHumanoidMindShielded
   randomizeName: false
   components:
@@ -129,6 +137,10 @@
   - Reptilian
   - Vulpkanin
   - Swine
+  - Tajaran
+  - Demon
+  - SlimePerson
+  - Dwarf
   parent: ERTLeader
   components:
     - type: GhostRole
@@ -161,6 +173,10 @@
   - Reptilian
   - Vulpkanin
   - Swine
+  - Tajaran
+  - Demon
+  - SlimePerson
+  - Dwarf
   parent: ERTLeaderEVA
   components:
     - type: GhostRole
@@ -203,6 +219,10 @@
   - Reptilian
   - Vulpkanin
   - Swine
+  - Tajaran
+  - Demon
+  - SlimePerson
+  - Dwarf
   parent: ERTLeader
   components:
     - type: BibleUser
@@ -244,6 +264,10 @@
   - Reptilian
   - Vulpkanin
   - Swine
+  - Tajaran
+  - Demon
+  - SlimePerson
+  - Dwarf
   parent: ERTChaplain
   components:
     - type: GhostRole
@@ -287,6 +311,10 @@
   - Reptilian
   - Vulpkanin
   - Swine
+  - Tajaran
+  - Demon
+  - SlimePerson
+  - Dwarf
   parent: ERTLeader
   components:
     - type: GhostRole
@@ -327,6 +355,10 @@
   - Reptilian
   - Vulpkanin
   - Swine
+  - Tajaran
+  - Demon
+  - SlimePerson
+  - Dwarf
   parent: ERTJanitor
   components:
     - type: GhostRole
@@ -369,6 +401,10 @@
   - Reptilian
   - Vulpkanin
   - Swine
+  - Tajaran
+  - Demon
+  - SlimePerson
+  - Dwarf
   parent: ERTLeader
   components:
     - type: GhostRole
@@ -409,6 +445,10 @@
   - Reptilian
   - Vulpkanin
   - Swine
+  - Tajaran
+  - Demon
+  - SlimePerson
+  - Dwarf
   parent: ERTEngineer
   components:
     - type: GhostRole
@@ -451,6 +491,10 @@
   - Reptilian
   - Vulpkanin
   - Swine
+  - Tajaran
+  - Demon
+  - SlimePerson
+  - Dwarf
   parent: ERTLeader
   components:
     - type: GhostRole
@@ -491,6 +535,10 @@
   - Reptilian
   - Vulpkanin
   - Swine
+  - Tajaran
+  - Demon
+  - SlimePerson
+  - Dwarf
   parent: ERTSecurity
   components:
     - type: GhostRole
@@ -523,6 +571,10 @@
   - Reptilian
   - Vulpkanin
   - Swine
+  - Tajaran
+  - Demon
+  - SlimePerson
+  - Dwarf
   parent: ERTSecurityEVA
   components:
     - type: GhostRole
@@ -565,6 +617,10 @@
   - Reptilian
   - Vulpkanin
   - Swine
+  - Tajaran
+  - Demon
+  - SlimePerson
+  - Dwarf
   parent: ERTLeader
   components:
     - type: GhostRole
@@ -605,6 +661,10 @@
   - Reptilian
   - Vulpkanin
   - Swine
+  - Tajaran
+  - Demon
+  - SlimePerson
+  - Dwarf
   parent: ERTMedical
   components:
     - type: GhostRole
@@ -642,6 +702,10 @@
   - Reptilian
   - Vulpkanin
   - Swine
+  - Tajaran
+  - Demon
+  - SlimePerson
+  - Dwarf
   parent: EventHumanoidMindShielded
   components:
     - type: Loadout

diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -387,6 +387,8 @@
       - MagazineBoxMagnumRubber
       - MagazineBoxRifleRubber
       - MagazineBoxLightRifleRubber
+      - WeaponGunLaserCarbineSemi
+      - WeaponGunLaserCarbineAutomatic # Sunrise - IK-60 Laser Carbine
       # Sunrise-End
       - BoxBeanbag
       - BoxShotgunIncendiary
@@ -901,6 +903,7 @@
       - TimerTrigger
       - Truncheon
       - VoiceTrigger
+      - WeaponGunLaserCarbineSemi
       - WeaponAdvancedLaser
       - WeaponDisabler
       - WeaponDisablerSMG

diff --git a/Resources/Prototypes/Recipes/Lathes/security.yml b/Resources/Prototypes/Recipes/Lathes/security.yml
@@ -96,6 +96,15 @@
     Steel: 2000
     Gold: 200 #sunrise-Edit
 
+- type: latheRecipe
+  parent: BaseWeaponRecipeLong
+  id: WeaponGunLaserCarbineSemi
+  result: WeaponGunLaserCarbineSemi
+  materials:
+    Steel: 1800
+    Plastic: 50
+    Gold: 300 #sunrise-Edit
+
 - type: latheRecipe
   parent: BaseWeaponRecipeLong
   id: WeaponXrayCannon

diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml
@@ -169,6 +169,7 @@
   cost: 8000
   recipeUnlocks:
   - WeaponLaserSvalinn
+  - WeaponGunLaserCarbineSemi #Sunrise-Edit
 
 - type: technology
   id: WaveParticleHarnessing