Шприцемёты! (#1035)

* Syringe Gun * Fix Linter? * Now fix?
space-sunrise · Jan 6, 2025 · 4e556b6 · 4e556b6
1 parent 353c002
commit 4e556b6
Show file tree

Hide file tree

Showing 26 changed files with 375 additions and 4 deletions.
diff --git a/Resources/Locale/en-US/_prototypes/_sunrise/catalog/fills/boxes/nanotrasen.ftl b/Resources/Locale/en-US/_prototypes/_sunrise/catalog/fills/boxes/nanotrasen.ftl
@@ -13,4 +13,6 @@ ent-BoxSmokeGrenade = SmokeGrenade Box
 ent-BoxTearGasGrenade = TearGasGrenade box
     .desc = 'WARNING: These devices are extremely dangerous and can cause blindness or deafness in repeated use.'
 ent-BoxClusterBangFull = ClusterBang box
-    .desc = 'WARNING: These devices are extremely dangerous and can cause blindness or deafness in repeated use.'
+    .desc = 'WARNING: These devices are extremely dangerous and can cause blindness or deafness in repeated use.'
+ent-BoxMiniSyringe = Mini Syringe box
+    .desc = A Mini Syringe-Filled Box.
diff --git a/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/weapons/guns/syringe_guns.ftl b/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/weapons/guns/syringe_guns.ftl
@@ -0,0 +1,15 @@
+ent-LauncherSyringeMed = syringe gun
+    .suffix = Standart
+    .desc = Load full of poisoned syringes for optimal fun.
+
+ent-LauncherSyringePistol = syringe pistol
+    .suffix = Compact
+    .desc = { ent-LauncherSyringeMed.desc }
+
+ent-LauncherSyringePistolFilled = syringe pistol
+    .suffix = Compact, Filled 
+    .desc = { ent-LauncherSyringeMed.desc }
+
+ent-LauncherSyringeRapid = Auto syringe gun
+    .suffix = Auto
+    .desc = { ent-LauncherSyringeMed.desc }
diff --git a/Resources/Locale/en-US/_strings/_sunrise/research/technologies.ftl b/Resources/Locale/en-US/_strings/_sunrise/research/technologies.ftl
@@ -2,6 +2,8 @@ research-discipline-biochemical = Biochemical
 
 research-technology-basic-surgery = Basic surgery
 research-technology-basic-cyberlimbs = Basic cyberlimbs
+research-technology-basic-syringegun = Basic Syringegun
+research-technology-compact-syringegun = Compact Syringegun
 research-technology-advanced-surgery = Advanced surgery
 
 research-technology-handcraft-nvd = Кустарные ПНВ

diff --git a/Resources/Locale/en-US/_strings/_sunrise/store/uplink-catalog.ftl b/Resources/Locale/en-US/_strings/_sunrise/store/uplink-catalog.ftl
@@ -64,5 +64,11 @@ uplink-hypo-name = Горлекс гипоспрей
 uplink-hypo-desc = Химический гипоспрей, произвёденный синдикатом, способный мгновенно впрыснуть до 20 ед. реагентов. Изначально пуст.
 uplink-polytrinic-acid-chemistry-bottle-name = Политриновая кислота
 uplink-polytrinic-acid-chemistry-bottle-desc = Чрезвычайно едкое химическое вещество. Сильно обжигает всех, кто вступит с ней в непосредственный контакт.
+uplink-syringe-pistol-filled-name = Компактный шприцемёт
+uplink-syringe-pistol-filled-desc = Сразу заполнен тремя шприцами. В шприцах: токсин немоты,карпотоктин и фризиум.
+uplink-syringe-box-filled-name = коробка мини шприцов
+uplink-syringe-box-filled-desc = Полная коробка мини шприцов.
+uplink-syringe-rapid-name = Автоматический шприцемёт
+uplink-syringe-rapid-desc = Принимает до 8ми шприцов. изначально пуст. Сделайте из Офицера СБ Ёжика!.
 uplink-clothing-glasses-nvg-name = NVG Sun Glasses
 uplink-clothing-glasses-nvg-desc = Quality made sunglasses, manufactured by Gorlax Security. Uses modular parts to improve visibility in low light conditions. Warning: The glasses will not protect your eyes from direct flashes.
diff --git a/Resources/Locale/ru-RU/_prototypes/_sunrise/catalog/fills/boxes/nanotrasen.ftl b/Resources/Locale/ru-RU/_prototypes/_sunrise/catalog/fills/boxes/nanotrasen.ftl
@@ -13,4 +13,6 @@ ent-BoxSmokeGrenade = Коробка дымовых гранат
 ent-BoxTearGasGrenade = Коробка слезоточивых гранат
     .desc = ВНИМАНИЕ: Эти устройства крайне опасны и могут вызвать слепоту при многократном использовании.
 ent-BoxClusterBangFull = Коробка кластерных светошумовых гранат
-    .desc = ВНИМАНИЕ: Эти устройства крайне опасны и могут вызвать слепоту или глухоту при многократном использовании.
+    .desc = ВНИМАНИЕ: Эти устройства крайне опасны и могут вызвать слепоту или глухоту при многократном использовании.
+ent-BoxMiniSyringe = Коробка мини-шприцов
+    .desc = Полная коробка мини-шприцов. Если не полная то кто-то уже забрал.
diff --git a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/syringe_guns.ftl b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/syringe_guns.ftl
@@ -0,0 +1,15 @@
+ent-LauncherSyringeMed = шприцемёт
+    .suffix = Стандартный
+    .desc = Зарядите отравленными шприцами, чтобы получить максимальное удовольствие.
+
+ent-LauncherSyringePistol = Компактный шприцемёт
+    .suffix = Компактный
+    .desc = Зарядите отравленными шприцами, чтобы получить максимальное удовольствие. теперь в смешном размере.
+
+ent-LauncherSyringePistolFilled = Компактный шприцемёт
+    .suffix = Компактный, Заполнен
+    .desc = { ent-LauncherSyringePistol.desc }
+
+ent-LauncherSyringeRapid =  Авто-прицемёт
+    .suffix = Автоматический
+    .desc = Зарядите в пациента до 8-ми шприцов с Ипекаком, чтобы получить максимальное удовольствие.
diff --git a/Resources/Locale/ru-RU/_strings/_sunrise/research/technologies.ftl b/Resources/Locale/ru-RU/_strings/_sunrise/research/technologies.ftl
@@ -1,6 +1,8 @@
 research-discipline-biochemical = Биохимия
 research-technology-basic-surgery = Базовая хирургия
 research-technology-basic-cyberlimbs = Базовые кибер-конечности
+research-technology-basic-syringegun = Базовые шприцемёты
+research-technology-compact-syringegun = Компактные шприцемёты
 research-technology-advanced-surgery = Продвинутая хирургия
 research-technology-handcraft-nvd = Кустарные ПНВ
 research-technology-basic-nvd = Продвинутое ПНВ

diff --git a/Resources/Locale/ru-RU/_strings/_sunrise/store/uplink-catalog.ftl b/Resources/Locale/ru-RU/_strings/_sunrise/store/uplink-catalog.ftl
@@ -77,6 +77,12 @@ uplink-hypo-name = Горлекс гипоспрей
 uplink-hypo-desc = Химический гипоспрей, произвёденный синдикатом, способный мгновенно впрыснуть до 20 ед. реагентов. Изначально пуст.
 uplink-polytrinic-acid-chemistry-bottle-name = Политриновая кислота
 uplink-polytrinic-acid-chemistry-bottle-desc = Чрезвычайно едкое химическое вещество. Сильно обжигает всех, кто вступит с ней в непосредственный контакт.
+uplink-syringe-pistol-filled-name = Компактный шприцемёт
+uplink-syringe-pistol-filled-desc = Сразу заполнен тремя шприцами. В шприцах: токсин немоты,карпотоктин и фризиум.
+uplink-syringe-box-filled-name = коробка мини шприцов
+uplink-syringe-box-filled-desc = Полная коробка мини шприцов.
+uplink-syringe-rapid-name = Автоматический шприцемёт
+uplink-syringe-rapid-desc =  Изначально пуст. Принимает до 8-ми шприцов. Сделайте из Офицера СБ Ёжика!
 
 ## Mechs equipment
 

diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
@@ -229,6 +229,12 @@
     #Sunrise-start
     - id: ClothingEyesUniversalMedicalHud
     - id: AdvancedDefibrillator
+    - id: LauncherSyringeMed
+      prob: 0.6
+    - id: BoxMiniSyringe
+      prob: 0.8
+    - id: BoxMiniSyringe
+      prob: 0.20
     #Sunrise-end
     - id: MedicalTechFabCircuitboard
     - id: MedkitFilled

diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml b/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml
@@ -110,6 +110,14 @@
   components:
   - type: StorageFill
     contents:
+      #Sunrise-start
+      - id: LauncherSyringeMed
+        prob: 0.25
+      - id: BoxMiniSyringe
+        prob: 0.15
+      - id: BoxMiniSyringe
+        prob: 0.4
+      #Sunrise-end
       - id: BoxSyringe
       - id: BoxBeaker
       - id: BoxBeaker

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/pneumatic_cannon.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/pneumatic_cannon.yml
@@ -13,12 +13,14 @@
       visible: false
   - type: Item
     size: Huge
+    shape:  #Sunrise-Edit
+    - 0,0,4,4 #5X5 #Sunrise-Edit
   - type: Clothing
     quickEquip: false
     slots:
     - Back
   - type: Gun
-    fireRate: 2
+    fireRate: 1.5 #Sunrise-Edit
     selectedMode: SemiAuto
     availableModes:
     - SemiAuto

diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -1097,6 +1097,9 @@
       - SawAdvanced
       - Hemostat
       - HemostatAdvanced
+      - LauncherSyringeMed #Sunrise-Edit
+      - LauncherSyringePistol #Sunrise-Edit
+      - MiniSyringe #Sunrise-Edit
       - LeftArmCyber
       - RightArmCyber
       - LeftHandCyber

diff --git a/Resources/Prototypes/_Sunrise/Catalog/Fills/Boxes/nanotrasen.yml b/Resources/Prototypes/_Sunrise/Catalog/Fills/Boxes/nanotrasen.yml
@@ -120,4 +120,22 @@
   - type: Sprite
     layers:
       - state: box_security
-      - state: flashbang
+      - state: flashbang
+
+- type: entity
+  name: Mini-Syringe box
+  parent: BoxCardboard
+  id: BoxMiniSyringe
+  description: A box full of MiniSyringe.
+  components:
+  - type: Storage
+    grid:
+    - 0,0,2,1
+  - type: StorageFill
+    contents:
+      - id: MiniSyringe
+        amount: 6
+  - type: Sprite
+    layers:
+      - state: box
+      - state: syringe
diff --git a/Resources/Prototypes/_Sunrise/Catalog/uplink_catalog.yml b/Resources/Prototypes/_Sunrise/Catalog/uplink_catalog.yml
@@ -813,6 +813,45 @@
   categories:
   - UplinkChemicals
 
+- type: listing
+  id: UplinkLauncherSyringePistolFilled
+  name: uplink-syringe-pistol-filled-name
+  description: uplink-syringe-pistol-filled-desc
+  productEntity: LauncherSyringePistolFilled
+  discountCategory: usualDiscounts
+  discountDownTo:
+    Telecrystal: 6
+  cost:
+    Telecrystal: 12
+  categories:
+  - UplinkChemicals
+
+- type: listing
+  id: UplinkBoxMiniSyringe
+  name: uplink-syringe-box-filled-name
+  description: uplink-syringe-box-filled-desc
+  productEntity: BoxMiniSyringe
+  discountCategory: veryRareDiscounts
+  discountDownTo:
+    Telecrystal: 2
+  cost:
+    Telecrystal: 4
+  categories:
+  - UplinkChemicals
+
+- type: listing
+  id: UplinkLauncherSyringeRapid
+  name: uplink-syringe-rapid-name
+  description: uplink-syringe-rapid-desc
+  productEntity: LauncherSyringeRapid
+  discountCategory: usualDiscounts
+  discountDownTo:
+    Telecrystal: 8
+  cost:
+    Telecrystal: 16
+  categories:
+  - UplinkChemicals
+
 - type: listing
   id: UplinkExplosiveCollarsKit
   name: uplink-exp-collars-kit-name

diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Medical/chemistry.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Medical/chemistry.yml
@@ -0,0 +1,51 @@
+- type: entity
+  parent: MiniSyringe
+  id: PrefilledMiniSyringe
+  components:
+  - type: Injector
+    toggleState: Inject
+
+- type: entity
+  suffix: MuteToxin, MiniSyringe
+  parent: PrefilledMiniSyringe
+  id: MiniSyringeMuteToxin
+  components:
+  - type: Label
+    currentLabel: reagent-name-mute-toxin
+  - type: SolutionContainerManager
+    solutions:
+      injector:
+        maxVol: 15
+        reagents:
+        - ReagentId: MuteToxin
+          Quantity: 15
+
+- type: entity
+  suffix: Fresium, MiniSyringe
+  parent: PrefilledMiniSyringe
+  id: MiniSyringeFresium
+  components:
+  - type: Label
+    currentLabel: reagent-name-fresium
+  - type: SolutionContainerManager
+    solutions:
+      injector:
+        maxVol: 15
+        reagents:
+        - ReagentId: Fresium
+          Quantity: 15
+
+- type: entity
+  suffix: CarpoToxin, MiniSyringe
+  parent: PrefilledMiniSyringe
+  id: MiniSyringeCarpoToxin
+  components:
+  - type: Label
+    currentLabel: reagent-name-carpotoxin
+  - type: SolutionContainerManager
+    solutions:
+      injector:
+        maxVol: 15
+        reagents:
+        - ReagentId: CarpoToxin
+          Quantity: 15
diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Launchers/syringe_guns.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Launchers/syringe_guns.yml
@@ -0,0 +1,95 @@
+- type: entity
+  name: syringe gun
+  parent: [LauncherSyringe]
+  id: LauncherSyringeMed
+  suffix: Standart
+  components:
+  - type: Sprite
+    sprite: Objects/Weapons/Guns/Cannons/syringe_gun.rsi
+    layers:
+    - state: syringe_gun
+  - type: Storage
+    maxItemSize: Small
+    grid:
+    - 0,0,2,0
+  - type: Gun
+    fireRate: 0.8
+  - type: Item
+    size: Normal
+    shape:
+    - 0,0,2,1
+    - 0,0,2,1
+
+- type: entity
+  name: syringe pistol
+  parent: [LauncherSyringe]
+  id: LauncherSyringePistol
+  suffix: Compact
+  components:
+  - type: Sprite
+    sprite: _Sunrise/Objects/Weapons/Guns/Launchers/syringe_pistol.rsi
+    layers:
+    - state: syringe_gun
+  - type: Storage
+    maxItemSize: Small
+    grid:
+    - 0,0,2,0
+  - type: Gun
+    fireRate: 0.8
+  - type: Item
+    size: Small
+    shape:
+    - 0,0,1,0
+    - 0,1,0,1
+
+- type: entity
+  name: syringe pistol
+  parent: [LauncherSyringe]
+  id: LauncherSyringePistolFilled
+  suffix: Compact, Filled
+  components:
+  - type: Sprite
+    sprite: _Sunrise/Objects/Weapons/Guns/Launchers/syringe_pistol.rsi
+    layers:
+    - state: syringe_gun
+  - type: Storage
+    maxItemSize: Small
+    grid:
+    - 0,0,2,0
+  - type: StorageFill
+    contents:
+    - id: MiniSyringeCarpoToxin
+    - id: MiniSyringeMuteToxin
+    - id: MiniSyringeFresium
+  - type: Gun
+    fireRate: 0.8
+  - type: Item
+    size: Small
+    shape:
+    - 0,0,1,0
+    - 0,1,0,1
+
+- type: entity
+  name: Rapid syringe gun
+  parent: [LauncherSyringe]
+  id: LauncherSyringeRapid
+  suffix: Auto
+  components:
+  - type: Sprite
+    sprite: _Sunrise/Objects/Weapons/Guns/Launchers/syringe_rapidgun.rsi
+    layers:
+    - state: syringe_gun
+  - type: Storage
+    maxItemSize: Small
+    grid:
+    - 0,0,3,1
+  - type: Gun
+    fireRate: 1.8
+    selectedMode: FullAuto
+    availableModes:
+    - FullAuto
+  - type: Item
+    size: Small
+    shape:
+    - 0,0,2,1
+    - 0,0,2,1