diff --git a/Resources/Audio/Corvax/Weapons/Guns/Gunshots/pulse.ogg b/Resources/Audio/Corvax/Weapons/Guns/Gunshots/pulse.ogg new file mode 100644 index 00000000000..5c489359254 Binary files /dev/null and b/Resources/Audio/Corvax/Weapons/Guns/Gunshots/pulse.ogg differ diff --git a/Resources/Audio/Corvax/Weapons/Guns/Gunshots/pulse2.ogg b/Resources/Audio/Corvax/Weapons/Guns/Gunshots/pulse2.ogg new file mode 100644 index 00000000000..f43def42bf3 Binary files /dev/null and b/Resources/Audio/Corvax/Weapons/Guns/Gunshots/pulse2.ogg differ diff --git a/Resources/Audio/Corvax/Weapons/Guns/Gunshots/pulse3.ogg b/Resources/Audio/Corvax/Weapons/Guns/Gunshots/pulse3.ogg new file mode 100644 index 00000000000..96c7b29d160 Binary files /dev/null and b/Resources/Audio/Corvax/Weapons/Guns/Gunshots/pulse3.ogg differ diff --git a/Resources/Locale/ru-RU/clothing/hardsuits.ftl b/Resources/Locale/ru-RU/clothing/hardsuits.ftl new file mode 100644 index 00000000000..7f1d05c632d --- /dev/null +++ b/Resources/Locale/ru-RU/clothing/hardsuits.ftl @@ -0,0 +1 @@ +clothing-hardsuits-jetpack = Джетпак diff --git a/Resources/Locale/ru-RU/research/technologies.ftl b/Resources/Locale/ru-RU/research/technologies.ftl index dedadc2d66d..1d0659ec28e 100644 --- a/Resources/Locale/ru-RU/research/technologies.ftl +++ b/Resources/Locale/ru-RU/research/technologies.ftl @@ -72,4 +72,6 @@ research-technology-surgical-tools = Хирургические инструме research-technology-virology = Вирусология research-technology-chemical-dispensary = Химический раздатчик research-technology-crew-monitoring = Мониторинг экипажа -research-technology-advanced-salvage = Продвинутое утилизаторское снаряжение +research-technology-advanced-salvage = Продвинутое утилизаторское вооружение +research-technology-advanced-jet-boots = Продвинутые реактивные ботинки +research-technology-advanced-salvage-equipment = Продвинутое утилизаторское снаряжение \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/objects/weapons/guns/salvage/magmiteplasmacutter.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/objects/weapons/guns/salvage/magmiteplasmacutter.ftl new file mode 100644 index 00000000000..2bd4792d5b9 --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/objects/weapons/guns/salvage/magmiteplasmacutter.ftl @@ -0,0 +1,3 @@ +ent-BulletMagmaPlasmacutterCharge = плазменный заряд +ent-WeaponMagmitePlasmaCutter = магмитовый плазменный резак + .desc = Магмитовая версия обычного плазменного резака. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/objects/weapons/melee/magmitecrushers.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/objects/weapons/melee/magmitecrushers.ftl index c0aae5d17f1..8e749851adc 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/objects/weapons/melee/magmitecrushers.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/objects/weapons/melee/magmitecrushers.ftl @@ -1,6 +1,6 @@ -ent-BulletMagnaCharge = магмитовый снаряд +ent-BulletMagmaCharge = магмитовый снаряд .desc = Помечает цели для нанесения повышенного урона. -ent-WeaponMagmiteCrusher = { ent-WeaponCrusher } +ent-WeaponMagmiteCrusher = магмитовый крушитель .desc = { ent-WeaponCrusher.desc } ent-WeaponMagmiteCrusherGlaive = магмитовая глефа .desc = Ранняя версия протокинетического ускорителя в виде глефы. diff --git a/Resources/Prototypes/Corvax/Entities/Objects/Tools/jetpacks.yml b/Resources/Prototypes/Corvax/Entities/Objects/Tools/jetpacks.yml index f23302858ec..c986bf7ae4d 100644 --- a/Resources/Prototypes/Corvax/Entities/Objects/Tools/jetpacks.yml +++ b/Resources/Prototypes/Corvax/Entities/Objects/Tools/jetpacks.yml @@ -12,6 +12,9 @@ slots: - Back - suitStorage + - type: Tag + tags: + - Jetpack # Filled blue - type: entity diff --git a/Resources/Prototypes/Corvax/Entities/Objects/Weapons/Guns/Projectiles/impacts.yml b/Resources/Prototypes/Corvax/Entities/Objects/Weapons/Guns/Projectiles/impacts.yml new file mode 100644 index 00000000000..2241907498a --- /dev/null +++ b/Resources/Prototypes/Corvax/Entities/Objects/Weapons/Guns/Projectiles/impacts.yml @@ -0,0 +1,17 @@ +- type: entity + id: BulletImpactEffectPlasma + noSpawn: true + components: + - type: TimedDespawn + lifetime: 0.2 + - type: Sprite + drawdepth: Effects + layers: + - shader: unshaded + map: ["enum.EffectLayers.Unshaded"] + sprite: Corvax/Effects/arcs.rsi + state: magma + - type: EffectVisuals + - type: Tag + tags: + - HideContextMenu diff --git a/Resources/Prototypes/Corvax/Entities/Objects/Weapons/Guns/Projectiles/magic.yml b/Resources/Prototypes/Corvax/Entities/Objects/Weapons/Guns/Projectiles/magic.yml new file mode 100644 index 00000000000..a941c87e6b7 --- /dev/null +++ b/Resources/Prototypes/Corvax/Entities/Objects/Weapons/Guns/Projectiles/magic.yml @@ -0,0 +1,54 @@ +- type: entity + id: BulletMagmaCharge + name: charge bolt + parent: BaseBullet + noSpawn: true + description: Marks a target for additional damage. + components: + - type: Sprite + noRot: false + sprite: Corvax/Objects/Weapons/Guns/Projectiles/magic.rsi + layers: + - state: magmabolt + shader: unshaded + - type: DamageMarkerOnCollide + whitelist: + components: + - MobState + damage: + types: + Blunt: 40 + Slash: 10 + - type: Projectile + impactEffect: BulletImpactEffectKinetic + damage: + types: + Blunt: 0 + Structural: 50 + penetrationScore: 4 + # Short lifespan + - type: TimedDespawn + lifetime: 0.4 + +- type: entity + id: BulletMagmaPlasmacutterCharge + name: charge bolt + parent: BaseBullet + noSpawn: true + components: + - type: Sprite + noRot: false + sprite: Corvax/Objects/Weapons/Guns/Projectiles/magic.rsi + layers: + - state: plasmacharge + shader: unshaded + - type: Projectile + impactEffect: BulletImpactEffectPlasma + damage: + types: + Blunt: 0 + Structural: 50 + penetrationScore: 6 + # Short lifespan + - type: TimedDespawn + lifetime: 0.4 diff --git a/Resources/Prototypes/Corvax/Entities/Objects/Weapons/Guns/Salvage/magmiteplasmacutter.yml b/Resources/Prototypes/Corvax/Entities/Objects/Weapons/Guns/Salvage/magmiteplasmacutter.yml new file mode 100644 index 00000000000..e7ce3552889 --- /dev/null +++ b/Resources/Prototypes/Corvax/Entities/Objects/Weapons/Guns/Salvage/magmiteplasmacutter.yml @@ -0,0 +1,38 @@ +- type: entity + id: WeaponMagmitePlasmaCutter + parent: BaseItem + name: magmite plasmacutter + description: "A magmitic version of a conventional plasma cutter." + components: + - type: Sprite + sprite: Corvax/Objects/Weapons/Guns/Salvage/magmite_plasma_cutter.rsi + layers: + - state: icon + - state: icon-uncharged + visible: false + map: [ "empty-icon" ] + - type: Gun + fireRate: 0.5 + selectedMode: SemiAuto + availableModes: + - SemiAuto + soundGunshot: + collection: MagmaPulse + - type: AmmoCounter + - type: Appearance + - type: GenericVisualizer + visuals: + enum.AmmoVisuals.HasAmmo: + empty-icon: + True: { visible: False } + False: { visible: True } + - type: RechargeBasicEntityAmmo + rechargeCooldown: 0.75 + rechargeSound: + path: /Audio/Weapons/Guns/MagIn/kinetic_reload.ogg + - type: BasicEntityAmmoProvider + proto: BulletMagmaPlasmacutterCharge + capacity: 1 + count: 1 + - type: StaticPrice + price: 3000 diff --git a/Resources/Prototypes/Corvax/Entities/Objects/Weapons/Melee/magmitecrushers.yml b/Resources/Prototypes/Corvax/Entities/Objects/Weapons/Melee/magmitecrushers.yml index a048f126f34..861b436eba8 100644 --- a/Resources/Prototypes/Corvax/Entities/Objects/Weapons/Melee/magmitecrushers.yml +++ b/Resources/Prototypes/Corvax/Entities/Objects/Weapons/Melee/magmitecrushers.yml @@ -1,37 +1,3 @@ -- type: entity - id: BulletMagnaCharge - name: charge bolt - parent: BaseBullet - noSpawn: true - description: Marks a target for additional damage. - components: - - type: Reflective - reflective: - - NonEnergy - - type: Sprite - noRot: false - sprite: Corvax/Objects/Weapons/Guns/Projectiles/magic.rsi - layers: - - state: magmabolt - shader: unshaded - - type: GatheringProjectile - - type: DamageMarkerOnCollide - whitelist: - components: - - MobState - damage: - types: - Blunt: 40 - Slash: 10 - - type: Projectile - impactEffect: BulletImpactEffectKinetic - damage: - types: - Blunt: 0 - # Short lifespan - - type: TimedDespawn - lifetime: 0.4 - - type: entity parent: WeaponCrusher id: WeaponMagmiteCrusher @@ -50,7 +16,7 @@ - type: PointLight color: "#df7126" - type: BasicEntityAmmoProvider - proto: BulletMagnaCharge + proto: BulletMagmaCharge capacity: 1 count: 1 - type: MeleeWeapon diff --git a/Resources/Prototypes/Corvax/Recipes/Lathes/devices.yml b/Resources/Prototypes/Corvax/Recipes/Lathes/devices.yml index ba37218249d..29f5f07ae5e 100644 --- a/Resources/Prototypes/Corvax/Recipes/Lathes/devices.yml +++ b/Resources/Prototypes/Corvax/Recipes/Lathes/devices.yml @@ -9,6 +9,18 @@ Silver: 600 Magmite: 2500 +- type: latheRecipe + id: WeaponMagmitePlasmaCutter + result: WeaponMagmitePlasmaCutter + completetime: 20 + materials: + Plasteel: 4000 + Glass: 2000 + Gold: 600 + Silver: 600 + Uranium: 200 + Magmite: 1500 + - type: latheRecipe id: WeaponMagmiteCrusherGlaive result: WeaponMagmiteCrusherGlaive diff --git a/Resources/Prototypes/Corvax/SoundCollections/gunshots.yml b/Resources/Prototypes/Corvax/SoundCollections/gunshots.yml new file mode 100644 index 00000000000..8b3b6e8eb21 --- /dev/null +++ b/Resources/Prototypes/Corvax/SoundCollections/gunshots.yml @@ -0,0 +1,6 @@ +- type: soundCollection + id: MagmaPulse + files: + - /Audio/Corvax/Weapons/Guns/Gunshots/pulse.ogg + - /Audio/Corvax/Weapons/Guns/Gunshots/pulse2.ogg + - /Audio/Corvax/Weapons/Guns/Gunshots/pulse3.ogg diff --git a/Resources/Prototypes/Corvax/tags.yml b/Resources/Prototypes/Corvax/tags.yml index 71bd10b7a15..b4987ddcc81 100644 --- a/Resources/Prototypes/Corvax/tags.yml +++ b/Resources/Prototypes/Corvax/tags.yml @@ -1,6 +1,9 @@ - type: Tag id: Gems +- type: Tag + id: Jetpack + - type: Tag id: CartridgeVector22 diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml index 53bbd663ed0..88f50f5274e 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml @@ -156,6 +156,13 @@ - type: HeldSpeedModifier - type: ToggleableClothing clothingPrototype: ClothingHeadHelmetHardsuitSalvage + - type: ItemSlots # Corvax-Frontier + slots: + item: + name: clothing-hardsuits-jetpack + whitelist: + tags: + - Jetpack - type: entity parent: ClothingOuterHardsuitBase @@ -187,6 +194,13 @@ coefficient: 0.001 - type: ToggleableClothing clothingPrototype: ClothingHeadHelmetHardsuitMaxim + - type: ItemSlots # Corvax-Frontier + slots: + item: + name: clothing-hardsuits-jetpack + whitelist: + tags: + - Jetpack #Security Hardsuit - type: entity @@ -1004,4 +1018,4 @@ sprintModifier: 0.9 - type: HeldSpeedModifier - type: ToggleableClothing - clothingPrototype: ClothingHeadHelmetHardsuitSanta \ No newline at end of file + clothingPrototype: ClothingHeadHelmetHardsuitSanta diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 45e60239eda..749f28633e0 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -526,6 +526,7 @@ - ClothingShoesBootsJetBoots # Corvax-Frontier - WeaponMagmiteCrusher # Corvax-Frontier - WeaponMagmiteCrusherGlaive # Corvax-Frontier + - WeaponMagmitePlasmaCutter # Corvax-Frontier - type: EmagLatheRecipes emagDynamicRecipes: - ExplosivePayload diff --git a/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml b/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml index c4bfb481bd3..7a5cfcdf7f1 100644 --- a/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml +++ b/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml @@ -33,9 +33,9 @@ damageContainer: StructuralInorganic damageModifierSet: Rock - type: SoundOnGather - - type: Reflect - reflectProb: 0.5 - spread: 75 + #- type: Reflect + # reflectProb: 0.5 + # spread: 75 - type: Gatherable whitelist: tags: @@ -403,9 +403,9 @@ - type: Icon sprite: Structures/Walls/rock.rsi state: rock - - type: Reflect - reflectProb: 0.5 - spread: 75 + #- type: Reflect + # reflectProb: 0.5 + # spread: 75 - type: SmoothEdge - type: Sprite sprite: Structures/Walls/rock.rsi @@ -1856,4 +1856,4 @@ state: rock_andesite_north - map: [ "enum.EdgeLayer.West" ] state: rock_andesite_west - - state: rock_salt \ No newline at end of file + - state: rock_salt diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml index 9bd44354868..67a968a7153 100644 --- a/Resources/Prototypes/Research/arsenal.yml +++ b/Resources/Prototypes/Research/arsenal.yml @@ -236,7 +236,5 @@ recipeUnlocks: - WeaponMagmiteCrusher - WeaponMagmiteCrusherGlaive - - ClothingShoesBootsJetBoots technologyPrerequisites: - SalvageWeapons - - MagnetsTech diff --git a/Resources/Prototypes/Research/civilianservices.yml b/Resources/Prototypes/Research/civilianservices.yml index da09923cd97..4312147c81b 100644 --- a/Resources/Prototypes/Research/civilianservices.yml +++ b/Resources/Prototypes/Research/civilianservices.yml @@ -234,6 +234,20 @@ recipeUnlocks: - ClothingShoesBootsSpeed +- type: technology # Corvax-Frontier + id: AdvancedJetBoots + name: research-technology-advanced-jet-boots + icon: + sprite: Corvax/Clothing/Shoes/Boots/jetboots.rsi + state: icon + discipline: CivilianServices + tier: 3 + cost: 15000 + recipeUnlocks: + - ClothingShoesBootsJetBoots + technologyPrerequisites: + - MagnetsTech + # - type: technology # id: BluespaceChemistry # name: research-technology-bluespace-chemistry diff --git a/Resources/Prototypes/Research/industrial.yml b/Resources/Prototypes/Research/industrial.yml index 94757179974..c649872c46e 100644 --- a/Resources/Prototypes/Research/industrial.yml +++ b/Resources/Prototypes/Research/industrial.yml @@ -227,3 +227,17 @@ recipeUnlocks: - ShipyardRCD - ShipyardRCDAmmo + +- type: technology # Corvax-Frontier + id: AdvancedSalvageEquipment + name: research-technology-advanced-salvage-equipment + icon: + sprite: Corvax/Objects/Weapons/Guns/Salvage/magmite_plasma_cutter.rsi + state: icon + discipline: Industrial + tier: 3 + cost: 15000 + recipeUnlocks: + - WeaponMagmitePlasmaCutter + technologyPrerequisites: + - SalvageEquipment diff --git a/Resources/Textures/Corvax/Effects/arcs.rsi/magma.png b/Resources/Textures/Corvax/Effects/arcs.rsi/magma.png new file mode 100644 index 00000000000..5cbdb9f66a8 Binary files /dev/null and b/Resources/Textures/Corvax/Effects/arcs.rsi/magma.png differ diff --git a/Resources/Textures/Corvax/Effects/arcs.rsi/meta.json b/Resources/Textures/Corvax/Effects/arcs.rsi/meta.json new file mode 100644 index 00000000000..dd3342c9ae7 --- /dev/null +++ b/Resources/Textures/Corvax/Effects/arcs.rsi/meta.json @@ -0,0 +1,21 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Copyright by https://github.com/ParadiseSS13/Paradise", + "states": [ + { + "name": "magma", + "delays": [ + [ + 0.1, + 0.1, + 0.1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Corvax/Objects/Weapons/Guns/Projectiles/magic.rsi/meta.json b/Resources/Textures/Corvax/Objects/Weapons/Guns/Projectiles/magic.rsi/meta.json index 9933c13a896..5ad7cdcb35d 100644 --- a/Resources/Textures/Corvax/Objects/Weapons/Guns/Projectiles/magic.rsi/meta.json +++ b/Resources/Textures/Corvax/Objects/Weapons/Guns/Projectiles/magic.rsi/meta.json @@ -12,6 +12,9 @@ "delays": [ [ 0.1, 0.1 ] ] + }, + { + "name": "plasmacharge" } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Corvax/Objects/Weapons/Guns/Projectiles/magic.rsi/plasmacharge.png b/Resources/Textures/Corvax/Objects/Weapons/Guns/Projectiles/magic.rsi/plasmacharge.png new file mode 100644 index 00000000000..fa941898e49 Binary files /dev/null and b/Resources/Textures/Corvax/Objects/Weapons/Guns/Projectiles/magic.rsi/plasmacharge.png differ diff --git a/Resources/Textures/Corvax/Objects/Weapons/Guns/Salvage/magmite_plasma_cutter.rsi/icon-uncharged.png b/Resources/Textures/Corvax/Objects/Weapons/Guns/Salvage/magmite_plasma_cutter.rsi/icon-uncharged.png new file mode 100644 index 00000000000..5744fd2d08a Binary files /dev/null and b/Resources/Textures/Corvax/Objects/Weapons/Guns/Salvage/magmite_plasma_cutter.rsi/icon-uncharged.png differ diff --git a/Resources/Textures/Corvax/Objects/Weapons/Guns/Salvage/magmite_plasma_cutter.rsi/icon.png b/Resources/Textures/Corvax/Objects/Weapons/Guns/Salvage/magmite_plasma_cutter.rsi/icon.png new file mode 100644 index 00000000000..5401db5e52b Binary files /dev/null and b/Resources/Textures/Corvax/Objects/Weapons/Guns/Salvage/magmite_plasma_cutter.rsi/icon.png differ diff --git a/Resources/Textures/Corvax/Objects/Weapons/Guns/Salvage/magmite_plasma_cutter.rsi/inhand-left.png b/Resources/Textures/Corvax/Objects/Weapons/Guns/Salvage/magmite_plasma_cutter.rsi/inhand-left.png new file mode 100644 index 00000000000..a99825ea64e Binary files /dev/null and b/Resources/Textures/Corvax/Objects/Weapons/Guns/Salvage/magmite_plasma_cutter.rsi/inhand-left.png differ diff --git a/Resources/Textures/Corvax/Objects/Weapons/Guns/Salvage/magmite_plasma_cutter.rsi/inhand-right.png b/Resources/Textures/Corvax/Objects/Weapons/Guns/Salvage/magmite_plasma_cutter.rsi/inhand-right.png new file mode 100644 index 00000000000..e7645e91049 Binary files /dev/null and b/Resources/Textures/Corvax/Objects/Weapons/Guns/Salvage/magmite_plasma_cutter.rsi/inhand-right.png differ diff --git a/Resources/Textures/Corvax/Objects/Weapons/Guns/Salvage/magmite_plasma_cutter.rsi/meta.json b/Resources/Textures/Corvax/Objects/Weapons/Guns/Salvage/magmite_plasma_cutter.rsi/meta.json new file mode 100644 index 00000000000..792d125f839 --- /dev/null +++ b/Resources/Textures/Corvax/Objects/Weapons/Guns/Salvage/magmite_plasma_cutter.rsi/meta.json @@ -0,0 +1,28 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Copyright by https://github.com/ParadiseSS13/Paradise", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "icon-uncharged", + "delays": [ + [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 ] + ] + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +}