diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml index 20112910922..fcd0be9133e 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml @@ -317,6 +317,7 @@ - id: ClothingLongcoatHoS # Floofstation - id: ClothingMaskNeckGaiter - id: ClothingOuterHardsuitCombatHoS # DeltaV - ClothingOuterHardsuitSecurityRed replaced in favour of head of security's advanced combat hardsuit. + - id: ClothingShoesBootsSecurityMagboots # Floofstation - id: ClothingBeltSecurityFilled - id: ClothingHeadsetAltSecurity - id: ClothingEyesGlassesSunglasses diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml index 918a3d4978e..09be3ad74fc 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml @@ -20,6 +20,7 @@ - id: RubberStampWarden - id: DoorRemoteArmory - id: ClothingOuterHardsuitCombatWarden # DeltaV - ClothingOuterHardsuitWarden replaced in favour of warden's riot combat hardsuit. + - id: ClothingShoesBootsSecurityMagboots # Floofstation - id: HoloprojectorSecurity - id: ClothingEyesHudSecurity - id: BoxPDAPrisoner # Delta-V @@ -155,6 +156,7 @@ - id: TrackingImplanter amount: 2 - id: ClothingOuterHardsuitCombatCorpsman + - id: ClothingShoesBootsSecurityMagboots #Floofstation - id: ClothingUniformJumpsuitBrigmedic - id: ClothingUniformJumpskirtBrigmedic - id: ClothingLongcoatBrigmedic # Floofstation diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml b/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml index 734bd485a2e..35e078c715a 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml @@ -140,6 +140,7 @@ contents: - id: OxygenTankFilled - id: ClothingOuterHardsuitCombatOfficer # DeltaV - ClothingOuterHardsuitSecurity replaced in favour of security combat hardsuit. + - id: ClothingShoesBootsSecurityMagboots # Floofstation - id: ClothingMaskBreath - type: AccessReader access: [["Security"]] @@ -199,6 +200,7 @@ - id: OxygenTankFilled - id: JetpackSecurityFilled - id: ClothingOuterHardsuitCombatHoS # DeltaV - ClothingOuterHardsuitSecurityRed replaced in favour of head of security's advanced combat hardsuit. + - id: ClothingShoesBootsSecurityMagboots # Floofstation - id: ClothingMaskGasSwat - type: AccessReader access: [["HeadOfSecurity"]] @@ -213,6 +215,7 @@ contents: - id: OxygenTankFilled - id: ClothingOuterHardsuitCombatWarden # DeltaV - ClothingOuterHardsuitWarden replaced in favour of warden's riot combat hardsuit. + - id: ClothingShoesBootsSecurityMagboots # Floofstation - id: ClothingMaskBreath - type: AccessReader access: [["Armory"]] @@ -273,6 +276,7 @@ - id: NitrogenTankFilled - id: OxygenTankFilled - id: ClothingOuterHardsuitCombatCorpsman + - id: ClothingShoesBootsSecurityMagboots # Floofstation - id: ClothingMaskBreath - type: AccessReader access: [ [ "Corpsman" ] ] diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 3722a954bbe..a242e2f6856 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -905,7 +905,7 @@ - MagazineBoxSpecialIncendiary - MagazineBoxSpecialUranium - MagazineBoxSpecialMindbreaker - - ClothingShoesBootsMagCom #Floof + - ClothingShoesBootsSecurityMagboots # Floofstation - type: MaterialStorage whitelist: tags: diff --git a/Resources/Prototypes/Floof/Entities/Clothing/Shoes/Combatmags.yml b/Resources/Prototypes/Floof/Entities/Clothing/Shoes/Combatmags.yml deleted file mode 100644 index eabecb6c6ec..00000000000 --- a/Resources/Prototypes/Floof/Entities/Clothing/Shoes/Combatmags.yml +++ /dev/null @@ -1,21 +0,0 @@ -- 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/Entities/Clothing/Shoes/magboots.yml b/Resources/Prototypes/Floof/Entities/Clothing/Shoes/magboots.yml new file mode 100644 index 00000000000..67476048675 --- /dev/null +++ b/Resources/Prototypes/Floof/Entities/Clothing/Shoes/magboots.yml @@ -0,0 +1,10 @@ +- type: entity + parent: ClothingShoesBootsMag + 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: Floof/Clothing/Shoes/Boots/magboots-security.rsi + - type: Clothing + sprite: Floof/Clothing/Shoes/Boots/magboots-security.rsi diff --git a/Resources/Prototypes/Floof/Recipes/Lathes/security.yml b/Resources/Prototypes/Floof/Recipes/Lathes/security.yml index 06da83ee941..1c0b9eb9a53 100644 --- a/Resources/Prototypes/Floof/Recipes/Lathes/security.yml +++ b/Resources/Prototypes/Floof/Recipes/Lathes/security.yml @@ -15,10 +15,9 @@ Steel: 210 - type: latheRecipe - id: ClothingShoesBootsMagCom - result: ClothingShoesBootsMagCom - completetime: 10 + parent: ClothingShoesBootsMagSci + id: ClothingShoesBootsSecurityMagboots + result: ClothingShoesBootsSecurityMagboots materials: - Steel: 1000 - Plastic: 500 - Silver: 250 + Steel: 1000 + Plastic: 500 diff --git a/Resources/Prototypes/Research/experimental.yml b/Resources/Prototypes/Research/experimental.yml index 8df1bce4af4..279dd68e079 100644 --- a/Resources/Prototypes/Research/experimental.yml +++ b/Resources/Prototypes/Research/experimental.yml @@ -69,7 +69,7 @@ cost: 7500 recipeUnlocks: - ClothingShoesBootsMagSci - - ClothingShoesBootsMagCom #Floof + - ClothingShoesBootsSecurityMagboots #Floofstation - 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 deleted file mode 100644 index 66083b253d4..00000000000 Binary files a/Resources/Textures/Floof/Clothing/Shoes/Boots/combatMagboots.rsi/equipped-FEET-vox.png and /dev/null 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 deleted file mode 100644 index 9219f6fe609..00000000000 Binary files a/Resources/Textures/Floof/Clothing/Shoes/Boots/combatMagboots.rsi/equipped-FEET.png and /dev/null 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 deleted file mode 100644 index bdc5318d157..00000000000 Binary files a/Resources/Textures/Floof/Clothing/Shoes/Boots/combatMagboots.rsi/icon-on.png and /dev/null 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 deleted file mode 100644 index 76157f4e212..00000000000 Binary files a/Resources/Textures/Floof/Clothing/Shoes/Boots/combatMagboots.rsi/icon.png and /dev/null 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 deleted file mode 100644 index f24e0cf0ef9..00000000000 Binary files a/Resources/Textures/Floof/Clothing/Shoes/Boots/combatMagboots.rsi/inhand-left.png and /dev/null 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 deleted file mode 100644 index 4997e0fdea0..00000000000 Binary files a/Resources/Textures/Floof/Clothing/Shoes/Boots/combatMagboots.rsi/inhand-right.png and /dev/null 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 deleted file mode 100644 index f81ea97bec5..00000000000 --- a/Resources/Textures/Floof/Clothing/Shoes/Boots/combatMagboots.rsi/meta.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "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 deleted file mode 100644 index e9d3dffc764..00000000000 Binary files a/Resources/Textures/Floof/Clothing/Shoes/Boots/combatMagboots.rsi/on-equipped-FEET-vox.png and /dev/null 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 deleted file mode 100644 index 934c155eb53..00000000000 Binary files a/Resources/Textures/Floof/Clothing/Shoes/Boots/combatMagboots.rsi/on-equipped-FEET.png and /dev/null 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 deleted file mode 100644 index 4e754a4314d..00000000000 Binary files a/Resources/Textures/Floof/Clothing/Shoes/Boots/combatMagboots.rsi/on-inhand-left.png and /dev/null 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 deleted file mode 100644 index 4a8c25be7e9..00000000000 Binary files a/Resources/Textures/Floof/Clothing/Shoes/Boots/combatMagboots.rsi/on-inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Floof/Clothing/Shoes/Boots/magboots-security.rsi/equipped-FEET.png b/Resources/Textures/Floof/Clothing/Shoes/Boots/magboots-security.rsi/equipped-FEET.png new file mode 100644 index 00000000000..fbac1cafca7 Binary files /dev/null and b/Resources/Textures/Floof/Clothing/Shoes/Boots/magboots-security.rsi/equipped-FEET.png differ diff --git a/Resources/Textures/Floof/Clothing/Shoes/Boots/magboots-security.rsi/icon-on.png b/Resources/Textures/Floof/Clothing/Shoes/Boots/magboots-security.rsi/icon-on.png new file mode 100644 index 00000000000..b3c113328d3 Binary files /dev/null and b/Resources/Textures/Floof/Clothing/Shoes/Boots/magboots-security.rsi/icon-on.png differ diff --git a/Resources/Textures/Floof/Clothing/Shoes/Boots/magboots-security.rsi/icon.png b/Resources/Textures/Floof/Clothing/Shoes/Boots/magboots-security.rsi/icon.png new file mode 100644 index 00000000000..e880b14e5f4 Binary files /dev/null and b/Resources/Textures/Floof/Clothing/Shoes/Boots/magboots-security.rsi/icon.png differ diff --git a/Resources/Textures/Floof/Clothing/Shoes/Boots/magboots-security.rsi/inhand-left.png b/Resources/Textures/Floof/Clothing/Shoes/Boots/magboots-security.rsi/inhand-left.png new file mode 100644 index 00000000000..65062eb1961 Binary files /dev/null and b/Resources/Textures/Floof/Clothing/Shoes/Boots/magboots-security.rsi/inhand-left.png differ diff --git a/Resources/Textures/Floof/Clothing/Shoes/Boots/magboots-security.rsi/inhand-right.png b/Resources/Textures/Floof/Clothing/Shoes/Boots/magboots-security.rsi/inhand-right.png new file mode 100644 index 00000000000..51e74bb2af3 Binary files /dev/null and b/Resources/Textures/Floof/Clothing/Shoes/Boots/magboots-security.rsi/inhand-right.png differ diff --git a/Resources/Textures/Floof/Clothing/Shoes/Boots/magboots-security.rsi/meta.json b/Resources/Textures/Floof/Clothing/Shoes/Boots/magboots-security.rsi/meta.json new file mode 100644 index 00000000000..70f56f2df64 --- /dev/null +++ b/Resources/Textures/Floof/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/Floof/Clothing/Shoes/Boots/magboots-security.rsi/on-equipped-FEET.png b/Resources/Textures/Floof/Clothing/Shoes/Boots/magboots-security.rsi/on-equipped-FEET.png new file mode 100644 index 00000000000..323b1a5fa43 Binary files /dev/null and b/Resources/Textures/Floof/Clothing/Shoes/Boots/magboots-security.rsi/on-equipped-FEET.png differ diff --git a/Resources/Textures/Floof/Clothing/Shoes/Boots/magboots-security.rsi/on-inhand-left.png b/Resources/Textures/Floof/Clothing/Shoes/Boots/magboots-security.rsi/on-inhand-left.png new file mode 100644 index 00000000000..2167a4ea553 Binary files /dev/null and b/Resources/Textures/Floof/Clothing/Shoes/Boots/magboots-security.rsi/on-inhand-left.png differ diff --git a/Resources/Textures/Floof/Clothing/Shoes/Boots/magboots-security.rsi/on-inhand-right.png b/Resources/Textures/Floof/Clothing/Shoes/Boots/magboots-security.rsi/on-inhand-right.png new file mode 100644 index 00000000000..aa018c3f4b1 Binary files /dev/null and b/Resources/Textures/Floof/Clothing/Shoes/Boots/magboots-security.rsi/on-inhand-right.png differ