Skip to content

Commit

Permalink
Merge pull request #335 from VividPups/Combat-boots-
Browse files Browse the repository at this point in the history
Combat Boots
  • Loading branch information
Fansana authored Nov 8, 2024
2 parents c3f6de5 + 7a3d414 commit 982c78f
Show file tree
Hide file tree
Showing 15 changed files with 81 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -905,6 +905,7 @@
- MagazineBoxSpecialIncendiary
- MagazineBoxSpecialUranium
- MagazineBoxSpecialMindbreaker
- ClothingShoesBootsMagCom #Floof
- type: MaterialStorage
whitelist:
tags:
Expand Down
21 changes: 21 additions & 0 deletions Resources/Prototypes/Floof/Entities/Clothing/Shoes/Combatmags.yml
Original file line number Diff line number Diff line change
@@ -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
9 changes: 9 additions & 0 deletions Resources/Prototypes/Floof/Recipes/Lathes/security.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,12 @@
completetime: 5
materials:
Steel: 210

- type: latheRecipe
id: ClothingShoesBootsMagCom
result: ClothingShoesBootsMagCom
completetime: 10
materials:
Steel: 1000
Plastic: 500
Silver: 250
1 change: 1 addition & 0 deletions Resources/Prototypes/Research/experimental.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@
cost: 7500
recipeUnlocks:
- ClothingShoesBootsMagSci
- ClothingShoesBootsMagCom #Floof

- type: technology
id: AnomalyCoreHarnessing
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -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
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 982c78f

Please sign in to comment.