diff --git a/Resources/Locale/en-US/_prototypes/_sunrise/entities/clothing/shoes/magboots.ftl b/Resources/Locale/en-US/_prototypes/_sunrise/entities/clothing/shoes/magboots.ftl index 689f8fca1a5..cb83365b9c4 100644 --- a/Resources/Locale/en-US/_prototypes/_sunrise/entities/clothing/shoes/magboots.ftl +++ b/Resources/Locale/en-US/_prototypes/_sunrise/entities/clothing/shoes/magboots.ftl @@ -2,3 +2,5 @@ ent-ClothingShoesBootsMagCombat = combat magboots .desc = Combat magnetic boots, often used during extravehicular activity to ensure the user remains safely attached to the vehicle. ent-ClothingShoesBootsMagPirate = pirate magboots .desc = Repainted combat magnets to match the colors of pirates. +ent-ClothingShoesBootsMagSec = security magboots + .desc =Security magnetic boots, often used during extravehicular activity to ensure the user remains safely attached to the vehicle. diff --git a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/clothing/shoes/magboots.ftl b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/clothing/shoes/magboots.ftl index 8223c7e06a8..67b57711762 100644 --- a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/clothing/shoes/magboots.ftl +++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/clothing/shoes/magboots.ftl @@ -2,3 +2,5 @@ ent-ClothingShoesBootsMagCombat = боевые магнитные ботинки .desc = Боевые магнитные ботинки, часто используемые во время выхода в открытый космос, чтобы гарантировать, что пользователь остается безопасно прикрепленным к станции. ent-ClothingShoesBootsMagPirate = магнитные ботинки пирата .desc = Боевые магнитки перекрашенные в пирацкие цвета +ent-ClothingShoesBootsMagSec = магнитные ботинки СБ + .desc = Стандартные магнитки перекрашенные в цвет СБ diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml index b8b04206540..e7e6a92eec2 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml @@ -360,6 +360,7 @@ children: - id: ClothingMaskGasSwat - id: ClothingOuterHardsuitSecurityRed + - id: ClothingShoesBootsMagSec # Sunrise-edit - id: JetpackSecurityFilled - id: OxygenTankFilled diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml b/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml index ab3de31abb7..addb3ee1012 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml @@ -142,6 +142,8 @@ - id: OxygenTankFilled - id: ClothingOuterHardsuitSecurity - id: ClothingMaskBreath + - id: ClothingShoesBootsMagSec # Sunrise-edit + prob: 0.75 - type: AccessReader access: [["Security"]] @@ -208,6 +210,7 @@ - id: OxygenTankFilled - id: ClothingOuterHardsuitWarden - id: ClothingMaskBreath + - id: ClothingShoesBootsMagSec # Sunrise-edit - type: AccessReader access: [["Armory"]] diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/specific.yml b/Resources/Prototypes/Entities/Clothing/Shoes/specific.yml index 195425c5eea..b1cb4772c9f 100644 --- a/Resources/Prototypes/Entities/Clothing/Shoes/specific.yml +++ b/Resources/Prototypes/Entities/Clothing/Shoes/specific.yml @@ -151,10 +151,7 @@ sprite: Clothing/Shoes/Specific/swat.rsi # Sunrise-Start - type: ClothingSlowOnDamageModifier - modifier: 0.5 - - type: ClothingSpeedModifier - walkModifier: 0.90 - sprintModifier: 0.90 + modifier: 0.45 # Sunrise-End - type: entity diff --git a/Resources/Prototypes/Roles/Jobs/CentComm/emergencyresponseteam.yml b/Resources/Prototypes/Roles/Jobs/CentComm/emergencyresponseteam.yml index 87b707bad3b..7dd29538ad0 100644 --- a/Resources/Prototypes/Roles/Jobs/CentComm/emergencyresponseteam.yml +++ b/Resources/Prototypes/Roles/Jobs/CentComm/emergencyresponseteam.yml @@ -19,7 +19,7 @@ equipment: jumpsuit: ClothingUniformJumpsuitERTLeader back: ClothingBackpackERTLeader - shoes: ClothingShoesSwat # Sunrise-edit + shoes: ClothingShoesBootsMagSec # Sunrise-edit head: ClothingHeadEVAHelmetERTLeader # Sunrise-edit eyes: ClothingEyesGlassesSecurity gloves: ClothingHandsGlovesCombat @@ -118,7 +118,7 @@ equipment: jumpsuit: ClothingUniformJumpsuitERTChaplain back: ClothingBackpackERTChaplain - shoes: ClothingShoesSwat # Sunrise-edit + shoes: ClothingShoesBootsMagSec # Sunrise-edit head: ClothingHeadEVAHelmetERTChaplain # Sunrise-edit eyes: ClothingEyesHudMedSec # Sunrise-edit neck: ClothingNeckStoleChaplain @@ -264,7 +264,7 @@ equipment: jumpsuit: ClothingUniformJumpsuitERTSecurity back: ClothingBackpackERTSecurity - shoes: ClothingShoesSwat # Sunrise-edit + shoes: ClothingShoesBootsMagSec # Sunrise-edit head: ClothingHeadEVAHelmetERTSecurity # Sunrise-edit eyes: ClothingEyesGlassesSecurity gloves: ClothingHandsGlovesCombat @@ -354,7 +354,7 @@ equipment: jumpsuit: ClothingUniformJumpsuitERTMedic back: ClothingBackpackERTMedical - shoes: ClothingShoesSwat # Sunrise-edit + shoes: ClothingShoesBootsMagSec # Sunrise-edit head: ClothingHeadEVAHelmetERTMedic # Sunrise-edit eyes: ClothingEyesHudMedSec # Sunrise-edit gloves: ClothingHandsGlovesCombat # Sunrise-edit @@ -369,6 +369,7 @@ - Hypospray #- MedkitAdvancedFilled # Sunrise-edit - CrowbarRed + - LauncherSyringePistol - OmnizineChemistryBottle - EpinephrineChemistryBottle - EpinephrineChemistryBottle diff --git a/Resources/Prototypes/_Sunrise/Catalog/Fills/Lockers/suit_storage.yml b/Resources/Prototypes/_Sunrise/Catalog/Fills/Lockers/suit_storage.yml index 0c0bebb77fb..b6711ef3ed3 100644 --- a/Resources/Prototypes/_Sunrise/Catalog/Fills/Lockers/suit_storage.yml +++ b/Resources/Prototypes/_Sunrise/Catalog/Fills/Lockers/suit_storage.yml @@ -8,5 +8,6 @@ - id: OxygenTankFilled - id: ClothingOuterHardsuitBlueshield - id: ClothingMaskGas + - id: ClothingShoesBootsMagSec - type: AccessReader access: [["BlueShield"]] diff --git a/Resources/Prototypes/_Sunrise/Entities/Clothing/Shoes/magboots.yml b/Resources/Prototypes/_Sunrise/Entities/Clothing/Shoes/magboots.yml index 6eb4dd1c4c6..9c4d0e45f6b 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Clothing/Shoes/magboots.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Clothing/Shoes/magboots.yml @@ -27,4 +27,19 @@ state: icon - type: Clothing sprite: _Sunrise/Clothing/Shoes/magboots-pirate.rsi - - type: Magboots \ No newline at end of file + - type: Magboots + +- type: entity + parent: [ClothingShoesBootsMag, BaseSecurityContraband] + id: ClothingShoesBootsMagSec + name: Security magboots + description: Security magnetic boots, often used during extravehicular activity to ensure the user remains safely attached to the vehicle. + components: + - type: Sprite + sprite: _Sunrise/Clothing/Shoes/magboots-sec.rsi + state: icon + - type: Clothing + sprite: _Sunrise/Clothing/Shoes/magboots-sec.rsi + - type: Magboots + - type: ClothingSlowOnDamageModifier + modifier: 0.75 \ No newline at end of file diff --git a/Resources/Textures/_Sunrise/Clothing/Shoes/magboots-sec.rsi/equipped-FEET-vox.png b/Resources/Textures/_Sunrise/Clothing/Shoes/magboots-sec.rsi/equipped-FEET-vox.png new file mode 100644 index 00000000000..aec59af6bcb Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Shoes/magboots-sec.rsi/equipped-FEET-vox.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Shoes/magboots-sec.rsi/equipped-FEET.png b/Resources/Textures/_Sunrise/Clothing/Shoes/magboots-sec.rsi/equipped-FEET.png new file mode 100644 index 00000000000..92009d5a5eb Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Shoes/magboots-sec.rsi/equipped-FEET.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Shoes/magboots-sec.rsi/icon-on.png b/Resources/Textures/_Sunrise/Clothing/Shoes/magboots-sec.rsi/icon-on.png new file mode 100644 index 00000000000..7a3d7644e1c Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Shoes/magboots-sec.rsi/icon-on.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Shoes/magboots-sec.rsi/icon.png b/Resources/Textures/_Sunrise/Clothing/Shoes/magboots-sec.rsi/icon.png new file mode 100644 index 00000000000..5fb83df159f Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Shoes/magboots-sec.rsi/icon.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Shoes/magboots-sec.rsi/inhand-left.png b/Resources/Textures/_Sunrise/Clothing/Shoes/magboots-sec.rsi/inhand-left.png new file mode 100644 index 00000000000..0377bf9ff4c Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Shoes/magboots-sec.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Shoes/magboots-sec.rsi/inhand-right.png b/Resources/Textures/_Sunrise/Clothing/Shoes/magboots-sec.rsi/inhand-right.png new file mode 100644 index 00000000000..cd79b9da474 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Shoes/magboots-sec.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Shoes/magboots-sec.rsi/meta.json b/Resources/Textures/_Sunrise/Clothing/Shoes/magboots-sec.rsi/meta.json new file mode 100644 index 00000000000..2ad13434884 --- /dev/null +++ b/Resources/Textures/_Sunrise/Clothing/Shoes/magboots-sec.rsi/meta.json @@ -0,0 +1,49 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Edit by Conflee of Syndicate Magboots, make by tgstation https://github.com/tgstation/tgstation/commit/debf90acfcafa4fb8d6723a37e0b8ac556c0702b. equipped-FEET-vox & on-equipped-FEET-vox state taken from vgstation13 at https://github.com/vgstation-coders/vgstation13/blob/31d6576ba8102135d058ef49c3cb6ecbe8db8a79/icons/mob/species/vox/shoes.dmi, and equipped-FEET-vox state modified to fix inconsistencies", + "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/_Sunrise/Clothing/Shoes/magboots-sec.rsi/on-equipped-FEET-vox.png b/Resources/Textures/_Sunrise/Clothing/Shoes/magboots-sec.rsi/on-equipped-FEET-vox.png new file mode 100644 index 00000000000..ebed5000cd9 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Shoes/magboots-sec.rsi/on-equipped-FEET-vox.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Shoes/magboots-sec.rsi/on-equipped-FEET.png b/Resources/Textures/_Sunrise/Clothing/Shoes/magboots-sec.rsi/on-equipped-FEET.png new file mode 100644 index 00000000000..8edb539e3d3 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Shoes/magboots-sec.rsi/on-equipped-FEET.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Shoes/magboots-sec.rsi/on-inhand-left.png b/Resources/Textures/_Sunrise/Clothing/Shoes/magboots-sec.rsi/on-inhand-left.png new file mode 100644 index 00000000000..f78eaac1df1 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Shoes/magboots-sec.rsi/on-inhand-left.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Shoes/magboots-sec.rsi/on-inhand-right.png b/Resources/Textures/_Sunrise/Clothing/Shoes/magboots-sec.rsi/on-inhand-right.png new file mode 100644 index 00000000000..9bc2f1768dd Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Shoes/magboots-sec.rsi/on-inhand-right.png differ