From: Ubaser <134914314+UbaserB@users.noreply.github.com> Date: Fri, 29 Dec 2023 03:08:07 +0000 (+1100) Subject: Science magboots (#23107) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=56884fd72df6ae88aca892e68dcd9829766864b7;p=space-station-14.git Science magboots (#23107) * add * uhhh * fix RSI * lathe * fix --- diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml b/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml index 38127f8a3e..dd7ed674a8 100644 --- a/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml +++ b/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml @@ -56,6 +56,19 @@ - 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 @@ -145,6 +158,15 @@ 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 diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 8772c7290e..76e6aaf76a 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -265,7 +265,7 @@ - WeaponGauntletGorilla - SynthesizerInstrument - RPED - - ClothingShoesBootsMag + - ClothingShoesBootsMagSci - ClothingShoesBootsSpeed - NodeScanner - HolofanProjector diff --git a/Resources/Prototypes/Recipes/Lathes/misc.yml b/Resources/Prototypes/Recipes/Lathes/misc.yml index b8c0fcd95f..6bf3368cb3 100644 --- a/Resources/Prototypes/Recipes/Lathes/misc.yml +++ b/Resources/Prototypes/Recipes/Lathes/misc.yml @@ -94,8 +94,8 @@ Plastic: 50 - type: latheRecipe - id: ClothingShoesBootsMag - result: ClothingShoesBootsMag + id: ClothingShoesBootsMagSci + result: ClothingShoesBootsMagSci completetime: 10 materials: Steel: 1000 diff --git a/Resources/Prototypes/Research/experimental.yml b/Resources/Prototypes/Research/experimental.yml index f504f7fa24..ab52a07d99 100644 --- a/Resources/Prototypes/Research/experimental.yml +++ b/Resources/Prototypes/Research/experimental.yml @@ -1,4 +1,4 @@ -# Tier 1 +# Tier 1 - type: technology id: BasicRobotics @@ -62,13 +62,13 @@ 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 index 0000000000..d93f51bb59 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 index 0000000000..ac9b827a9c 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 index 0000000000..e0dc9ffb3e 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 index 0000000000..6bfce53798 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 index 0000000000..257fe01411 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 index 0000000000..2880b8eec4 --- /dev/null +++ b/Resources/Textures/Clothing/Shoes/Boots/magboots-science.rsi/meta.json @@ -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 index 0000000000..fb64b8b361 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 index 0000000000..16c9ed4a7f 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 index 0000000000..5f8ef8d6b0 Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Boots/magboots-science.rsi/on-inhand-right.png differ