diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/salvage.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/salvage.yml index 11fb9fa8c4..7f1b0a98a5 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/salvage.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/salvage.yml @@ -15,5 +15,6 @@ Fulton: 2 #LPP WeaponCrusherDagger: 2 - emaggedInventory: - ClothingBackpackDuffelSyndicate: 1 \ No newline at end of file + contrabandInventory: + LPPWeaponSyndieGlaive: 1 + ClothingBackpackDuffelSyndicate: 1 diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index a39705b4cf..ce7a5f6a8c 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -1741,4 +1741,26 @@ cost: Telecrystal: 2 categories: - - UplinkArmor \ No newline at end of file + - UplinkArmor + +- type: listing + id: LPPUplinkGlaive + name: Кроваво красная глефа + description: Модифицированная версия глефы, усовершенствованная каким-то больным утилизатором... + icon: { sprite: /Textures/_LostParadise/Objects/Weapons/Melee/syndie_glaive.rsi, state: icon } + productEntity: LPPWeaponSyndieGlaive + cost: + Telecrystal: 8 + categories: + - UplinkWeapons + +- type: listing + id: LPPUplinkAcientHardsuitSyndie + name: древний скафандр Синдиката + description: Очень странная модель скафандра Ядерных Оперативников, явно нестандартной конфигурации + icon: { sprite: /Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/acientsyndiehardsuit.rsi, state: icon } + productEntity: LPPClothingOuterHardsuitAcientSyndie + cost: + Telecrystal: 11 + categories: + - UplinkArmor diff --git a/Resources/Prototypes/_LostParadise/Entities/Clothing/Head/hardsuit-helmet-eva.yml b/Resources/Prototypes/_LostParadise/Entities/Clothing/Head/hardsuit-helmet-eva.yml index 2a47eac517..b5e7fc8b45 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Clothing/Head/hardsuit-helmet-eva.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Clothing/Head/hardsuit-helmet-eva.yml @@ -1,3 +1,34 @@ +- type: entity + parent: ClothingHeadHardsuitWithLightBase + id: LPPClothingHeadHelmetAcientSyndieEVA + noSpawn: true + name: шлем древнего скафандра Синдиката (EVA режим) + description: Шлем от странного скафандра Синдиката, он в EVA режиме. + components: + - type: Sprite + sprite: _LostParadise/Clothing/Head/Helmets/acienthelmsyndieeva.rsi + - type: Clothing + sprite: _LostParadise/Clothing/Head/Helmets/acienthelmsyndieeva.rsi + - type: BreathMask + - type: EyeProtection + - type: PointLight + color: "green" + - type: PressureProtection + highPressureMultiplier: 0.08 + lowPressureMultiplier: 10000 + - type: ClothingSpeedModifier + walkModifier: 0.8 + sprintModifier: 0.8 + - type: Armor + modifiers: + coefficients: + Blunt: 0.8 + Slash: 0.8 + Piercing: 0.8 + Heat: 0.8 + - type: TemperatureProtection + coefficient: 0.005 + - type: entity parent: ClothingHeadHardsuitWithLightBase id: LPPClothingHeadHelmetHunter diff --git a/Resources/Prototypes/_LostParadise/Entities/Clothing/Mask/hardsuit-mask.yml b/Resources/Prototypes/_LostParadise/Entities/Clothing/Mask/hardsuit-mask.yml index 9e6ee01c15..62de6d5cbf 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Clothing/Mask/hardsuit-mask.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Clothing/Mask/hardsuit-mask.yml @@ -1,3 +1,30 @@ +- type: entity + parent: ClothingMaskBase + id: LPPClothingMaskAcientSyndie + noSpawn: true + name: шлем древнего скафандра Синдиката (боевой режим) + description: Шлем от странного скафандра Синдиката, он в боевом режиме. + components: + - type: Sprite + sprite: _LostParadise/Clothing/Mask/acienthelmsyndiebattle.rsi + - type: Clothing + sprite: _LostParadise/Clothing/Mask/acienthelmsyndiebattle.rsi + equipSound: /Audio/Mecha/mechmove03.ogg + unequipSound: /Audio/Mecha/mechmove03.ogg + - type: FlashImmunity + - type: Armor + modifiers: + coefficients: + Blunt: 0.9 + Slash: 0.9 + Piercing: 0.9 + Heat: 0.9 + - type: ToggleableClothing + clothingPrototype: LPPClothingHeadHelmetAcientSyndieEVA + requiredSlot: + - mask + slot: head + - type: entity parent: ClothingMaskBase id: LPPClothingMaskHunter @@ -20,9 +47,6 @@ Heat: 0.95 - type: ToggleableClothing clothingPrototype: LPPClothingHeadHelmetHunter + requiredSlot: + - mask slot: head - - type: ContainerContainer - containers: - toggleable-clothing: !type:ContainerSlot {} - storagebase: !type:Container - ents: [] diff --git a/Resources/Prototypes/_LostParadise/Entities/Clothing/OuterClothing/acienthardsuitsyndie.yml b/Resources/Prototypes/_LostParadise/Entities/Clothing/OuterClothing/acienthardsuitsyndie.yml new file mode 100644 index 0000000000..bb5299cc00 --- /dev/null +++ b/Resources/Prototypes/_LostParadise/Entities/Clothing/OuterClothing/acienthardsuitsyndie.yml @@ -0,0 +1,37 @@ +- type: entity + parent: ClothingOuterHardsuitBase + id: LPPClothingOuterHardsuitAcientSyndie + name: древний скафандр Синдиката + description: Очень странная модель скафандра Ядерных Оперативников, явно нестандартной конфигурации и будто бы не из нашей вселенной, на стопе красуется вырезанный текст- "Скафандр Мика, DS1, Дэесдвашники- руки прочь!". + components: + - type: Sprite + sprite: _LostParadise/Clothing/OuterClothing/Hardsuits/acientsyndiehardsuit.rsi + - type: Clothing + sprite: _LostParadise/Clothing/OuterClothing/Hardsuits/acientsyndiehardsuit.rsi + - type: Item + size: Huge + - type: PressureProtection + highPressureMultiplier: 0.02 + lowPressureMultiplier: 1000 + - type: ClothingSpeedModifier + walkModifier: 1.05 + sprintModifier: 1.05 + - type: Armor + modifiers: + coefficients: + Blunt: 0.45 + Slash: 0.40 + Piercing: 0.35 + Heat: 0.25 + Radiation: 0.05 + Caustic: 0.3 + - type: ExplosionResistance + damageCoefficient: 0.2 + - type: BiocodedClothing + - type: ToggleableClothing + clothingPrototype: LPPClothingMaskAcientSyndie + requiredSlot: + - outerclothing + slot: mask + - type: StaminaDamageResistance + coefficient: 0.4 \ No newline at end of file diff --git a/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Melee/syndie.yml b/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Melee/syndie.yml new file mode 100644 index 0000000000..f927f74f4d --- /dev/null +++ b/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Melee/syndie.yml @@ -0,0 +1,64 @@ +- type: entity + parent: WeaponCrusher + id: LPPWeaponSyndieGlaive + name: Кроваво-красная глефа + description: Модифицированная версия глефы, усовершенствованная каким-то больным утилизатором... + components: + - type: Tag + tags: + - Pickaxe + - type: Sprite + sprite: _LostParadise/Objects/Weapons/Melee/syndie_glaive.rsi + state: icon + - type: AmmoCounter + - type: UseDelayOnShoot + - type: UseDelay + delay: 0.9 + - type: LeechOnMarker + leech: + groups: + Brute: -10 + - type: Gun + soundGunshot: /Audio/Weapons/plasma_cutter.ogg + fireRate: 1.0 + useKey: false + - type: RechargeBasicEntityAmmo + rechargeCooldown: 0.5 + rechargeSound: + path: /Audio/Weapons/Guns/MagIn/kinetic_reload.ogg + - type: BasicEntityAmmoProvider + proto: LPPBulletCharge + capacity: 1 + count: 1 + - type: MeleeWeapon + attackRate: 1.2 + wideAnimationRotation: -135 + damage: + types: + Blunt: 4.5 + Slash: 4.5 + Radiation: 2.5 + - type: Wieldable + - type: IncreaseDamageOnWield + damage: + types: + Blunt: 7.5 + Slash: 7.5 + Radiation: 2.5 + Structural: 75 + - type: GunRequiresWield + - type: Item + size: Huge + - type: DisarmMalus + - type: Tool + qualities: + - Prying + speed: 3 + - type: Clothing + quickEquip: false + slots: + - back + - suitStorage + - type: Prying + speed: 3 + pryPowered: true diff --git a/Resources/Textures/_LostParadise/Clothing/Mask/acienthelmsyndiebattle.rsi/equipped-MASK.png b/Resources/Textures/_LostParadise/Clothing/Mask/acienthelmsyndiebattle.rsi/equipped-MASK.png new file mode 100644 index 0000000000..1404554c35 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Mask/acienthelmsyndiebattle.rsi/equipped-MASK.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Mask/acienthelmsyndiebattle.rsi/icon.png b/Resources/Textures/_LostParadise/Clothing/Mask/acienthelmsyndiebattle.rsi/icon.png new file mode 100644 index 0000000000..474c5bd06e Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Mask/acienthelmsyndiebattle.rsi/icon.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Mask/acienthelmsyndiebattle.rsi/meta.json b/Resources/Textures/_LostParadise/Clothing/Mask/acienthelmsyndiebattle.rsi/meta.json new file mode 100644 index 0000000000..ff8264505e --- /dev/null +++ b/Resources/Textures/_LostParadise/Clothing/Mask/acienthelmsyndiebattle.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from BlueMoon https://github.com/BlueMoon-Labs/MOLOT-Nuclear-Moon-13", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-MASK", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/acientsyndiehardsuit.rsi/equipped-OUTERCLOTHING-reptilian.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/acientsyndiehardsuit.rsi/equipped-OUTERCLOTHING-reptilian.png new file mode 100644 index 0000000000..91244c4bf8 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/acientsyndiehardsuit.rsi/equipped-OUTERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/acientsyndiehardsuit.rsi/equipped-OUTERCLOTHING-shark.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/acientsyndiehardsuit.rsi/equipped-OUTERCLOTHING-shark.png new file mode 100644 index 0000000000..580ce4dfcd Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/acientsyndiehardsuit.rsi/equipped-OUTERCLOTHING-shark.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/acientsyndiehardsuit.rsi/equipped-OUTERCLOTHING-tajaran.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/acientsyndiehardsuit.rsi/equipped-OUTERCLOTHING-tajaran.png new file mode 100644 index 0000000000..d9bded55f6 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/acientsyndiehardsuit.rsi/equipped-OUTERCLOTHING-tajaran.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/acientsyndiehardsuit.rsi/equipped-OUTERCLOTHING-vulpkanin.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/acientsyndiehardsuit.rsi/equipped-OUTERCLOTHING-vulpkanin.png new file mode 100644 index 0000000000..3c59cae070 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/acientsyndiehardsuit.rsi/equipped-OUTERCLOTHING-vulpkanin.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/acientsyndiehardsuit.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/acientsyndiehardsuit.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000..fc074979d9 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/acientsyndiehardsuit.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/acientsyndiehardsuit.rsi/icon.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/acientsyndiehardsuit.rsi/icon.png new file mode 100644 index 0000000000..c3a11b6d87 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/acientsyndiehardsuit.rsi/icon.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/acientsyndiehardsuit.rsi/inhand-left.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/acientsyndiehardsuit.rsi/inhand-left.png new file mode 100644 index 0000000000..268fde26b1 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/acientsyndiehardsuit.rsi/inhand-left.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/acientsyndiehardsuit.rsi/inhand-right.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/acientsyndiehardsuit.rsi/inhand-right.png new file mode 100644 index 0000000000..29b67726d8 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/acientsyndiehardsuit.rsi/inhand-right.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/acientsyndiehardsuit.rsi/meta.json b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/acientsyndiehardsuit.rsi/meta.json new file mode 100644 index 0000000000..686e887b06 --- /dev/null +++ b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/acientsyndiehardsuit.rsi/meta.json @@ -0,0 +1,42 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from BlueMoon https://github.com/BlueMoon-Labs/MOLOT-Nuclear-Moon-13", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-shark", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-tajaran", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vulpkanin", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-reptilian", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_LostParadise/Objects/Weapons/Melee/syndie_glaive.rsi/icon-lit.png b/Resources/Textures/_LostParadise/Objects/Weapons/Melee/syndie_glaive.rsi/icon-lit.png new file mode 100644 index 0000000000..e33398abc2 Binary files /dev/null and b/Resources/Textures/_LostParadise/Objects/Weapons/Melee/syndie_glaive.rsi/icon-lit.png differ diff --git a/Resources/Textures/_LostParadise/Objects/Weapons/Melee/syndie_glaive.rsi/icon-uncharged.png b/Resources/Textures/_LostParadise/Objects/Weapons/Melee/syndie_glaive.rsi/icon-uncharged.png new file mode 100644 index 0000000000..3929ec047e Binary files /dev/null and b/Resources/Textures/_LostParadise/Objects/Weapons/Melee/syndie_glaive.rsi/icon-uncharged.png differ diff --git a/Resources/Textures/_LostParadise/Objects/Weapons/Melee/syndie_glaive.rsi/icon.png b/Resources/Textures/_LostParadise/Objects/Weapons/Melee/syndie_glaive.rsi/icon.png new file mode 100644 index 0000000000..0cdca898fe Binary files /dev/null and b/Resources/Textures/_LostParadise/Objects/Weapons/Melee/syndie_glaive.rsi/icon.png differ diff --git a/Resources/Textures/_LostParadise/Objects/Weapons/Melee/syndie_glaive.rsi/inhand-left.png b/Resources/Textures/_LostParadise/Objects/Weapons/Melee/syndie_glaive.rsi/inhand-left.png new file mode 100644 index 0000000000..a1adc1c94b Binary files /dev/null and b/Resources/Textures/_LostParadise/Objects/Weapons/Melee/syndie_glaive.rsi/inhand-left.png differ diff --git a/Resources/Textures/_LostParadise/Objects/Weapons/Melee/syndie_glaive.rsi/inhand-right.png b/Resources/Textures/_LostParadise/Objects/Weapons/Melee/syndie_glaive.rsi/inhand-right.png new file mode 100644 index 0000000000..9cab4f45e1 Binary files /dev/null and b/Resources/Textures/_LostParadise/Objects/Weapons/Melee/syndie_glaive.rsi/inhand-right.png differ diff --git a/Resources/Textures/_LostParadise/Objects/Weapons/Melee/syndie_glaive.rsi/meta.json b/Resources/Textures/_LostParadise/Objects/Weapons/Melee/syndie_glaive.rsi/meta.json new file mode 100644 index 0000000000..3f1a2c7eb1 --- /dev/null +++ b/Resources/Textures/_LostParadise/Objects/Weapons/Melee/syndie_glaive.rsi/meta.json @@ -0,0 +1,42 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/Citadel-Station-13/Citadel-Station-13-RP/blob/817e7c1f225876b45891e3f06908e6d032f0a8bc/icons/obj/mining.dmi resprited by MegaDaimond", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "icon-lit" + }, + { + "name": "icon-uncharged", + "delays": [ + [ + 0.3, + 0.3 + ] + ] + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_LostParadise/Objects/Weapons/Melee/syndie_glaive.rsi/wielded-inhand-left.png b/Resources/Textures/_LostParadise/Objects/Weapons/Melee/syndie_glaive.rsi/wielded-inhand-left.png new file mode 100644 index 0000000000..8055f031e4 Binary files /dev/null and b/Resources/Textures/_LostParadise/Objects/Weapons/Melee/syndie_glaive.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/_LostParadise/Objects/Weapons/Melee/syndie_glaive.rsi/wielded-inhand-right.png b/Resources/Textures/_LostParadise/Objects/Weapons/Melee/syndie_glaive.rsi/wielded-inhand-right.png new file mode 100644 index 0000000000..c5e71ef842 Binary files /dev/null and b/Resources/Textures/_LostParadise/Objects/Weapons/Melee/syndie_glaive.rsi/wielded-inhand-right.png differ