Workbench-Team · AruMoon · Aug 3, 2023 · Aug 1, 2023 · Aug 2, 2023 · Aug 3, 2023
diff --git a/Resources/Locale/en-US/research/technologies.ftl b/Resources/Locale/en-US/research/technologies.ftl
@@ -30,6 +30,7 @@ research-technology-bluespace-chemistry = Bluespace Chemistry
 research-technology-cloning = Cloning
 
 research-technology-salvage-weapons = Salvage Weapons
+research-technology-salvage-cutters = Ion weapons
 research-technology-draconic-munitions = Draconic Munitions
 research-technology-explosive-technology = Explosive Technology
 research-technology-advanced-laser-manipulation = Advanced Laser Manipulation

diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/crates/salvage.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/crates/salvage.ftl
@@ -13,3 +13,6 @@ ent-CratePartsT3T4 = tier 3/4 parts crate
 ent-CratePartsT4 = tier 4 parts crate
     .desc = Contains 5 random tier 4 parts for upgrading machines.
     .suffix = { "" }
+ent-CrateAdvSalvageEquipment = advanced salvage equipment crate
+    .desc = Contains one advanced set of miner's tools.
+    .suffix = Filled
diff --git a/Resources/Locale/ru-RU/research/technologies.ftl b/Resources/Locale/ru-RU/research/technologies.ftl
@@ -5,6 +5,7 @@ research-discipline-arsenal = Оружейная
 research-discipline-experimental = Экспериментальная
 research-discipline-civilian-services = Сервисная
 research-technology-salvage-weapons = Оружия утилизаторов
+research-technology-salvage-cutters = Ионная экипировка
 research-technology-salvage-equipment = Экипировка для утилизаторов
 research-technology-advanced-powercells = Продвинутые батареи
 research-technology-compact-power = Компактное энергопитание

diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/crates/salvage.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/crates/salvage.ftl
@@ -13,9 +13,6 @@ ent-CratePartsT3T4 = ящик деталей 3/4 уровня
 ent-CratePartsT4 = ящик деталей 4 уровня
     .desc = Содержит 5 случайных деталей 4 уровня для улучшения оборудования.
     .suffix = { "" }
-ent-CrateMinerEquipment = ящик шахтерских инструментов
-    .desc = Содержит набор инструментов для двух шахтеров
-    .suffix = Заполненный
-ent-CrateMinerAdvancedEquipment = ящик продвинутых шахтерских инструментов
-    .desc = Содержит набор продвинутых инструментов для двух шахтеров
+ent-CrateAdvSalvageEquipment = ящик продвинутых шахтерских инструментов
+    .desc = Содержит в себе один продвинутый набор шахтёрских инструментов.
     .suffix = Заполненный
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_cargo.yml b/Resources/Prototypes/Catalog/Cargo/cargo_cargo.yml
@@ -7,24 +7,3 @@
   cost: 250
   category: Cargo
   group: market
-
-- type: cargoProduct
-  id: CargoCrateMinerEquipment
-  icon:
-    sprite: Objects/Weapons/Guns/Battery/cutter.rsi
-    state: icon
-  product: CrateMinerEquipment
-  cost: 7500
-  category: Cargo
-  group: market
-
-- type: cargoProduct
-  id: CargoCrateMinerAdvancedEquipment
-  icon:
-    sprite: Objects/Weapons/Guns/Battery/cutteradv.rsi
-    state: icon
-  product: CrateMinerAdvancedEquipment
-  cost: 12500
-  category: Cargo
-  group: market
-
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml b/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml
@@ -148,30 +148,13 @@
       amount: 5
 
 - type: entity
-  id: CrateMinerEquipment
-  name: "mining"
-  description: For the daring.
-  suffix: Filled
   parent: CrateGenericSteel
-  components:
-  - type: StorageFill
-    contents:
-      - id: WeaponCutter
-        amount: 2
-      - id: OreBagBluespace
-        amount: 2
-
-- type: entity
-  id: CrateMinerAdvancedEquipment
-  name: "mining advanced"
-  description: For the daring.
+  id: CrateAdvSalvageEquipment
+  name: advanced salvage equipment
   suffix: Filled
