diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 138c319e5c1..3722a954bbe 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -905,6 +905,7 @@ - MagazineBoxSpecialIncendiary - MagazineBoxSpecialUranium - MagazineBoxSpecialMindbreaker + - ClothingShoesBootsMagCom #Floof - type: MaterialStorage whitelist: tags: diff --git a/Resources/Prototypes/Floof/Entities/Clothing/Shoes/Combatmags.yml b/Resources/Prototypes/Floof/Entities/Clothing/Shoes/Combatmags.yml new file mode 100644 index 00000000000..eabecb6c6ec --- /dev/null +++ b/Resources/Prototypes/Floof/Entities/Clothing/Shoes/Combatmags.yml @@ -0,0 +1,21 @@ +- type: entity + parent: ClothingShoesBootsMag + id: ClothingShoesBootsMagCom + name: Combat magboots + description: Made by SESWC. These State-of-the-art magnetic boots with built in armor for extra protection + components: + - type: Sprite + sprite: Floof/Clothing/Shoes/Boots/combatMagboots.rsi + layers: + - state: icon + map: [ "enum.ToggleVisuals.Layer" ] + - type: Clothing + sprite: Floof/Clothing/Shoes/Boots/combatMagboots.rsi + - type: Item + - type: Armor + modifiers: + coefficients: + Blunt: 0.90 + Slash: 0.90 + Piercing: 0.90 + Heat: 0.90 diff --git a/Resources/Prototypes/Floof/Recipes/Lathes/security.yml b/Resources/Prototypes/Floof/Recipes/Lathes/security.yml index 5713d0c3b57..06da83ee941 100644 --- a/Resources/Prototypes/Floof/Recipes/Lathes/security.yml +++ b/Resources/Prototypes/Floof/Recipes/Lathes/security.yml @@ -13,3 +13,12 @@ completetime: 5 materials: Steel: 210 + +- type: latheRecipe + id: ClothingShoesBootsMagCom + result: ClothingShoesBootsMagCom + completetime: 10 + materials: + Steel: 1000 + Plastic: 500 + Silver: 250 diff --git a/Resources/Prototypes/Research/experimental.yml b/Resources/Prototypes/Research/experimental.yml index 60017fc98d1..8df1bce4af4 100644 --- a/Resources/Prototypes/Research/experimental.yml +++ b/Resources/Prototypes/Research/experimental.yml @@ -69,6 +69,7 @@ cost: 7500 recipeUnlocks: - ClothingShoesBootsMagSci + - ClothingShoesBootsMagCom #Floof - type: technology id: AnomalyCoreHarnessing diff --git a/Resources/Textures/Floof/Clothing/Shoes/Boots/combatMagboots.rsi/equipped-FEET-vox.png b/Resources/Textures/Floof/Clothing/Shoes/Boots/combatMagboots.rsi/equipped-FEET-vox.png new file mode 100644 index 00000000000..66083b253d4 Binary files /dev/null and b/Resources/Textures/Floof/Clothing/Shoes/Boots/combatMagboots.rsi/equipped-FEET-vox.png differ diff --git a/Resources/Textures/Floof/Clothing/Shoes/Boots/combatMagboots.rsi/equipped-FEET.png b/Resources/Textures/Floof/Clothing/Shoes/Boots/combatMagboots.rsi/equipped-FEET.png new file mode 100644 index 00000000000..9219f6fe609 Binary files /dev/null and b/Resources/Textures/Floof/Clothing/Shoes/Boots/combatMagboots.rsi/equipped-FEET.png differ diff --git a/Resources/Textures/Floof/Clothing/Shoes/Boots/combatMagboots.rsi/icon-on.png b/Resources/Textures/Floof/Clothing/Shoes/Boots/combatMagboots.rsi/icon-on.png new file mode 100644 index 00000000000..bdc5318d157 Binary files /dev/null and b/Resources/Textures/Floof/Clothing/Shoes/Boots/combatMagboots.rsi/icon-on.png differ diff --git a/Resources/Textures/Floof/Clothing/Shoes/Boots/combatMagboots.rsi/icon.png b/Resources/Textures/Floof/Clothing/Shoes/Boots/combatMagboots.rsi/icon.png new file mode 100644 index 00000000000..76157f4e212 Binary files /dev/null and b/Resources/Textures/Floof/Clothing/Shoes/Boots/combatMagboots.rsi/icon.png differ diff --git a/Resources/Textures/Floof/Clothing/Shoes/Boots/combatMagboots.rsi/inhand-left.png b/Resources/Textures/Floof/Clothing/Shoes/Boots/combatMagboots.rsi/inhand-left.png new file mode 100644 index 00000000000..f24e0cf0ef9 Binary files /dev/null and b/Resources/Textures/Floof/Clothing/Shoes/Boots/combatMagboots.rsi/inhand-left.png differ diff --git a/Resources/Textures/Floof/Clothing/Shoes/Boots/combatMagboots.rsi/inhand-right.png b/Resources/Textures/Floof/Clothing/Shoes/Boots/combatMagboots.rsi/inhand-right.png new file mode 100644 index 00000000000..4997e0fdea0 Binary files /dev/null and b/Resources/Textures/Floof/Clothing/Shoes/Boots/combatMagboots.rsi/inhand-right.png differ diff --git a/Resources/Textures/Floof/Clothing/Shoes/Boots/combatMagboots.rsi/meta.json b/Resources/Textures/Floof/Clothing/Shoes/Boots/combatMagboots.rsi/meta.json new file mode 100644 index 00000000000..f81ea97bec5 --- /dev/null +++ b/Resources/Textures/Floof/Clothing/Shoes/Boots/combatMagboots.rsi/meta.json @@ -0,0 +1,49 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7e4e9d432d88981fb9bb463970c5b98ce85c0abe Based and edited by SungYandy", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "equipped-FEET", + "directions": 4 + }, + { + "name": "on-equipped-FEET", + "directions": 4 + }, + { + "name": "equipped-FEET-vox", + "directions": 4 + }, + { + "name": "on-equipped-FEET-vox", + "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/Floof/Clothing/Shoes/Boots/combatMagboots.rsi/on-equipped-FEET-vox.png b/Resources/Textures/Floof/Clothing/Shoes/Boots/combatMagboots.rsi/on-equipped-FEET-vox.png new file mode 100644 index 00000000000..e9d3dffc764 Binary files /dev/null and b/Resources/Textures/Floof/Clothing/Shoes/Boots/combatMagboots.rsi/on-equipped-FEET-vox.png differ diff --git a/Resources/Textures/Floof/Clothing/Shoes/Boots/combatMagboots.rsi/on-equipped-FEET.png b/Resources/Textures/Floof/Clothing/Shoes/Boots/combatMagboots.rsi/on-equipped-FEET.png new file mode 100644 index 00000000000..934c155eb53 Binary files /dev/null and b/Resources/Textures/Floof/Clothing/Shoes/Boots/combatMagboots.rsi/on-equipped-FEET.png differ diff --git a/Resources/Textures/Floof/Clothing/Shoes/Boots/combatMagboots.rsi/on-inhand-left.png b/Resources/Textures/Floof/Clothing/Shoes/Boots/combatMagboots.rsi/on-inhand-left.png new file mode 100644 index 00000000000..4e754a4314d Binary files /dev/null and b/Resources/Textures/Floof/Clothing/Shoes/Boots/combatMagboots.rsi/on-inhand-left.png differ diff --git a/Resources/Textures/Floof/Clothing/Shoes/Boots/combatMagboots.rsi/on-inhand-right.png b/Resources/Textures/Floof/Clothing/Shoes/Boots/combatMagboots.rsi/on-inhand-right.png new file mode 100644 index 00000000000..4a8c25be7e9 Binary files /dev/null and b/Resources/Textures/Floof/Clothing/Shoes/Boots/combatMagboots.rsi/on-inhand-right.png differ