From eb114677adc31e486083d95bc8c497bbf4c02b7a Mon Sep 17 00:00:00 2001
From: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
Date: Fri, 16 Jun 2023 21:59:53 -0400
Subject: [PATCH] move hamtr to civilian services tech (#17393)

---
 .../Locale/en-US/research/technologies.ftl    |  2 +-
 .../Prototypes/Research/civilianservices.yml  | 19 ++++++++++++++++++
 .../Prototypes/Research/experimental.yml      | 20 -------------------
 3 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/Resources/Locale/en-US/research/technologies.ftl b/Resources/Locale/en-US/research/technologies.ftl
index f44c240795..5733b7e908 100644
--- a/Resources/Locale/en-US/research/technologies.ftl
+++ b/Resources/Locale/en-US/research/technologies.ftl
@@ -40,13 +40,13 @@ research-technology-grappling = Grappling
 research-technology-abnormal-artifact-manipulation = Abnormal Artifact Manipulation
 research-technology-gravity-manipulation = Gravity Manipulation
 research-technology-mobile-anomaly-tech = Mobile Anomaly Tech
-research-technology-hamtr = HAMTR Mech
 research-technology-rped = Rapid Part Exchange
 research-technology-super-parts = Super Parts
 
 research-technology-janitorial-equipment = Janitorial Equipment
 research-technology-laundry-tech = Laundry Tech
 research-technology-basic-hydroponics = Basic Hydroponics
+research-technology-hamtr = HAMTR Mech
 research-technology-food-service = Food Service
 research-technology-advanced-entertainment = Advanced Entertainment
 research-technology-audio-visual-communication = A/V Communication
diff --git a/Resources/Prototypes/Research/civilianservices.yml b/Resources/Prototypes/Research/civilianservices.yml
index 7bad53a08d..46b0598731 100644
--- a/Resources/Prototypes/Research/civilianservices.yml
+++ b/Resources/Prototypes/Research/civilianservices.yml
@@ -41,6 +41,25 @@
   - SeedExtractorMachineCircuitboard
   - HydroponicsTrayMachineCircuitboard
 
+- type: technology
+  id: HamtrMechTech
+  name: research-technology-hamtr
+  icon:
+    sprite: Objects/Specific/Mech/mecha.rsi
+    state: hamtr
+  discipline: CivilianServices
+  tier: 1
+  cost: 10000
+  recipeUnlocks:
+    - HamtrHarness
+    - HamtrLArm
+    - HamtrRArm
+    - HamtrLLeg
+    - HamtrRLeg
+    - HamtrCentralElectronics
+    - HamtrPeripheralsElectronics
+    - MechEquipmentGrabberSmall
+
 - type: technology
   id: FoodService
   name: research-technology-food-service
diff --git a/Resources/Prototypes/Research/experimental.yml b/Resources/Prototypes/Research/experimental.yml
index a309ed6670..c2e96fd0a7 100644
--- a/Resources/Prototypes/Research/experimental.yml
+++ b/Resources/Prototypes/Research/experimental.yml
@@ -145,26 +145,6 @@
   recipeUnlocks:
   - RPED
 
-
-- type: technology
-  id: HamtrMechTech
-  name: research-technology-hamtr
-  icon:
-    sprite: Objects/Specific/Mech/mecha.rsi
-    state: hamtr
-  discipline: Experimental
-  tier: 2
-  cost: 8000
-  recipeUnlocks:
-  - HamtrHarness
-  - HamtrLArm
-  - HamtrRArm
-  - HamtrLLeg
-  - HamtrRLeg
-  - HamtrCentralElectronics
-  - HamtrPeripheralsElectronics
-  - MechEquipmentGrabberSmall
-
 # Tier 3
 
 - type: technology