-  parent: CrateGenericSteel
+  description: Contains one advanced plasma cutter and bluespace ore bag.
   components:
   - type: StorageFill
     contents:
-      - id: WeaponCutterAdv
-        amount: 2
-      - id: OreBagBluespace
-        amount: 2
-
+    - id: WeaponCutterAdv
+    - id: OreBagBluespace
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Salvage/ore_bag.yml b/Resources/Prototypes/Entities/Objects/Specific/Salvage/ore_bag.yml
@@ -32,6 +32,10 @@
   - type: Sprite
     sprite: Objects/Specific/Mining/ore_bag_bluespace.rsi
     state: icon
+    layers:
+    - state: icon
+    - state: icon-unlit
+      shader: unshaded
   - type: Clothing
     sprite: Objects/Specific/Mining/ore_bag_bluespace.rsi
     quickEquip: false
@@ -40,7 +44,7 @@
   - type: Item
     size: 176
   - type: Storage
-    capacity: 2400
+    capacity: 9999
     quickInsert: true
     areaInsert: true
     areaInsertRadius: 14

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
@@ -496,28 +496,33 @@
       sprite: Objects/Weapons/Guns/Battery/cutter.rsi
       state: icon
     - type: Gun
-      fireRate: 6
+      fireRate: 0.6
       soundGunshot:
         path: /Audio/Weapons/Guns/Gunshots/plasma_cutter.ogg
+    - type: Item
+      size: 25
     - type: ProjectileBatteryAmmoProvider
       proto: BulletCutter
-      fireCost: 10
+      fireCost: 200
+    - type: Battery
+      maxCharge: 5000
+      startingCharge: 5000
     - type: Appearance
 
 - type: entity
   name: Advanced Cutter
-  parent: BaseWeaponBatterySmall
+  parent: WeaponCutter
   id: WeaponCutterAdv
   description: A self-defense weapon that exhausts organic targets, weakening them until they collapse.
   components:
     - type: Sprite
       sprite: Objects/Weapons/Guns/Battery/cutteradv.rsi
       state: icon
     - type: Gun
-      fireRate: 8
+      fireRate: 1
       soundGunshot:
         path: /Audio/Weapons/Guns/Gunshots/plasma_cutter.ogg
     - type: ProjectileBatteryAmmoProvider
-      proto: BulletCutter
-      fireCost: 5
+      proto: BulletCutterAdv
+      fireCost: 100
     - type: Appearance
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
@@ -292,6 +292,49 @@
       path: "/Audio/Weapons/tap.ogg"
     soundForce: true
 
+- type: entity
+  id: BulletCutter
+  name: cutter bolt
+  parent: BaseBullet
+  noSpawn: true
+  description: Not too bad, but you still don't want to get hit by it.
+  components:
+  - type: Reflective
+    reflective:
+      - NonEnergy
+  - type: Sprite
+    noRot: false
+    sprite: Objects/Weapons/Guns/Projectiles/bullet_cutter.rsi
+    layers:
+    - state: icon
+      shader: unshaded
+  - type: GatheringProjectile
+    amount: 30
+  - type: Projectile
+    deleteOnCollide: false
+    damage:
+      types:
+        Heat: 10
+  - type: TimedDespawn
+    lifetime: 0.2
+  - type: PointLight
+    radius: 2
+    color: purple
+    energy: 1
+
+- type: entity
+  id: BulletCutterAdv
+  name: cutter bolt advanced
+  parent: BulletCutter
+  noSpawn: true
+  components:
+  - type: Projectile
+    damage:
+      types:
+        Heat: 15
+  - type: TimedDespawn
+    lifetime: 0.25
+
 - type: entity
   name: emitter bolt
   id: EmitterBolt
@@ -766,27 +809,3 @@
     lifetime: 0.4
   - type: StaminaDamageOnCollide
     damage: 65
