diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml index 6bfb7f1080580..a7f0857b0e49a 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml @@ -355,7 +355,8 @@ - id: ClothingMaskGasSwat - id: ClothingOuterHardsuitSecurityRed - id: JetpackSecurityFilled - - id: OxygenTankCommandFilled + - id: OxygenTankCommandFilled # Imp - command tanks + - id: ClothingShoesBootsSecurityMagboots # DeltaV - Added security magboots. # No hardsuit locker - type: entity diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml index d8449338a0efc..ad36c85513696 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml @@ -72,6 +72,7 @@ - id: ClothingOuterHardsuitWarden - id: OxygenTankFilled - id: ClothingMaskGasSecurity # imp edit, replacing basic gasmask + - id: ClothingShoesBootsSecurityMagboots # DeltaV - Added security magboots - type: entity id: LockerSecurityFilled @@ -165,6 +166,7 @@ - id: TicketPad - id: UtilityToken1 # imp edit end + - id: ClothingShoesBootsSecurityMagboots # QB - port DeltaV security magboots - type: entity id: LockerDetectiveFilled diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml b/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml index b3eddde19cc14..3bb5661825d03 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml @@ -185,6 +185,8 @@ - id: ClothingOuterHardsuitSecurity - id: ClothingMaskGasSecurity #imp - id: JetpackSecurityFilled #imp + - id: ClothingShoesBootsSecurityMagboots # DeltaV - Added security magboots. + amount: 2 #CE's hardsuit - type: entity diff --git a/Resources/Prototypes/Recipes/Lathes/Packs/security.yml b/Resources/Prototypes/Recipes/Lathes/Packs/security.yml index ca202b1dfae4e..2deb540f020d9 100644 --- a/Resources/Prototypes/Recipes/Lathes/Packs/security.yml +++ b/Resources/Prototypes/Recipes/Lathes/Packs/security.yml @@ -79,6 +79,7 @@ - PowerCageSmall - TelescopicShield - ClothingBackpackHarmpack + - ClothingShoesBootsSecurityMagboots # QB - port DeltaV security magboots - type: latheRecipePack id: SecurityBoards @@ -147,4 +148,4 @@ id: SecurityDisablers recipes: - WeaponDisabler - - WeaponDisablerSMG \ No newline at end of file + - WeaponDisablerSMG diff --git a/Resources/Prototypes/Research/experimental.yml b/Resources/Prototypes/Research/experimental.yml index dd15b14fd220c..6c87ee5174559 100644 --- a/Resources/Prototypes/Research/experimental.yml +++ b/Resources/Prototypes/Research/experimental.yml @@ -69,6 +69,7 @@ recipeUnlocks: - ClothingShoesBootsMagSci - ClothingShoesBootsMoon + - ClothingShoesBootsSecurityMagboots # DeltaV - Added security magboots. - type: technology id: AnomalyCoreHarnessing diff --git a/Resources/Prototypes/_DV/Entities/Clothing/Shoes/magboots.yml b/Resources/Prototypes/_DV/Entities/Clothing/Shoes/magboots.yml new file mode 100644 index 0000000000000..9bc866562a558 --- /dev/null +++ b/Resources/Prototypes/_DV/Entities/Clothing/Shoes/magboots.yml @@ -0,0 +1,10 @@ +- type: entity + parent: [ClothingShoesBootsMagBase, BaseSecurityContraband] + id: ClothingShoesBootsSecurityMagboots + name: security magboots + description: Magnetic boots, often used during extravehicular activity to ensure the user remains safely attached to the vehicle. These ones bear security markings. + components: + - type: Sprite + sprite: DeltaV/Clothing/Shoes/Boots/magboots-security.rsi + - type: Clothing + sprite: DeltaV/Clothing/Shoes/Boots/magboots-security.rsi diff --git a/Resources/Prototypes/_DV/Recipes/Lathes/security.yml b/Resources/Prototypes/_DV/Recipes/Lathes/security.yml index 12ba3a4419fbc..e973699d717ab 100644 --- a/Resources/Prototypes/_DV/Recipes/Lathes/security.yml +++ b/Resources/Prototypes/_DV/Recipes/Lathes/security.yml @@ -1,4 +1,4 @@ -# armor vests +# armor vests - type: latheRecipe id: ClothingOuterArmorPlateCarrier @@ -15,3 +15,10 @@ materials: Steel: 500 Plastic: 1000 + +# magboots + +- type: latheRecipe + parent: ClothingShoesBootsMagSci + id: ClothingShoesBootsSecurityMagboots + result: ClothingShoesBootsSecurityMagboots diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/magboots-security.rsi/equipped-FEET.png b/Resources/Textures/DeltaV/Clothing/Shoes/Boots/magboots-security.rsi/equipped-FEET.png new file mode 100644 index 0000000000000..fbac1cafca7de Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Shoes/Boots/magboots-security.rsi/equipped-FEET.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/magboots-security.rsi/icon-on.png b/Resources/Textures/DeltaV/Clothing/Shoes/Boots/magboots-security.rsi/icon-on.png new file mode 100644 index 0000000000000..b3c113328d32a Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Shoes/Boots/magboots-security.rsi/icon-on.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/magboots-security.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Shoes/Boots/magboots-security.rsi/icon.png new file mode 100644 index 0000000000000..e880b14e5f4bd Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Shoes/Boots/magboots-security.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/magboots-security.rsi/inhand-left.png b/Resources/Textures/DeltaV/Clothing/Shoes/Boots/magboots-security.rsi/inhand-left.png new file mode 100644 index 0000000000000..65062eb196141 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Shoes/Boots/magboots-security.rsi/inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/magboots-security.rsi/inhand-right.png b/Resources/Textures/DeltaV/Clothing/Shoes/Boots/magboots-security.rsi/inhand-right.png new file mode 100644 index 0000000000000..51e74bb2af39a Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Shoes/Boots/magboots-security.rsi/inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/magboots-security.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Shoes/Boots/magboots-security.rsi/meta.json new file mode 100644 index 0000000000000..d115962bb96f6 --- /dev/null +++ b/Resources/Textures/DeltaV/Clothing/Shoes/Boots/magboots-security.rsi/meta.json @@ -0,0 +1,41 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from Engineering Magboots from tgstation at commit https://github.com/tgstation/tgstation/commit/7e4e9d432d88981fb9bb463970c5b98ce85c0abe , edited by ProphetCrow (Github)", + "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/DeltaV/Clothing/Shoes/Boots/magboots-security.rsi/on-equipped-FEET.png b/Resources/Textures/DeltaV/Clothing/Shoes/Boots/magboots-security.rsi/on-equipped-FEET.png new file mode 100644 index 0000000000000..323b1a5fa4385 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Shoes/Boots/magboots-security.rsi/on-equipped-FEET.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/magboots-security.rsi/on-inhand-left.png b/Resources/Textures/DeltaV/Clothing/Shoes/Boots/magboots-security.rsi/on-inhand-left.png new file mode 100644 index 0000000000000..2167a4ea55340 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Shoes/Boots/magboots-security.rsi/on-inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/magboots-security.rsi/on-inhand-right.png b/Resources/Textures/DeltaV/Clothing/Shoes/Boots/magboots-security.rsi/on-inhand-right.png new file mode 100644 index 0000000000000..aa018c3f4b10d Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Shoes/Boots/magboots-security.rsi/on-inhand-right.png differ