From e1933c387d389540e2f4e8f7c6be9139b090f717 Mon Sep 17 00:00:00 2001 From: Jidort <150965782+Jidort@users.noreply.github.com> Date: Mon, 2 Sep 2024 19:17:21 +0300 Subject: [PATCH] Add all prototypes --- .../Objects/Misc/subdermal_implants.yml | 8 ++ .../Weapons/Guns/Ammunition/Boxes/syringe.yml | 98 +++++++++++++ .../Guns/Ammunition/Casinngs/syringe.yml | 136 ++++++++++++++++++ .../Weapons/Guns/Battery/battery_guns.yml | 11 ++ .../Objects/Weapons/Guns/syringe_gun.yml | 41 ++++++ .../Objects/Weapons/Melee/chainsword.yml | 100 +++++++++++++ .../Weapons/Melee/death_squad_e_shield.yml | 73 ++++++++++ .../Prototypes/_Exodus/Reagents/medicine.yml | 18 +++ .../Centcomm/specical_operation_offiser.yml | 19 --- Resources/Prototypes/_Exodus/tags.yml | 5 +- .../syringegun.rsi/equipped-BACKPACK.png | Bin .../syringegun.rsi/equipped-SUITSTORAGE.png | Bin .../{SyringeGun => }/syringegun.rsi/icon.png | Bin .../syringegun.rsi/inhand-left.png | Bin .../syringegun.rsi/inhand-right.png | Bin .../{SyringeGun => }/syringegun.rsi/meta.json | 0 .../{SyringeGun => }/syringegun.rsi/tank.png | Bin 17 files changed, 489 insertions(+), 20 deletions(-) create mode 100644 Resources/Prototypes/_Exodus/Entities/Objects/Misc/subdermal_implants.yml create mode 100644 Resources/Prototypes/_Exodus/Entities/Objects/Weapons/Guns/Ammunition/Boxes/syringe.yml create mode 100644 Resources/Prototypes/_Exodus/Entities/Objects/Weapons/Guns/Ammunition/Casinngs/syringe.yml create mode 100644 Resources/Prototypes/_Exodus/Entities/Objects/Weapons/Guns/syringe_gun.yml create mode 100644 Resources/Prototypes/_Exodus/Entities/Objects/Weapons/Melee/chainsword.yml create mode 100644 Resources/Prototypes/_Exodus/Entities/Objects/Weapons/Melee/death_squad_e_shield.yml create mode 100644 Resources/Prototypes/_Exodus/Reagents/medicine.yml delete mode 100644 Resources/Prototypes/_Exodus/Roles/Jobs/Centcomm/specical_operation_offiser.yml rename Resources/Textures/Exodus/Objects/Weapons/Guns/{SyringeGun => }/syringegun.rsi/equipped-BACKPACK.png (100%) rename Resources/Textures/Exodus/Objects/Weapons/Guns/{SyringeGun => }/syringegun.rsi/equipped-SUITSTORAGE.png (100%) rename Resources/Textures/Exodus/Objects/Weapons/Guns/{SyringeGun => }/syringegun.rsi/icon.png (100%) rename Resources/Textures/Exodus/Objects/Weapons/Guns/{SyringeGun => }/syringegun.rsi/inhand-left.png (100%) rename Resources/Textures/Exodus/Objects/Weapons/Guns/{SyringeGun => }/syringegun.rsi/inhand-right.png (100%) rename Resources/Textures/Exodus/Objects/Weapons/Guns/{SyringeGun => }/syringegun.rsi/meta.json (100%) rename Resources/Textures/Exodus/Objects/Weapons/Guns/{SyringeGun => }/syringegun.rsi/tank.png (100%) diff --git a/Resources/Prototypes/_Exodus/Entities/Objects/Misc/subdermal_implants.yml b/Resources/Prototypes/_Exodus/Entities/Objects/Misc/subdermal_implants.yml new file mode 100644 index 00000000000..d4f3c9bc13b --- /dev/null +++ b/Resources/Prototypes/_Exodus/Entities/Objects/Misc/subdermal_implants.yml @@ -0,0 +1,8 @@ +- type: entity + parent: TrackingImplant + id: DSTrackingImplant + name: имплант Трекер Эскадрона + description: Этот имплант оснащен устройством слежения, подключенным к сенсорной сети костюма, а также монитором состояния радиоканала эскадрона. + components: + - type: Rattle + radioChannel: "DS" diff --git a/Resources/Prototypes/_Exodus/Entities/Objects/Weapons/Guns/Ammunition/Boxes/syringe.yml b/Resources/Prototypes/_Exodus/Entities/Objects/Weapons/Guns/Ammunition/Boxes/syringe.yml new file mode 100644 index 00000000000..e685b38702b --- /dev/null +++ b/Resources/Prototypes/_Exodus/Entities/Objects/Weapons/Guns/Ammunition/Boxes/syringe.yml @@ -0,0 +1,98 @@ +- type: entity + name: Коробка метательных шприцов + parent: BoxSyringeAmmo + suffix: (Политриновая кислота) + id: BoxSyringeAmmoPolytrinic + description: Полная коробка веселья + components: + - type: StorageFill + contents: + - id: SyringeAmmoPolytrinic + amount: 9 + +- type: entity + name: Коробка метательных шприцов + parent: BoxSyringeAmmo + suffix: (Лексорин) + id: BoxSyringeAmmoLexorin + description: Полная коробка веселья + components: + - type: StorageFill + contents: + - id: SyringeAmmoLexorin + amount: 9 + +- type: entity + name: Коробка метательных шприцов + parent: BoxSyringeAmmo + suffix: (Хлоральгидрат) + id: BoxSyringeAmmoChloral + description: Полная коробка веселья + components: + - type: StorageFill + contents: + - id: SyringeAmmoChloral + amount: 9 + +- type: entity + name: Коробка метательных шприцов + parent: BoxSyringeAmmo + suffix: (Ромерол) + id: BoxSyringeAmmoRomerol + description: Полная коробка веселья + components: + - type: StorageFill + contents: + - id: SyringeAmmoRomerol + amount: 9 + +- type: entity + name: Коробка метательных шприцов + parent: BoxSyringeAmmo + suffix: (Свинец) + id: BoxSyringeAmmoLead + description: Полная коробка веселья + components: + - type: StorageFill + contents: + - id: SyringeAmmoLead + amount: 9 + +- type: entity + name: Коробка метательных шприцов + parent: BoxSyringeAmmo + suffix: (Пакс) + id: BoxSyringeAmmoPax + description: Полная коробка веселья + components: + - type: StorageFill + contents: + - id: SyringeAmmoPax + amount: 9 + +- type: entity + name: Коробка метательных шприцов + parent: BoxCardboard + id: BoxSyringeAmmo + description: Полная коробка веселья + components: + - type: StorageFill + contents: + - id: SyringeAmmo + amount: 9 + - type: Sprite + sprite: Exodus/Objects/Weapons/Guns/Ammunition/Boxes/box_syringe.rsi + layers: + - state: box + +- type: entity + name: Коробка метательных шприцов + parent: BoxSyringeAmmo + suffix: (Норэпинефриновая кислота) + id: BoxSyringeAmmoNorepinephric + description: Полная коробка веселья + components: + - type: StorageFill + contents: + - id: SyringeAmmoNorepinephric + amount: 9 diff --git a/Resources/Prototypes/_Exodus/Entities/Objects/Weapons/Guns/Ammunition/Casinngs/syringe.yml b/Resources/Prototypes/_Exodus/Entities/Objects/Weapons/Guns/Ammunition/Casinngs/syringe.yml new file mode 100644 index 00000000000..89abe51e810 --- /dev/null +++ b/Resources/Prototypes/_Exodus/Entities/Objects/Weapons/Guns/Ammunition/Casinngs/syringe.yml @@ -0,0 +1,136 @@ +- type: entity + parent: Dart + id: SyringeAmmo + name: Метательный шприц + description: Метательный шприц, вводящий реагент при попадании. + components: + - type: Tag + tags: + - SyringeBullet + - type: Sprite + sprite: Exodus/Objects/Weapons/Guns/Ammunition/Casings/syringe.rsi + - type: Item + sprite: Exodus/Objects/Weapons/Guns/Ammunition/Casings/syringe.rsi + - type: SolutionContainerManager + solutions: + melee: + maxVol: 10 + - type: SolutionInjectOnEmbed + transferAmount: 10 + blockSlots: NONE + solution: melee + - type: SolutionTransfer + maxTransferAmount: 10 + +- type: entity + name: Метательный шприц + parent: SyringeAmmo + suffix: (Пакс) + id: SyringeAmmoPax + components: + - type: SolutionContainerManager + solutions: + melee: + maxVol: 10 + reagents: + - ReagentId: Pax + Quantity: 10 + + +- type: entity + name: Метательный шприц + parent: SyringeAmmo + suffix: (Свинец) + id: SyringeAmmoLead + components: + - type: SolutionContainerManager + solutions: + melee: + maxVol: 10 + reagents: + - ReagentId: Lead + Quantity: 10 + +- type: entity + name: Метательный шприц + parent: SyringeAmmo + suffix: (Ромерол) + id: SyringeAmmoRomerol + components: + - type: SolutionContainerManager + solutions: + melee: + maxVol: 10 + reagents: + - ReagentId: Romerol + Quantity: 10 + +- type: entity + name: Метательный шприц + parent: SyringeAmmo + suffix: (Хлоральгидрат) + id: SyringeAmmoChloral + components: + - type: SolutionContainerManager + solutions: + melee: + maxVol: 10 + reagents: + - ReagentId: ChloralHydrate + Quantity: 10 + +- type: entity + name: Метательный шприц + parent: SyringeAmmo + suffix: (Политриновая кислота) + id: SyringeAmmoPolytrinic + components: + - type: SolutionContainerManager + solutions: + melee: + maxVol: 10 + reagents: + - ReagentId: PolytrinicAcid + Quantity: 10 + +- type: entity + name: Метательный шприц + parent: SyringeAmmo + suffix: (Тазинид) + id: SyringeAmmoTazinide + components: + - type: SolutionContainerManager + solutions: + melee: + maxVol: 10 + reagents: + - ReagentId: Tazinide + Quantity: 10 + +- type: entity + name: Метательный шприц + parent: SyringeAmmo + suffix: (Лексорин) + id: SyringeAmmoLexorin + components: + - type: SolutionContainerManager + solutions: + melee: + maxVol: 10 + reagents: + - ReagentId: Lexorin + Quantity: 10 + +- type: entity + name: Метательный шприц + parent: SyringeAmmo + suffix: (Норэпинефриновая кислота) + id: SyringeAmmoNorepinephric + components: + - type: SolutionContainerManager + solutions: + melee: + maxVol: 10 + reagents: + - ReagentId: NorepinephricAcid + Quantity: 10 diff --git a/Resources/Prototypes/_Exodus/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/_Exodus/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index 4ba7ab5ea26..3f96dc88238 100644 --- a/Resources/Prototypes/_Exodus/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/_Exodus/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -39,3 +39,14 @@ fireCost: 100 - proto: BulletTaser fireCost: 100 + +- type: entity + name: Пульсовый карабин + parent: WeaponPulseRifle + id: WeaponPulseRifleNew + description: Энергетическая винтовка тяжелого типа, которой вооружены солдаты Эскадрона смерти. + components: + - type: Gun + fireRate: 3.0 + soundGunshot: + path: /Uploaded/DS/Sound/rifle.ogg diff --git a/Resources/Prototypes/_Exodus/Entities/Objects/Weapons/Guns/syringe_gun.yml b/Resources/Prototypes/_Exodus/Entities/Objects/Weapons/Guns/syringe_gun.yml new file mode 100644 index 00000000000..ca97d0c5c12 --- /dev/null +++ b/Resources/Prototypes/_Exodus/Entities/Objects/Weapons/Guns/syringe_gun.yml @@ -0,0 +1,41 @@ +- type: entity + parent: WeaponImprovisedPneumaticCannon + name: Мультизарядный шприцемет + id: DSSyringeGun + description: Мультизарядный шприцемет, позволяющий вводить вещество на расстоянии + components: + - type: Sprite + sprite: Exodus/Objects/Weapons/Guns/syringegun.rsi + layers: + - state: icon + - type: Item + size: Huge + - type: PneumaticCannon + throwItems: false + gasUsage: 0 + - type: Gun + fireRate: 2 + selectedMode: SemiAuto + availableModes: + - SemiAuto + - FullAuto + soundGunshot: + path: /Uploaded/DS/Sound/pew.ogg + soundEmpty: + path: /Uploaded/DS/Sound/empty.ogg + - type: Storage + storageOpenSound: /Uploaded/DS/Sound/loading2.ogg + storageCloseSound: /Uploaded/DS/Sound/loading3.ogg + storageInsertSound: /Uploaded/DS/Sound/loading.ogg + maxItemSize: Normal + grid: + - 0,0,2,2 + whitelist: + tags: + - SyringeBullet + - type: Clothing + sprite: Exodus/Objects/Weapons/Guns/syringegun.rsi + quickEquip: false + slots: + - Back + - suitStorage diff --git a/Resources/Prototypes/_Exodus/Entities/Objects/Weapons/Melee/chainsword.yml b/Resources/Prototypes/_Exodus/Entities/Objects/Weapons/Melee/chainsword.yml new file mode 100644 index 00000000000..5a560cc018a --- /dev/null +++ b/Resources/Prototypes/_Exodus/Entities/Objects/Weapons/Melee/chainsword.yml @@ -0,0 +1,100 @@ +- type: entity + name: энергетический меч-бензопила + parent: BaseItem + id: Chainsword + description: Технологии и ультранасилие в одном флаконе! + components: + - type: EnergySword + - type: Sharp + - type: ItemToggle + soundActivate: + path: /Uploaded/DS/Sound/start.ogg + params: + volume: -10 + soundDeactivate: + path: /Uploaded/DS/Sound/start.ogg + params: + volume: -10 + - type: ItemToggleActiveSound + activeSound: + path: /Uploaded/DS/Sound/idle.ogg + params: + volume: -10 + - type: ItemToggleSize + activatedSize: Huge + - type: ItemToggleMeleeWeapon + activatedSoundOnHit: + path: /Uploaded/DS/Sound/hit.ogg + params: + variation: 0.250 + volume: -10 + activatedSoundOnHitNoDamage: + path: /Uploaded/DS/Sound/hit.ogg + params: + variation: 0.250 + volume: -10 + activatedSoundOnSwing: + path: /Uploaded/DS/Sound/miss.ogg + params: + volume: -10 + variation: 0.125 + activatedDamage: + types: + Slash: 30 + Blunt: 20 + Structural: 50 + - type: Tool + qualities: + - Prying + useSound: + path: /Audio/Items/crowbar.ogg + - type: Prying + - type: Sprite + sprite: Exodus/Objects/Weapons/Melee/chainsword.rsi + layers: + - state: chainsword + - state: chainsword_blade + color: "#FFFFFF" + visible: false + shader: unshaded + map: [ "blade" ] + - type: MeleeWeapon + wideAnimationRotation: -135 + attackRate: 1.5 + damage: + types: + Blunt: 10 + Slash: 5 + autoAttack: true + - type: PointLight + enabled: false + radius: 2 + energy: 2 + color: white + netsync: false + - type: Item + size: Normal + sprite: Exodus/Objects/Weapons/Melee/chainsword.rsi + - type: UseDelay + delay: 1.0 + - type: Appearance + - type: DisarmMalus + malus: 0.9 + - type: Reflect + reflectProb: .25 + spread: 45 + - type: ToggleableLightVisuals + spriteLayer: blade + inhandVisuals: + left: + - state: inhand-left-blade + shader: unshaded + right: + - state: inhand-right-blade + shader: unshaded + - type: Clothing + sprite: /Uploaded/DS/acidgun.rsi + quickEquip: false + slots: + - Back + - suitStorage diff --git a/Resources/Prototypes/_Exodus/Entities/Objects/Weapons/Melee/death_squad_e_shield.yml b/Resources/Prototypes/_Exodus/Entities/Objects/Weapons/Melee/death_squad_e_shield.yml new file mode 100644 index 00000000000..83e6bebb029 --- /dev/null +++ b/Resources/Prototypes/_Exodus/Entities/Objects/Weapons/Melee/death_squad_e_shield.yml @@ -0,0 +1,73 @@ +- type: entity + name: энергетический щит + parent: EnergyShield + id: DSEnergyShield + description: Настоящий экзотический энергетический щит. В сложенном состоянии может поместиться даже в кармане. + suffix: New DS + components: + - type: ComponentToggler + components: + - type: DisarmMalus + malus: 0.9 + - type: Sprite + sprite: Exodus/Objects/Weapons/Melee/death_squad_e_shield.rsi + layers: + - state: eshield-icon + - state: eshield-on + color: "#FFFFFF" + visible: false + shader: unshaded + map: [ "shield" ] + - type: Item + size: Small + sprite: Exodus/Objects/Weapons/Melee/death_squad_e_shield.rsi + heldPrefix: eshield + - type: UseDelay + delay: 0.5 + - type: ToggleableLightVisuals + spriteLayer: shield + inhandVisuals: + left: + - state: inhand-left-shield + shader: unshaded + right: + - state: inhand-right-shield + shader: unshaded + - type: Blocking + passiveBlockModifier: + coefficients: + Blunt: 1.0 + Slash: 0.9 + Piercing: 0.85 + Heat: 0.6 + activeBlockModifier: + coefficients: + Blunt: 1.2 + Slash: 1.0 + Piercing: 1.0 + Heat: 0.4 + flatReductions: + Heat: 1 + Piercing: 1 + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 220 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - trigger: + !type:DamageTrigger + damage: 150 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - !type:PlaySoundBehavior + sound: + collection: GlassBreak + - !type:SpawnEntitiesBehavior + spawn: + BrokenEnergyShield: + min: 1 + max: 1 diff --git a/Resources/Prototypes/_Exodus/Reagents/medicine.yml b/Resources/Prototypes/_Exodus/Reagents/medicine.yml new file mode 100644 index 00000000000..32eb6dd9f27 --- /dev/null +++ b/Resources/Prototypes/_Exodus/Reagents/medicine.yml @@ -0,0 +1,18 @@ +- type: reagent + id: Saliforsom + name: Салифорсом + group: Medicine + desc: Концентрированная антибиотик, лечащий все болезни и даже смерть. + physicalDesc: невозможное + flavor: flavor-complex-medicine + color: "#e8e8e8" + metabolisms: + Medicine: + effects: + - !type:HealthChange + damage: + groups: + Brute: -5 + Burn: -5 + Airloss: -10 + Toxin: -5 diff --git a/Resources/Prototypes/_Exodus/Roles/Jobs/Centcomm/specical_operation_offiser.yml b/Resources/Prototypes/_Exodus/Roles/Jobs/Centcomm/specical_operation_offiser.yml deleted file mode 100644 index f4ce75bcd89..00000000000 --- a/Resources/Prototypes/_Exodus/Roles/Jobs/Centcomm/specical_operation_offiser.yml +++ /dev/null @@ -1,19 +0,0 @@ -- type: startingGear - id: SpecicalOperationOfficerGear - equipment: - jumpsuit: ClothingUniformJumpsuitCentcomOfficerBlack - back: ClothingBackpackCentcomOfficerFilled - mask: ClothingMaskGas - eyes: ClothingEyesGlassesSecurity - ears: ClothingHeadsetAltCentCom - head: ClothingHeadCapCentcomBlack - neck: ClothingNeckCloakCentcomBlack - gloves: ClothingHandsGlovesCombat - outerClothing: ClothingOuterHardsuitDeathsquad - suitstorage: AirTankFilled - shoes: ClothingShoesCentcomOfficerFilled - id: CentcomPDA - pocket1: EnergySword - pocket2: EnergyShield - belt: ClothingBeltMilitaryWebbingMedFilled - innerClothingSkirt: ClothingUniformJumpskirtColorBlack diff --git a/Resources/Prototypes/_Exodus/tags.yml b/Resources/Prototypes/_Exodus/tags.yml index 5b78638abf8..5c591e28722 100644 --- a/Resources/Prototypes/_Exodus/tags.yml +++ b/Resources/Prototypes/_Exodus/tags.yml @@ -2,4 +2,7 @@ id: Letter - type: Tag - id: NuclearCodes \ No newline at end of file + id: NuclearCodes + +- type: Tag + id: SyringeBullet diff --git a/Resources/Textures/Exodus/Objects/Weapons/Guns/SyringeGun/syringegun.rsi/equipped-BACKPACK.png b/Resources/Textures/Exodus/Objects/Weapons/Guns/syringegun.rsi/equipped-BACKPACK.png similarity index 100% rename from Resources/Textures/Exodus/Objects/Weapons/Guns/SyringeGun/syringegun.rsi/equipped-BACKPACK.png rename to Resources/Textures/Exodus/Objects/Weapons/Guns/syringegun.rsi/equipped-BACKPACK.png diff --git a/Resources/Textures/Exodus/Objects/Weapons/Guns/SyringeGun/syringegun.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Exodus/Objects/Weapons/Guns/syringegun.rsi/equipped-SUITSTORAGE.png similarity index 100% rename from Resources/Textures/Exodus/Objects/Weapons/Guns/SyringeGun/syringegun.rsi/equipped-SUITSTORAGE.png rename to Resources/Textures/Exodus/Objects/Weapons/Guns/syringegun.rsi/equipped-SUITSTORAGE.png diff --git a/Resources/Textures/Exodus/Objects/Weapons/Guns/SyringeGun/syringegun.rsi/icon.png b/Resources/Textures/Exodus/Objects/Weapons/Guns/syringegun.rsi/icon.png similarity index 100% rename from Resources/Textures/Exodus/Objects/Weapons/Guns/SyringeGun/syringegun.rsi/icon.png rename to Resources/Textures/Exodus/Objects/Weapons/Guns/syringegun.rsi/icon.png diff --git a/Resources/Textures/Exodus/Objects/Weapons/Guns/SyringeGun/syringegun.rsi/inhand-left.png b/Resources/Textures/Exodus/Objects/Weapons/Guns/syringegun.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/Exodus/Objects/Weapons/Guns/SyringeGun/syringegun.rsi/inhand-left.png rename to Resources/Textures/Exodus/Objects/Weapons/Guns/syringegun.rsi/inhand-left.png diff --git a/Resources/Textures/Exodus/Objects/Weapons/Guns/SyringeGun/syringegun.rsi/inhand-right.png b/Resources/Textures/Exodus/Objects/Weapons/Guns/syringegun.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/Exodus/Objects/Weapons/Guns/SyringeGun/syringegun.rsi/inhand-right.png rename to Resources/Textures/Exodus/Objects/Weapons/Guns/syringegun.rsi/inhand-right.png diff --git a/Resources/Textures/Exodus/Objects/Weapons/Guns/SyringeGun/syringegun.rsi/meta.json b/Resources/Textures/Exodus/Objects/Weapons/Guns/syringegun.rsi/meta.json similarity index 100% rename from Resources/Textures/Exodus/Objects/Weapons/Guns/SyringeGun/syringegun.rsi/meta.json rename to Resources/Textures/Exodus/Objects/Weapons/Guns/syringegun.rsi/meta.json diff --git a/Resources/Textures/Exodus/Objects/Weapons/Guns/SyringeGun/syringegun.rsi/tank.png b/Resources/Textures/Exodus/Objects/Weapons/Guns/syringegun.rsi/tank.png similarity index 100% rename from Resources/Textures/Exodus/Objects/Weapons/Guns/SyringeGun/syringegun.rsi/tank.png rename to Resources/Textures/Exodus/Objects/Weapons/Guns/syringegun.rsi/tank.png