]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Science magboots (#23107)
authorUbaser <134914314+UbaserB@users.noreply.github.com>
Fri, 29 Dec 2023 03:08:07 +0000 (14:08 +1100)
committerGitHub <noreply@github.com>
Fri, 29 Dec 2023 03:08:07 +0000 (20:08 -0700)
* add

* uhhh

* fix RSI

* lathe

* fix

13 files changed:
Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml
Resources/Prototypes/Entities/Structures/Machines/lathe.yml
Resources/Prototypes/Recipes/Lathes/misc.yml
Resources/Prototypes/Research/experimental.yml
Resources/Textures/Clothing/Shoes/Boots/magboots-science.rsi/equipped-FEET.png [new file with mode: 0644]
Resources/Textures/Clothing/Shoes/Boots/magboots-science.rsi/icon-on.png [new file with mode: 0644]
Resources/Textures/Clothing/Shoes/Boots/magboots-science.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Clothing/Shoes/Boots/magboots-science.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Clothing/Shoes/Boots/magboots-science.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Clothing/Shoes/Boots/magboots-science.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Clothing/Shoes/Boots/magboots-science.rsi/on-equipped-FEET.png [new file with mode: 0644]
Resources/Textures/Clothing/Shoes/Boots/magboots-science.rsi/on-inhand-left.png [new file with mode: 0644]
Resources/Textures/Clothing/Shoes/Boots/magboots-science.rsi/on-inhand-right.png [new file with mode: 0644]

index 38127f8a3ef7363220da555ea4a59d31e0985ff3..dd7ed674a8b42cda8ebc33722bad22610a0c061d 100644 (file)
   - type: StealTarget
     stealGroup: ClothingShoesBootsMagAdv
 
+- type: entity
+  parent: ClothingShoesBootsMag
+  id: ClothingShoesBootsMagSci
+  components:
+  - type: Sprite
+    sprite: Clothing/Shoes/Boots/magboots-science.rsi
+  - type: Clothing
+    sprite: Clothing/Shoes/Boots/magboots-science.rsi
+  - type: Magboots
+    toggleAction: ActionToggleMagbootsSci
+  - type: StaticPrice
+    price: 400
+
 - type: entity
   parent: ClothingShoesBootsMag
   id: ClothingShoesBootsMagBlinding
     icon: { sprite: Clothing/Shoes/Boots/magboots-advanced.rsi, state: icon }
     iconOn: Clothing/Shoes/Boots/magboots-advanced.rsi/icon-on.png
 
+- type: entity
+  id: ActionToggleMagbootsSci
+  parent: ActionBaseToggleMagboots
+  noSpawn: true
+  components:
+  - type: InstantAction
+    icon: { sprite: Clothing/Shoes/Boots/magboots-science.rsi, state: icon }
+    iconOn: Clothing/Shoes/Boots/magboots-science.rsi/icon-on.png
+
 - type: entity
   id: ActionToggleMagbootsSyndie
   parent: ActionBaseToggleMagboots
index 8772c7290ed685c8bccc74e70c3cd07564ad024a..76e6aaf76a7e37e372eb36400fe951b9d5b338f6 100644 (file)
       - WeaponGauntletGorilla
       - SynthesizerInstrument
       - RPED
-      - ClothingShoesBootsMag
+      - ClothingShoesBootsMagSci
       - ClothingShoesBootsSpeed
       - NodeScanner
       - HolofanProjector
index b8c0fcd95f617753a53bf495b55b7dba14d5809a..6bf3368cb3a9c881e55f8df5df1b761a21ae4154 100644 (file)
@@ -94,8 +94,8 @@
     Plastic: 50
 
 - type: latheRecipe
-  id: ClothingShoesBootsMag
-  result: ClothingShoesBootsMag
+  id: ClothingShoesBootsMagSci
+  result: ClothingShoesBootsMagSci
   completetime: 10
   materials:
     Steel: 1000
index f504f7fa2488af119869dc0b144913da81643fb3..ab52a07d9923e54dbaeca7e988c76bc0fd982e9e 100644 (file)
@@ -1,4 +1,4 @@
-# Tier 1
+# Tier 1
 
 - type: technology
   id: BasicRobotics
   id: MagnetsTech
   name: research-technology-magnets-tech
   icon:
-    sprite: Clothing/Shoes/Boots/magboots.rsi
+    sprite: Clothing/Shoes/Boots/magboots-science.rsi
     state: icon
   discipline: Experimental
   tier: 1
   cost: 7500
   recipeUnlocks:
-  - ClothingShoesBootsMag
+  - ClothingShoesBootsMagSci
 
 - type: technology
   id: AnomalyCoreHarnessing
diff --git a/Resources/Textures/Clothing/Shoes/Boots/magboots-science.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Shoes/Boots/magboots-science.rsi/equipped-FEET.png
new file mode 100644 (file)
index 0000000..d93f51b
Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Boots/magboots-science.rsi/equipped-FEET.png differ
diff --git a/Resources/Textures/Clothing/Shoes/Boots/magboots-science.rsi/icon-on.png b/Resources/Textures/Clothing/Shoes/Boots/magboots-science.rsi/icon-on.png
new file mode 100644 (file)
index 0000000..ac9b827
Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Boots/magboots-science.rsi/icon-on.png differ
diff --git a/Resources/Textures/Clothing/Shoes/Boots/magboots-science.rsi/icon.png b/Resources/Textures/Clothing/Shoes/Boots/magboots-science.rsi/icon.png
new file mode 100644 (file)
index 0000000..e0dc9ff
Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Boots/magboots-science.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Shoes/Boots/magboots-science.rsi/inhand-left.png b/Resources/Textures/Clothing/Shoes/Boots/magboots-science.rsi/inhand-left.png
new file mode 100644 (file)
index 0000000..6bfce53
Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Boots/magboots-science.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Shoes/Boots/magboots-science.rsi/inhand-right.png b/Resources/Textures/Clothing/Shoes/Boots/magboots-science.rsi/inhand-right.png
new file mode 100644 (file)
index 0000000..257fe01
Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Boots/magboots-science.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Shoes/Boots/magboots-science.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Boots/magboots-science.rsi/meta.json
new file mode 100644 (file)
index 0000000..2880b8e
--- /dev/null
@@ -0,0 +1,41 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Drawn by Ubaser.",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "equipped-FEET",
+      "directions": 4
+    },
+    {
+      "name": "on-equipped-FEET",
+      "directions": 4
+    },
+    {
+      "name": "icon"
+    },
+    {
+      "name": "icon-on"
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "on-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "on-inhand-right",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/Clothing/Shoes/Boots/magboots-science.rsi/on-equipped-FEET.png b/Resources/Textures/Clothing/Shoes/Boots/magboots-science.rsi/on-equipped-FEET.png
new file mode 100644 (file)
index 0000000..fb64b8b
Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Boots/magboots-science.rsi/on-equipped-FEET.png differ
diff --git a/Resources/Textures/Clothing/Shoes/Boots/magboots-science.rsi/on-inhand-left.png b/Resources/Textures/Clothing/Shoes/Boots/magboots-science.rsi/on-inhand-left.png
new file mode 100644 (file)
index 0000000..16c9ed4
Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Boots/magboots-science.rsi/on-inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Shoes/Boots/magboots-science.rsi/on-inhand-right.png b/Resources/Textures/Clothing/Shoes/Boots/magboots-science.rsi/on-inhand-right.png
new file mode 100644 (file)
index 0000000..5f8ef8d
Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Boots/magboots-science.rsi/on-inhand-right.png differ