Syringe Gun Tweaks

space-sunrise · Jan 9, 2025 · 9e13fa4 · 9e13fa4
1 parent 403ff01
commit 9e13fa4
Show file tree

Hide file tree

Showing 26 changed files with 345 additions and 32 deletions.
diff --git a/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/specific/chemistry.ftl b/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/specific/chemistry.ftl
@@ -0,0 +1,4 @@
+ent-MiniSyringeBluespace = mini bluespace syringe
+    .desc = A regular syringe, reshaped to fit inside of a gun.
+ent-MiniSyringeCryostasis = mini cryostasis syringe
+    .desc = A regular syringe, reshaped to fit inside of a gun.
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
@@ -13,3 +13,11 @@ ent-LauncherSyringePistolFilled = syringe pistol
 ent-LauncherSyringeRapid = Auto syringe gun
     .suffix = Auto
     .desc = { ent-LauncherSyringeMed.desc }
+
+ent-LauncherSyringeRapidFilled = Auto syringe gun
+    .suffix = Auto, Filled
+    .desc = { ent-LauncherSyringeMed.desc }
+
+ent-LauncherSyringeSMG = syringe SMG
+    .suffix = Admeme
+    .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
@@ -4,6 +4,9 @@ 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-rapid-syringegun = Rapid Syringegun
+research-technology-cryostasis-ammo = Cryostasis Syringegun Ammo
+research-technology-bluespace-ammo = Bluespace Syringegun Ammo
 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
@@ -69,6 +69,6 @@ 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-syringe-rapid-desc = Заполнен пустыми 10-ти шприцами. Сделайте из Офицера СБ Ёжика!.
 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/entities/objects/specific/chemistry.ftl b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/specific/chemistry.ftl
@@ -0,0 +1,4 @@
+ent-MiniSyringeBluespace = мини блюспейс шприц
+    .desc = блюспейс шприц, переделанный под пистолет.
+ent-MiniSyringeCryostasis = мини криостазис шприц
+    .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
@@ -10,6 +10,14 @@ ent-LauncherSyringePistolFilled = Компактный шприцемёт
     .suffix = Компактный, Заполнен
     .desc = { ent-LauncherSyringePistol.desc }
 
-ent-LauncherSyringeRapid =  Авто-прицемёт
+ent-LauncherSyringeRapid =  Авто-шприцемёт
     .suffix = Автоматический
-    .desc = Зарядите в пациента до 8-ми шприцов с Ипекаком, чтобы получить максимальное удовольствие.
+    .desc = Зарядите в пациента до 10-ми шприцов с Ипекаком, чтобы получить максимальное удовольствие.
+
+ent-LauncherSyringeRapidFilled =  Авто-шприцемёт
+    .suffix = Автоматический, Заполнен
+    .desc = Зарядите в пациента до 10-ми шприцов с Ипекаком, чтобы получить максимальное удовольствие.
+
+ent-LauncherSyringeSMG =  Шприцемёт ПП
+    .suffix = Адмеме
+    .desc = Зарядите в членов экипажа до 20-ми шприцов с соком WEH, чтобы получить максимальное удовольствие.
diff --git a/Resources/Locale/ru-RU/_strings/_sunrise/research/technologies.ftl b/Resources/Locale/ru-RU/_strings/_sunrise/research/technologies.ftl
@@ -3,6 +3,9 @@ research-technology-basic-surgery = Базовая хирургия
 research-technology-basic-cyberlimbs = Базовые кибер-конечности
 research-technology-basic-syringegun = Базовые шприцемёты
 research-technology-compact-syringegun = Компактные шприцемёты
+research-technology-rapid-syringegun = Автоматические шприцемёты
+research-technology-cryostasis-ammo = Криостазис мини-шприцы
+research-technology-bluespace-ammo = Блюспейс мини-шприцы
 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
@@ -82,7 +82,7 @@ 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-syringe-rapid-desc =  Изначально пуст. Принимает до 10-ми шприцов. Сделайте из Офицера СБ Ёжика!
 
 ## Mechs equipment
 

diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml b/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml
@@ -112,11 +112,11 @@
     contents:
       #Sunrise-start
       - id: LauncherSyringeMed
-        prob: 0.25
+        prob: 0.3
       - id: BoxMiniSyringe
-        prob: 0.15
+        prob: 0.2
       - id: BoxMiniSyringe
-        prob: 0.4
+        prob: 0.7
       #Sunrise-end
       - id: BoxSyringe
       - id: BoxBeaker

diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
@@ -241,7 +241,7 @@
   - type: SolutionContainerManager
     solutions:
       beaker:
-        maxVol: 60
+        maxVol: 40 #Sunrise-Edit
         canReact: false
 
 - type: entity

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/pneumatic_cannon.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/pneumatic_cannon.yml
@@ -125,7 +125,7 @@
       - SyringeGunAmmo
   - type: Gun
     fireRate: 1
-    selectedMode: SemiAuto
+    selectedMode: FullAuto #Sunrise-Edit
     availableModes:
     - SemiAuto
     - FullAuto

diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -1099,6 +1099,9 @@
       - HemostatAdvanced
       - LauncherSyringeMed #Sunrise-Edit
       - LauncherSyringePistol #Sunrise-Edit
+      - LauncherSyringeRapid #Sunrise-Edit
+      - MiniSyringeCryostasis #Sunrise-Edit
+      - MiniSyringeBluespace #Sunrise-Edit
       - MiniSyringe #Sunrise-Edit
       - LeftArmCyber
       - RightArmCyber

diff --git a/Resources/Prototypes/_Sunrise/Catalog/Fills/Boxes/nanotrasen.yml b/Resources/Prototypes/_Sunrise/Catalog/Fills/Boxes/nanotrasen.yml
@@ -130,11 +130,11 @@
   components:
   - type: Storage
     grid:
-    - 0,0,2,1
+    - 0,0,2,2
   - type: StorageFill
     contents:
       - id: MiniSyringe
-        amount: 6
+        amount: 9
   - type: Sprite
     layers:
       - state: box

diff --git a/Resources/Prototypes/_Sunrise/Catalog/sponsor_uplink_catalog.yml b/Resources/Prototypes/_Sunrise/Catalog/sponsor_uplink_catalog.yml
@@ -2487,20 +2487,20 @@
 
 # Medical
 
-- type: listing
-  id: UplinkSunriseCryostasisBeaker
-  name: uplink-sunrise-cryostasis-beaker-name
-  productEntity: CryostasisBeaker
-  cost:
-    Suntick: 15
-  categories:
-  - MedicalThings
-  conditions:
-  - !type:ListingLimitedStockCondition
-    stock: 1
-  - !type:BuyerDepartmentCondition
-    whitelist:
-    - Medical
+#- type: listing
+#  id: UplinkSunriseCryostasisBeaker
+#  name: uplink-sunrise-cryostasis-beaker-name
+#  productEntity: CryostasisBeaker
+#  cost:
+#    Suntick: 15
+#  categories:
+#  - MedicalThings
+#  conditions:
+#  - !type:ListingLimitedStockCondition
+#    stock: 1
+#  - !type:BuyerDepartmentCondition
+#    whitelist:
+#    - Medical
 
 #- type: listing
 #  id: UplinkSunriseMedicatedSuture

diff --git a/Resources/Prototypes/_Sunrise/Catalog/uplink_catalog.yml b/Resources/Prototypes/_Sunrise/Catalog/uplink_catalog.yml
@@ -855,7 +855,7 @@
   discountDownTo:
     Telecrystal: 6
   cost:
-    Telecrystal: 12
+    Telecrystal: 10
   categories:
   - UplinkChemicals
 
@@ -876,12 +876,12 @@
   id: UplinkLauncherSyringeRapid
   name: uplink-syringe-rapid-name
   description: uplink-syringe-rapid-desc
-  productEntity: LauncherSyringeRapid
+  productEntity: LauncherSyringeRapidFilled
   discountCategory: usualDiscounts
   discountDownTo:
     Telecrystal: 8
   cost:
-    Telecrystal: 16
+    Telecrystal: 14
   categories:
   - UplinkChemicals
 

diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Medical/chemistry.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Medical/chemistry.yml
@@ -1,5 +1,137 @@
 - type: entity
+  name: cryostasis mini syringe
+  suffix: Cryostasis, MiniSyringe
   parent: MiniSyringe