-
-- type: entity
-  id: BulletCutter
-  name: Cutter bolt
-  parent: BaseBullet
-  noSpawn: true
-  description: Not too bad, but you still don't want to get hit by it.
-  components:
-  - type: Reflective
-    reflective:
-      - NonEnergy
-  - type: Sprite
-    noRot: false
-    sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi
-    layers:
-    - state: scatterlaser
-  - type: GatheringProjectile
-  - type: Projectile
-    damage:
-      types:
-        Heat: 0.5
-  # Short lifespan
-  - type: TimedDespawn
-    lifetime: 0.4
diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -224,6 +224,7 @@
       - WeaponCrusherDagger
       - WeaponForceGun
       - WeaponProtoKineticAccelerator
+      - WeaponCutter
       - WeaponTetherGun
       - WeaponGrapplingGun
       - ClothingBackpackHolding

diff --git a/Resources/Prototypes/Procedural/salvage_rewards.yml b/Resources/Prototypes/Procedural/salvage_rewards.yml
@@ -65,6 +65,8 @@
     CrateArmoryLaser: 1.0
     CrateArmoryShotgun: 1.0
     BoxCursedKatana: 1.0
+    # rare equipment
+    CrateAdvSalvageEquipment: 1.0
     # rare armor
     ClothingOuterArmorRiot: 1.0
     # rare chemicals

diff --git a/Resources/Prototypes/Recipes/Lathes/security.yml b/Resources/Prototypes/Recipes/Lathes/security.yml
@@ -29,6 +29,16 @@
     Glass: 800
     Plastic: 500
 
+- type: latheRecipe
+  id: WeaponCutter
+  result: WeaponCutter
+  completetime: 10
+  materials:
+    Steel: 1100
+    Glass: 200
+    Gold: 300
+    Plasma: 800
+
 - type: latheRecipe
   id: WeaponAdvancedLaser
   result: WeaponAdvancedLaser

diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml
@@ -87,6 +87,18 @@
 
 # Tier 2
 
+- type: technology
+  id: SalvageCutters
+  name: research-technology-salvage-cutters
+  icon:
+    sprite: Objects/Weapons/Guns/Battery/cutter.rsi
+    state: icon
+  discipline: Arsenal
+  tier: 2
+  cost: 8500
+  recipeUnlocks:
+  - WeaponCutter
+
 - type: technology
   id: OptimizedBallistics
   name: research-technology-optimized-ballistics

diff --git a/Resources/Textures/Objects/Specific/Mining/ore_bag_bluespace.rsi/equipped-BELT.png b/Resources/Textures/Objects/Specific/Mining/ore_bag_bluespace.rsi/equipped-BELT.png
diff --git a/Resources/Textures/Objects/Specific/Mining/ore_bag_bluespace.rsi/icon-unlit.png b/Resources/Textures/Objects/Specific/Mining/ore_bag_bluespace.rsi/icon-unlit.png
diff --git a/Resources/Textures/Objects/Specific/Mining/ore_bag_bluespace.rsi/inhand-left.png b/Resources/Textures/Objects/Specific/Mining/ore_bag_bluespace.rsi/inhand-left.png
diff --git a/Resources/Textures/Objects/Specific/Mining/ore_bag_bluespace.rsi/inhand-right.png b/Resources/Textures/Objects/Specific/Mining/ore_bag_bluespace.rsi/inhand-right.png
diff --git a/Resources/Textures/Objects/Specific/Mining/ore_bag_bluespace.rsi/meta.json b/Resources/Textures/Objects/Specific/Mining/ore_bag_bluespace.rsi/meta.json
@@ -30,6 +30,18 @@
     {
       "name": "inhand-right",
       "directions": 4
+    },
+    {
+      "name": "icon-unlit",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
     }
   ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Projectiles/bullet_cutter.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Projectiles/bullet_cutter.rsi/icon.png
diff --git a/Resources/Textures/Objects/Weapons/Guns/Projectiles/bullet_cutter.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Projectiles/bullet_cutter.rsi/meta.json
@@ -0,0 +1,14 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken and modified from tgstation commit: https://github.com/tgstation/tgstation/commit/2b8b045d5a237147d736e3ba3c77c8cc5fb66cb5#diff-db041845cfd01e0f883d2bf4f74cd897b7f63ea5e856e64109d7dd3b6543d1ab",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    }
+  ]
+}