Merge pull request #470 from fenndragon/Modules

Emergency Hotfix
Fansana · Jan 9, 2025 · 2206a5c · 2206a5c
2 parents a625a1f + 3215ed3
commit 2206a5c
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 63 deletions.
diff --git a/Resources/Prototypes/Floof/Entities/Mobs/Cyborgs/quadborg.yml b/Resources/Prototypes/Floof/Entities/Mobs/Cyborgs/quadborg.yml
@@ -28,8 +28,6 @@
   - type: Body
     prototype: Primate
     requiredLegs: 1 # TODO: More than 1 leg
-  - type: Inventory
-    templateId: Securityborg
   - type: BorgChassis
     maxModules: 4
     moduleWhitelist:
@@ -72,16 +70,3 @@
       shader: unshaded
       map: ["light"]
       visible: false
-
-- type: inventoryTemplate
-  id: Securityborg
-  slots:
-  - name: pocket1
-    slotTexture: pocket
-    slotFlags: POCKET
-    slotGroup: MainHotbar
-    stripTime: 3
-    uiWindowPos: 0,3
-    strippingWindowPos: 0,4
-    displayName: Pocket 1
-    stripHidden: false
diff --git a/Resources/Prototypes/Floof/Entities/Objects/Specific/Robotics/Borgmodules.yml b/Resources/Prototypes/Floof/Entities/Objects/Specific/Robotics/Borgmodules.yml
@@ -55,9 +55,9 @@
     layers:
     - state: security
     - state: icon-investigation
-  - type: Construction
-    graph: BorgModuleInvestigation
-    node: icon
+#  - type: Construction
+#    graph: BorgModuleInvestigation
+#    node: icon
   - type: ItemBorgModule
     items:
     - ForensicScanner
@@ -98,4 +98,4 @@
     - BorgModuleGeneric
   - type: GuideHelp
     guides:
-      - Cyborgs
+      - Cyborgs
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/tools/BorgModules.yml b/Resources/Prototypes/Recipes/Construction/Graphs/tools/BorgModules.yml
@@ -50,26 +50,26 @@
   - node: icon
     entity: BorgModuleKill
 
-- type: constructionGraph
-  id: BorgModuleInvestigation
-  start: start
-  graph:
-  - node: start
-    entity: ForensicScanner
-    edges:
-    - to: icon
-      steps:
-      - tag: BorgModuleGeneric
-        name: blank security borg module
-        icon:
-          sprite: Floof/Objects/Specific/Robotics/borgmodule.rsi
-          state: security
-        doAfter: 1
-      - tag: DoorBumpOpener
-        name: SecurityPDA
-        icon:
-          sprite: Objects/Devices/pda.rsi
-          state: pda-security
-        doAfter: 1
-  - node: icon
-    entity: BorgModuleInvestigation
+#- type: constructionGraph
+  #id: BorgModuleInvestigation
+  #start: start
+  #graph:
+  #- node: start
+    #entity: ForensicScanner
+    #edges:
+    #- to: icon
+      #steps:
+      #- tag: BorgModuleGeneric
+        #name: blank security borg module
+        #icon:
+          #sprite: Floof/Objects/Specific/Robotics/borgmodule.rsi
+          #state: security
+        #doAfter: 1
+      #- tag: DoorBumpOpener
+        #name: SecurityPDA
+        #icon:
+          #sprite: Objects/Devices/pda.rsi
+          #state: pda-security
+        #doAfter: 1
+  #- node: icon
+    #entity: BorgModuleInvestigation
diff --git a/Resources/Prototypes/Recipes/Construction/tools.yml b/Resources/Prototypes/Recipes/Construction/tools.yml
@@ -64,27 +64,17 @@
   icon: { sprite: Floof/Objects/Specific/Robotics/borgmodule.rsi, state: icon-kill }
   objectType: Item
 
-- type: construction
-  name: Investigation
-  id: BorgModuleInvestigation
-  graph: BorgModuleInvestigation
-  startNode: start
-  targetNode: icon
-  category: construction-category-tools
-  description: A lethal module for security borg
-  icon: { sprite: Floof/Objects/Specific/Robotics/borgmodule.rsi, state: icon-investigation }
-  objectType: Item
+#- type: construction
+  #name: Investigation
+  #id: BorgModuleInvestigation
+  #graph: BorgModuleInvestigation
+  #startNode: start
+  #targetNode: icon
+  #category: construction-category-tools
+  #description: A lethal module for security borg
+  #icon: { sprite: Floof/Objects/Specific/Robotics/borgmodule.rsi, state: icon-investigation }
+  #objectType: Item
 
-# - type: construction
-  # name: Investigation Module
-  # id: BorgModuleInvestigation
-  # graph: BorgmoduleInvestigation
-  # startNode: start
-  # targetNode: power_sensor
-  # category: construction-category-tools
-  # description: A power network checking device for signals.
-  # icon: { sprite: Objects/Devices/gates.rsi, state: power_sensor }
-  # objectType: Item
 
 # - type: construction
   # name: Advanced Combat Module
@@ -95,4 +85,4 @@
   # category: construction-category-tools
   # description: A power network checking device for signals.
   # icon: { sprite: Objects/Devices/gates.rsi, state: power_sensor }
-  # objectType: Item
+  # objectType: Item