+  description: A cryostasis syringe, reshaped to fit inside of a gun.
+  id: MiniSyringeCryostasis
+  components:
+  - type: Sprite
+    sprite: Objects/Specific/Chemistry/syringe.rsi
+    layers:
+      - state: minisyringe1
+        map: ["enum.SolutionContainerLayers.Fill"]
+        visible: false
+      - state: syringestasisproj
+  - type: SolutionContainerVisuals
+    maxFillLevels: 3
+    fillBaseName: minisyringe
+    inHandsMaxFillLevels: 3
+    inHandsFillBaseName: -fill-
+  - type: EmbeddableProjectile
+    offset: "-0.1,0"
+    minimumSpeed: 3
+    removalTime: 0.25
+    embedOnThrow: false
+  - type: SolutionInjectWhileEmbedded
+    transferAmount: 1
+    solution: injector
+    updateInterval: 2
+  - type: SolutionInjectOnEmbed
+    transferAmount: 1
+    solution: injector
+  - type: SolutionContainerManager
+    solutions:
+      injector:
+        maxVol: 8
+        canReact: false
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape: !type:PhysShapeCircle
+          radius: 0.2
+        density: 5
+        mask:
+        - ItemMask
+        restitution: 0.3
+        friction: 0.2
+      projectile:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.1,-0.3,0.1,0.3"
+        hard: false
+        mask:
+        - Impassable
+        - BulletImpassable
+  - type: Projectile
+    deleteOnCollide: false
+    onlyCollideWhenShot: true
+    damage:
+      types:
+        Piercing: 3
+  - type: Tag
+    tags:
+    - Syringe
+    - Trash
+    - SyringeGunAmmo
+
+- type: entity
+  name: bluespace mini syringe
+  suffix: Bluespace, MiniSyringe
+  parent: MiniSyringe
+  description: A Bluespace syringe, reshaped to fit inside of a gun.
+  id: MiniSyringeBluespace
+  components:
+  - type: Sprite
+    sprite: Objects/Specific/Chemistry/syringe.rsi
+    layers:
+      - state: minisyringe1
+        map: ["enum.SolutionContainerLayers.Fill"]
+        visible: false
+      - state: syringeblueproj
+  - type: SolutionContainerVisuals
+    maxFillLevels: 3
+    fillBaseName: syringeblueproj
+    inHandsMaxFillLevels: 3
+    inHandsFillBaseName: -fill-
+  - type: EmbeddableProjectile
+    offset: "-0.1,0"
+    minimumSpeed: 3
+    removalTime: 0.25
+    embedOnThrow: false
+  - type: SolutionInjectWhileEmbedded
+    transferAmount: 1
+    solution: injector
+    updateInterval: 2
+  - type: SolutionInjectOnEmbed
+    transferAmount: 2
+    solution: injector
+  - type: SolutionContainerManager
+    solutions:
+      injector:
+        maxVol: 45
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape: !type:PhysShapeCircle
+          radius: 0.2
+        density: 5
+        mask:
+        - ItemMask
+        restitution: 0.3
+        friction: 0.2
+      projectile:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.1,-0.3,0.1,0.3"
+        hard: false
+        mask:
+        - Impassable
+        - BulletImpassable
+  - type: Projectile
+    deleteOnCollide: false
+    onlyCollideWhenShot: true
+    damage:
+      types:
+        Piercing: 3
+  - type: Tag
+    tags:
+    - Syringe
+    - Trash
+    - SyringeGunAmmo
+
+- type: entity
+  parent: MiniSyringe
+  categories: [ HideSpawnMenu ]
   id: PrefilledMiniSyringe
   components:
   - type: Injector

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
@@ -82,12 +82,56 @@
   - type: Storage
     maxItemSize: Small
     grid:
-    - 0,0,3,1
+    - 0,0,4,1
   - type: Gun
     fireRate: 1.8
     selectedMode: FullAuto
     availableModes:
     - FullAuto
+  - type: Item
+    size: Small
+    shape:
+    - 0,0,2,1
+    - 0,0,2,1
+
+- type: entity
+  name: Rapid syringe gun
+  parent: [LauncherSyringeRapid]
+  id: LauncherSyringeRapidFilled
+  suffix: Auto, Filled
+  components:
+  - type: Storage
+    maxItemSize: Small
+    grid:
+    - 0,0,4,1 #10
+  - type: StorageFill
+    contents:
+    - id: MiniSyringe
+      amount: 10
+
+- type: entity
+  name: Syringe SMG
+  parent: [LauncherSyringe]
+  id: LauncherSyringeSMG
+  suffix: Admeme
+  components:
+  - type: Sprite
+    sprite: _Sunrise/Objects/Weapons/Guns/Launchers/syringe_rapidgun.rsi
+    layers:
+    - state: syringe_gun
+  - type: Storage
+    maxItemSize: Small
+    grid:
+    - 0,0,5,2 #18
+  - type: StorageFill
+    contents:
+    - id: MiniSyringe
+      amount: 18
+  - type: Gun
+    fireRate: 2.5
+    selectedMode: FullAuto
+    availableModes:
+    - FullAuto
   - type: Item
     size: Small
     shape: