Service borg mod split

Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml

@@ -462,25 +462,6 @@
     icon: { sprite: Interface/Actions/actions_borg.rsi, state: anomaly-module }
 
 # service modules
-- type: entity
-  id: BorgModuleBartender
-  parent: [ BaseBorgModuleService, BaseProviderBorgModule ]
-  name: bartender cyborg module
-  components:
-  - type: Sprite
-    layers:
-    - state: service
-    - state: icon-beer
-  - type: ItemBorgModule
-    items:
-    - Lighter
-    - DrinkShaker
-    - BarSpoon
-    - BorgIceBucket
-    - Pitcher
-    - BorgDropper
-
-# depreciated. included in case of merge errors
 - type: entity
   id: BorgModuleService
   parent: [ BaseBorgModuleService, BaseProviderBorgModule ]
@@ -570,24 +551,6 @@
   - type: BorgModuleIcon
     icon: { sprite: Interface/Actions/actions_borg.rsi, state: clowning-module }
 
-- type: entity
-  id: BorgModulePaper
-  parent: [ BaseBorgModuleService, BaseProviderBorgModule ]
-  name: bureaucracy cyborg module
-  components:
-  - type: Sprite
-    layers:
-    - state: service
-    - state: icon-pen
-  - type: ItemBorgModule
-    items:
-    - Pen
-    - BooksBag
-    - HandLabeler
-    - RubberStampApproved
-    - RubberStampDenied
-    - RubberStampBorg
-
 #syndicate modules
 - type: entity
   id: BorgModuleSyndicateWeapon

Resources/Prototypes/Entities/Structures/Machines/lathe.yml

@@ -594,8 +594,6 @@
     - BorgModuleFireExtinguisher
     - BorgModuleRadiationDetection
     - BorgModuleTool
-    - BorgModuleBartender
-    - BorgModulePaper
     - BorgModuleArtistic #imp special
     - CyborgEndoskeleton
     - LeftArmBorg

Resources/Prototypes/Recipes/Lathes/robotics.yml

@@ -186,16 +186,6 @@
 
 # Service Modules
 
-- type: latheRecipe
-  parent: BaseBorgModuleRecipe
-  id: BorgModuleBartender
-  result: BorgModuleBartender
-
-- type: latheRecipe
-  parent: BaseBorgModuleRecipe
-  id: BorgModuleMusique
-  result: BorgModuleMusique
-
 - type: latheRecipe
   parent: BaseBorgModuleRecipe
   id: BorgModuleGardening
@@ -205,13 +195,3 @@
   parent: BaseBorgModuleRecipe
   id: BorgModuleHarvesting
   result: BorgModuleHarvesting
-
-- type: latheRecipe
-  parent: BaseBorgModuleRecipe
-  id: BorgModuleClowning
-  result: BorgModuleClowning
-
-- type: latheRecipe
-  parent: BaseBorgModuleRecipe
-  id: BorgModulePaper
-  result: BorgModulePaper

Resources/Prototypes/_Impstation/Entities/Objects/Specific/Robotics/Borg/borg_modules.yml

@@ -37,7 +37,7 @@
   - type: Tag
     tags:
       - BorgModuleTckTck
-      
+
 - type: entity
   id: BorgModuleTckTckGun
   parent: [ BaseBorgModule, BaseProviderBorgModule, DecapoidEmpireContraband ]
@@ -72,4 +72,44 @@
     - SprayPainter
     - Pen
   - type: BorgModuleIcon
-    icon: { sprite: Interface/Actions/actions_borg.rsi, state: service-module }
+    icon: { sprite: _Impstation/Interface/Actions/actions_borg.rsi, state: artistic-module }
+
+- type: entity
+  id: BorgModulePaper
+  parent: [ BaseBorgModuleService, BaseProviderBorgModule ]
+  name: bureaucracy cyborg module
+  components:
+  - type: Sprite
+    layers:
+    - state: service
+    - state: icon-pen
+  - type: ItemBorgModule
+    items:
+    - Pen
+    - BooksBag
+    - HandLabeler
+    - RubberStampApproved
+    - RubberStampDenied
+    - RubberStampBorg
+  - type: BorgModuleIcon
+    icon: { sprite: _Impstation/Interface/Actions/actions_borg.rsi, state: bureaucracy-module }
+
+- type: entity
+  id: BorgModuleBartender
+  parent: [ BaseBorgModuleService, BaseProviderBorgModule ]
+  name: bartender cyborg module
+  components:
+  - type: Sprite
+    layers:
+    - state: service
+    - state: icon-beer
+  - type: ItemBorgModule
+    items:
+    - Lighter
+    - DrinkShaker
+    - BarSpoon
+    - BorgIceBucket
+    - Pitcher
+    - BorgDropper
+  - type: BorgModuleIcon
+    icon: { sprite: _Impstation/Interface/Actions/actions_borg.rsi, state: bartender-module }

Resources/Prototypes/borg_types.yml

@@ -194,15 +194,16 @@
   dummyPrototype: BorgChassisService
 
   # Functional
-  extraModuleCount: 3
+  extraModuleCount: 4
   moduleWhitelist:
     tags:
     - BorgModuleGeneric
     - BorgModuleService
 
   defaultModules:
   - BorgModuleMusique
-  - BorgModuleService
+  - BorgModuleBartender # imp
+  - BorgModulePaper # imp
   - BorgModuleClowning
 
   radioChannels:

Resources/Textures/_Impstation/Interface/Actions/actions_borg.rsi/meta.json

@@ -0,0 +1,20 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "artistic bartender and bureaucracy by iaada(github)",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "artistic-module"
+        },
+        {
+            "name": "bartender-module"
+        },
+        {
+            "name": "bureaucracy-module"
+        }
+    ]
+}