diff --git a/Resources/Locale/en-US/_strings/research/technologies.ftl b/Resources/Locale/en-US/_strings/research/technologies.ftl index 4c9bce50f76..7966e44a6b4 100644 --- a/Resources/Locale/en-US/_strings/research/technologies.ftl +++ b/Resources/Locale/en-US/_strings/research/technologies.ftl @@ -46,6 +46,7 @@ research-technology-energy-gun = Energy weaponry research-technology-energy-gun-advance = Advanced energy weaponry research-technology-advance-laser = Military-grade energy weaponry research-technology-explosive-mech-ammunition = Explosive Mech Ammunition +research-technology-combat-equipment = Combat equipment research-technology-basic-robotics = Basic Robotics research-technology-basic-anomalous-research = Basic Anomalous Research 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 new file mode 100644 index 00000000000..bbbd20c4492 --- /dev/null +++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/clothing/shoes/magboots.ftl @@ -0,0 +1,4 @@ +ent-ClothingShoesBootsMagCombat = боевые магнитные ботинки + .desc = Боевые магнитные ботинки, часто используемые во время выхода в открытый космос, чтобы гарантировать, что пользователь остается безопасно прикрепленным к станции. +ent-ClothingShoesBootsMagPirate = магнитные ботинки пирата + .desc = Боевые магнитки перекрашенные в пирацкие цвета \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_strings/_sunrise/research/technologies.ftl b/Resources/Locale/ru-RU/_strings/_sunrise/research/technologies.ftl index dbc3db04099..bd17c5d689f 100644 --- a/Resources/Locale/ru-RU/_strings/_sunrise/research/technologies.ftl +++ b/Resources/Locale/ru-RU/_strings/_sunrise/research/technologies.ftl @@ -1,3 +1,4 @@ research-technology-handcraft-nvd = Кустарные ПНВ research-technology-basic-nvd = Продвинутое ПНВ -research-technology-extended-amunitions = Расширенные магазины \ No newline at end of file +research-technology-combat-equipment = Боевое снаряжение +research-technology-extended-amunitions = Расширенные магазины diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml b/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml index 49914b83f88..ab3de31abb7 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml @@ -74,6 +74,7 @@ - id: OxygenTankFilled - id: ClothingOuterHardsuitPirateEVA - id: ClothingMaskGas + - id: ClothingShoesBootsMagPirate #NTSRA Voidsuit - type: entity @@ -260,6 +261,7 @@ - id: OxygenTankFilled - id: ClothingOuterHardsuitPirateCap - id: ClothingMaskGas + - id: ClothingShoesBootsMagPirate #Wizard - type: entity diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 8ced5e8da83..e2dd87fe42e 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -366,6 +366,7 @@ - PowerCageHigh - PowerCageMedium - PowerCageSmall + - ClothingShoesBootsMagCombat # Sunrise-end - type: EmagLatheRecipes emagDynamicRecipes: @@ -960,6 +961,7 @@ - WeaponEnergyGunMini # Sunrise - Miniature Energy Gun - WeaponEnergyGunPistol # Sunrise - PDW-9 Energy Pistol - WeaponGunLaserCarbineAutomatic # Sunrise - IK-60 Laser Carbine + - ClothingShoesBootsMagCombat # Sunrise - Combat Magboots - type: MaterialStorage whitelist: tags: diff --git a/Resources/Prototypes/Roles/Jobs/CentComm/cburn.yml b/Resources/Prototypes/Roles/Jobs/CentComm/cburn.yml index 3f8d07092c6..04738a51eb6 100644 --- a/Resources/Prototypes/Roles/Jobs/CentComm/cburn.yml +++ b/Resources/Prototypes/Roles/Jobs/CentComm/cburn.yml @@ -23,7 +23,7 @@ ears: ClothingHeadsetAltCentCom gloves: ClothingHandsGlovesCombat outerClothing: ClothingOuterHardsuitCBURN - shoes: ClothingShoesBootsCombatFilled + shoes: ClothingShoesBootsMagCombat id: CBURNPDA pocket1: RadioHandheld pocket2: WeaponLaserGun diff --git a/Resources/Prototypes/Roles/Jobs/CentComm/emergencyresponseteam.yml b/Resources/Prototypes/Roles/Jobs/CentComm/emergencyresponseteam.yml index 2286179ab17..dd5b3e29367 100644 --- a/Resources/Prototypes/Roles/Jobs/CentComm/emergencyresponseteam.yml +++ b/Resources/Prototypes/Roles/Jobs/CentComm/emergencyresponseteam.yml @@ -287,7 +287,7 @@ equipment: jumpsuit: ClothingUniformJumpsuitERTSecurity back: ClothingBackpackERTSecurity - shoes: ClothingShoesBootsMag + shoes: ClothingShoesBootsMagCombat mask: ClothingMaskGasERT eyes: ClothingEyesGlassesSecurity gloves: ClothingHandsGlovesCombat @@ -311,7 +311,7 @@ equipment: jumpsuit: ClothingUniformJumpsuitERTSecurity back: ClothingBackpackERTSecurity - shoes: ClothingShoesBootsMag + shoes: ClothingShoesBootsMagCombat mask: ClothingMaskGasERT eyes: ClothingEyesGlassesSecurity gloves: ClothingHandsGlovesCombat @@ -376,7 +376,7 @@ equipment: jumpsuit: ClothingUniformJumpsuitERTMedic back: ClothingBackpackERTMedical - shoes: ClothingShoesBootsMag + shoes: ClothingShoesBootsMagCombat mask: ClothingMaskGasERT eyes: ClothingEyesHudMedical gloves: ClothingHandsGlovesNitrile @@ -437,7 +437,7 @@ equipment: jumpsuit: ClothingUniformJumpsuitERTJanitor back: ClothingBackpackERTJanitor - shoes: ClothingShoesBootsMag + shoes: ClothingShoesBootsMagCombat mask: ClothingMaskGasERT gloves: ClothingHandsGlovesColorPurple outerClothing: ClothingOuterHardsuitERTJanitor diff --git a/Resources/Prototypes/_Sunrise/Entities/Clothing/Shoes/magboots.yml b/Resources/Prototypes/_Sunrise/Entities/Clothing/Shoes/magboots.yml new file mode 100644 index 00000000000..6eb4dd1c4c6 --- /dev/null +++ b/Resources/Prototypes/_Sunrise/Entities/Clothing/Shoes/magboots.yml @@ -0,0 +1,30 @@ +- type: entity + parent: [ClothingShoesBootsMag, ClothingShoesBootsCombat, BaseSecurityContraband] + id: ClothingShoesBootsMagCombat + name: combat magboots + description: Combat 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-combat.rsi + state: icon + - type: Clothing + sprite: _Sunrise/Clothing/Shoes/magboots-combat.rsi + - type: Magboots + - type: ClothingSpeedModifier + walkModifier: 0.95 + sprintModifier: 0.9 + - type: ClothingSlowOnDamageModifier + modifier: 0.5 + +- type: entity + parent: ClothingShoesBootsMagCombat + id: ClothingShoesBootsMagPirate + name: pirate magboots + description: Repainted combat magnets to match the colors of pirates. + components: + - type: Sprite + sprite: _Sunrise/Clothing/Shoes/magboots-pirate.rsi + state: icon + - type: Clothing + sprite: _Sunrise/Clothing/Shoes/magboots-pirate.rsi + - type: Magboots \ No newline at end of file diff --git a/Resources/Prototypes/_Sunrise/Recipes/Lathes/security.yml b/Resources/Prototypes/_Sunrise/Recipes/Lathes/security.yml index a919bb21d05..e15b9d202ea 100644 --- a/Resources/Prototypes/_Sunrise/Recipes/Lathes/security.yml +++ b/Resources/Prototypes/_Sunrise/Recipes/Lathes/security.yml @@ -318,3 +318,14 @@ Steel: 3000 Glass: 1500 Plastic: 300 + +- type: latheRecipe + id: ClothingShoesBootsMagCombat + result: ClothingShoesBootsMagCombat + category: Weapons + completetime: 12 + materials: + Steel: 1500 + Plastic: 500 + Plasma: 300 + Silver: 200 diff --git a/Resources/Prototypes/_Sunrise/Research/arsenal.yml b/Resources/Prototypes/_Sunrise/Research/arsenal.yml index d9f6c32cfdf..288a8083021 100644 --- a/Resources/Prototypes/_Sunrise/Research/arsenal.yml +++ b/Resources/Prototypes/_Sunrise/Research/arsenal.yml @@ -50,6 +50,18 @@ recipeUnlocks: - WeaponEnergyGunPistol +- type: technology + id: CombatEquipment + name: research-technology-combat-equipment # + icon: + sprite: _Sunrise/Clothing/Shoes/magboots-combat.rsi + state: icon + discipline: Arsenal + tier: 2 + cost: 7500 + recipeUnlocks: + - ClothingShoesBootsMagCombat + - type: technology id: Advanced Laser Manipulation name: research-technology-advance-laser # diff --git a/Resources/Textures/_Sunrise/Clothing/Shoes/magboots-combat.rsi/equipped-FEET.png b/Resources/Textures/_Sunrise/Clothing/Shoes/magboots-combat.rsi/equipped-FEET.png new file mode 100644 index 00000000000..9219f6fe609 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Shoes/magboots-combat.rsi/equipped-FEET.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Shoes/magboots-combat.rsi/icon-on.png b/Resources/Textures/_Sunrise/Clothing/Shoes/magboots-combat.rsi/icon-on.png new file mode 100644 index 00000000000..bdc5318d157 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Shoes/magboots-combat.rsi/icon-on.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Shoes/magboots-combat.rsi/icon.png b/Resources/Textures/_Sunrise/Clothing/Shoes/magboots-combat.rsi/icon.png new file mode 100644 index 00000000000..76157f4e212 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Shoes/magboots-combat.rsi/icon.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Shoes/magboots-combat.rsi/inhand-left.png b/Resources/Textures/_Sunrise/Clothing/Shoes/magboots-combat.rsi/inhand-left.png new file mode 100644 index 00000000000..f24e0cf0ef9 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Shoes/magboots-combat.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Shoes/magboots-combat.rsi/inhand-right.png b/Resources/Textures/_Sunrise/Clothing/Shoes/magboots-combat.rsi/inhand-right.png new file mode 100644 index 00000000000..4997e0fdea0 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Shoes/magboots-combat.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Shoes/magboots-combat.rsi/meta.json b/Resources/Textures/_Sunrise/Clothing/Shoes/magboots-combat.rsi/meta.json new file mode 100644 index 00000000000..a7e695cf008 --- /dev/null +++ b/Resources/Textures/_Sunrise/Clothing/Shoes/magboots-combat.rsi/meta.json @@ -0,0 +1,41 @@ +{ + "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": "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-combat.rsi/on-equipped-FEET.png b/Resources/Textures/_Sunrise/Clothing/Shoes/magboots-combat.rsi/on-equipped-FEET.png new file mode 100644 index 00000000000..934c155eb53 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Shoes/magboots-combat.rsi/on-equipped-FEET.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Shoes/magboots-combat.rsi/on-inhand-left.png b/Resources/Textures/_Sunrise/Clothing/Shoes/magboots-combat.rsi/on-inhand-left.png new file mode 100644 index 00000000000..4e754a4314d Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Shoes/magboots-combat.rsi/on-inhand-left.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Shoes/magboots-combat.rsi/on-inhand-right.png b/Resources/Textures/_Sunrise/Clothing/Shoes/magboots-combat.rsi/on-inhand-right.png new file mode 100644 index 00000000000..4a8c25be7e9 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Shoes/magboots-combat.rsi/on-inhand-right.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Shoes/magboots-pirate.rsi/equipped-FEET.png b/Resources/Textures/_Sunrise/Clothing/Shoes/magboots-pirate.rsi/equipped-FEET.png new file mode 100644 index 00000000000..6b99854adbb Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Shoes/magboots-pirate.rsi/equipped-FEET.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Shoes/magboots-pirate.rsi/icon-on.png b/Resources/Textures/_Sunrise/Clothing/Shoes/magboots-pirate.rsi/icon-on.png new file mode 100644 index 00000000000..0454ae67b0c Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Shoes/magboots-pirate.rsi/icon-on.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Shoes/magboots-pirate.rsi/icon.png b/Resources/Textures/_Sunrise/Clothing/Shoes/magboots-pirate.rsi/icon.png new file mode 100644 index 00000000000..75fbae54a6e Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Shoes/magboots-pirate.rsi/icon.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Shoes/magboots-pirate.rsi/inhand-left.png b/Resources/Textures/_Sunrise/Clothing/Shoes/magboots-pirate.rsi/inhand-left.png new file mode 100644 index 00000000000..c9693883426 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Shoes/magboots-pirate.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Shoes/magboots-pirate.rsi/inhand-right.png b/Resources/Textures/_Sunrise/Clothing/Shoes/magboots-pirate.rsi/inhand-right.png new file mode 100644 index 00000000000..23e34c9adef Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Shoes/magboots-pirate.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Shoes/magboots-pirate.rsi/meta.json b/Resources/Textures/_Sunrise/Clothing/Shoes/magboots-pirate.rsi/meta.json new file mode 100644 index 00000000000..a7e695cf008 --- /dev/null +++ b/Resources/Textures/_Sunrise/Clothing/Shoes/magboots-pirate.rsi/meta.json @@ -0,0 +1,41 @@ +{ + "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": "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-pirate.rsi/on-equipped-FEET.png b/Resources/Textures/_Sunrise/Clothing/Shoes/magboots-pirate.rsi/on-equipped-FEET.png new file mode 100644 index 00000000000..3e547f13921 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Shoes/magboots-pirate.rsi/on-equipped-FEET.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Shoes/magboots-pirate.rsi/on-inhand-left.png b/Resources/Textures/_Sunrise/Clothing/Shoes/magboots-pirate.rsi/on-inhand-left.png new file mode 100644 index 00000000000..4553ebde7ff Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Shoes/magboots-pirate.rsi/on-inhand-left.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Shoes/magboots-pirate.rsi/on-inhand-right.png b/Resources/Textures/_Sunrise/Clothing/Shoes/magboots-pirate.rsi/on-inhand-right.png new file mode 100644 index 00000000000..a19291ef60a Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Shoes/magboots-pirate.rsi/on-inhand-right.png differ