From 9646b785ac5417db02ab4809d6c8500aa4755f34 Mon Sep 17 00:00:00 2001 From: Filo <98309485+Filokini@users.noreply.github.com> Date: Fri, 29 Nov 2024 19:21:47 +0500 Subject: [PATCH] =?UTF-8?q?[=D0=9F=D0=95=D0=A0=D0=95=D0=9D=D0=9E=D0=A1]?= =?UTF-8?q?=D0=9C=D1=83=D0=BB=D1=8C=D1=82=D0=B8=D1=84=D0=B0=D0=B7=D0=BE?= =?UTF-8?q?=D0=B2=D1=8B=D0=B9=20=D0=BF=D0=B8=D1=81=D1=82=D0=BE=D0=BB=D0=B5?= =?UTF-8?q?=D1=82=20=D0=93=D0=A1=D0=91=20(#802)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Со старой сборки перенесён мультифазовый пистолет ГСБ и починил выдачу цели на мобильный дефиб. Так как дробовик гсб убран из хай рисков, он стал доступен для покупки в карго. :cl: Filo - add: Была добавлена возможность закупа энерго дробовиков в карго, за счет ослабления их мощности. - add: ГСБ получил высокоценный мультифазовый пистолет с тремя режимами стрельбы, энерго дробовик же потерял в ценности. - fix: Синдикат прознал про мобильный дефибриллятор ГВ и начал раздавать цели на его кражу. --- .../Catalog/Fills/Crates/armory.ftl | 2 + .../Weapons/Guns/Battery/battery_gun.ftl | 3 + .../Weapons/Guns/Projectiles/projectiles.ftl | 3 + .../Objectives/steal-target-groups.ftl | 1 + .../ADT/Catalog/Cargo/cargo_armory.yml | 9 ++ .../ADT/Catalog/Fills/Crates/armory.yml | 8 ++ .../Weapons/Guns/Battery/battery_gun.yml | 54 ++++++++ .../Weapons/Guns/Projectiles/impact.yml | 37 ++++++ .../Weapons/Guns/Projectiles/projectiles.yml | 98 ++++++++++++++ .../ADT/Objectives/stealTargetGroups.yml | 7 + .../Prototypes/ADT/Objectives/traitor.yml | 16 ++- .../Catalog/Fills/Lockers/heads.yml | 3 +- .../Weapons/Guns/Battery/battery_guns.yml | 14 +- .../Weapons/Guns/Projectiles/projectiles.yml | 4 +- .../Prototypes/Objectives/objectiveGroups.yml | 4 +- Resources/Prototypes/Objectives/traitor.yml | 6 +- .../Guns/Battery/multifazpistol.rsi/base.png | Bin 0 -> 1141 bytes .../multifazpistol.rsi/equipped-BELT.png | Bin 0 -> 217 bytes .../Guns/Battery/multifazpistol.rsi/icon.png | Bin 0 -> 1148 bytes .../multifazpistol.rsi/inhand-left-0.png | Bin 0 -> 1052 bytes .../multifazpistol.rsi/inhand-left-1.png | Bin 0 -> 616 bytes .../multifazpistol.rsi/inhand-left-2.png | Bin 0 -> 619 bytes .../multifazpistol.rsi/inhand-left-3.png | Bin 0 -> 625 bytes .../multifazpistol.rsi/inhand-left.png | Bin 0 -> 618 bytes .../multifazpistol.rsi/inhand-right-0.png | Bin 0 -> 1032 bytes .../multifazpistol.rsi/inhand-right-1.png | Bin 0 -> 621 bytes .../multifazpistol.rsi/inhand-right-2.png | Bin 0 -> 624 bytes .../multifazpistol.rsi/inhand-right-3.png | Bin 0 -> 629 bytes .../multifazpistol.rsi/inhand-right.png | Bin 0 -> 627 bytes .../multifazpistol.rsi/mag-unshaded-0.png | Bin 0 -> 220 bytes .../multifazpistol.rsi/mag-unshaded-1.png | Bin 0 -> 157 bytes .../multifazpistol.rsi/mag-unshaded-2.png | Bin 0 -> 161 bytes .../multifazpistol.rsi/mag-unshaded-3.png | Bin 0 -> 160 bytes .../multifazpistol.rsi/mag-unshaded-4.png | Bin 0 -> 161 bytes .../multifazpistol.rsi/mag-unshaded.png | Bin 0 -> 321 bytes .../Guns/Battery/multifazpistol.rsi/meta.json | 121 ++++++++++++++++++ .../projectiles_ss.rsi/impact_laser_red.png | Bin 1603 -> 802 bytes .../impact_laser_yellow.png | Bin 0 -> 698 bytes .../Projectiles/projectiles_ss.rsi/meta.json | 14 ++ .../projectiles_ss.rsi/omnilaser.png | Bin 339 -> 250 bytes .../projectiles_ss.rsi/omnilaser_yellow.png | Bin 0 -> 240 bytes 41 files changed, 390 insertions(+), 14 deletions(-) create mode 100644 Resources/Locale/ru-RU/ADT/prototypes/Catalog/Fills/Crates/armory.ftl create mode 100644 Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Guns/Battery/battery_gun.ftl create mode 100644 Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.ftl create mode 100644 Resources/Prototypes/ADT/Catalog/Cargo/cargo_armory.yml create mode 100644 Resources/Prototypes/ADT/Catalog/Fills/Crates/armory.yml create mode 100644 Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Projectiles/impact.yml create mode 100644 Resources/Textures/ADT/Objects/Weapons/Guns/Battery/multifazpistol.rsi/base.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Guns/Battery/multifazpistol.rsi/equipped-BELT.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Guns/Battery/multifazpistol.rsi/icon.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Guns/Battery/multifazpistol.rsi/inhand-left-0.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Guns/Battery/multifazpistol.rsi/inhand-left-1.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Guns/Battery/multifazpistol.rsi/inhand-left-2.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Guns/Battery/multifazpistol.rsi/inhand-left-3.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Guns/Battery/multifazpistol.rsi/inhand-left.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Guns/Battery/multifazpistol.rsi/inhand-right-0.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Guns/Battery/multifazpistol.rsi/inhand-right-1.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Guns/Battery/multifazpistol.rsi/inhand-right-2.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Guns/Battery/multifazpistol.rsi/inhand-right-3.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Guns/Battery/multifazpistol.rsi/inhand-right.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Guns/Battery/multifazpistol.rsi/mag-unshaded-0.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Guns/Battery/multifazpistol.rsi/mag-unshaded-1.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Guns/Battery/multifazpistol.rsi/mag-unshaded-2.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Guns/Battery/multifazpistol.rsi/mag-unshaded-3.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Guns/Battery/multifazpistol.rsi/mag-unshaded-4.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Guns/Battery/multifazpistol.rsi/mag-unshaded.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Guns/Battery/multifazpistol.rsi/meta.json create mode 100644 Resources/Textures/ADT/Objects/Weapons/Guns/Projectiles/projectiles_ss.rsi/impact_laser_yellow.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Guns/Projectiles/projectiles_ss.rsi/omnilaser_yellow.png diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Catalog/Fills/Crates/armory.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Catalog/Fills/Crates/armory.ftl new file mode 100644 index 00000000000..c61519869bd --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/prototypes/Catalog/Fills/Crates/armory.ftl @@ -0,0 +1,2 @@ +ent-ADTCrateArmoryEnergyShotgun = ящик энерго-дробовиков + .desc = Если вам по душе технологии. Содержит два продвинутых энерго-дробовика. diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Guns/Battery/battery_gun.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Guns/Battery/battery_gun.ftl new file mode 100644 index 00000000000..0bee193477d --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Guns/Battery/battery_gun.ftl @@ -0,0 +1,3 @@ +ent-ADTWeaponPistolX01 = X-01 М.Э.П. + .desc = Мультифазовый энергетический пистолет. Это дорогая, современная версия антикварного лазерного пистолета. У этого оружия есть несколько уникальных режимов огня, но нет возможности самостоятельно перезаряжаться с течением времени. + .suffix = { "Пистолет, Мультифазовый" } diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.ftl new file mode 100644 index 00000000000..98d7be7d766 --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.ftl @@ -0,0 +1,3 @@ +ent-ADTBulletIon = Ионный заряд +ent-ADTBulletLaser = Лазерный заряд +ent-ADTBulletDisabler = Оглушающий заряд diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Objectives/steal-target-groups.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Objectives/steal-target-groups.ftl index bf7a09305c3..db0490017de 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Objectives/steal-target-groups.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Objectives/steal-target-groups.ftl @@ -2,3 +2,4 @@ steal-target-groups-clothing-mask-gas-ce = противогаз старшего steal-target-groups-adt-mobile-defibrillator = мобильный дефибриллятор steal-target-groups-command-id = ID карта члена командования steal-target-groups-smile-extract = экстракт Смайла +steal-target-groups-adt-pistol-x01 = X-01 М.Э.П. diff --git a/Resources/Prototypes/ADT/Catalog/Cargo/cargo_armory.yml b/Resources/Prototypes/ADT/Catalog/Cargo/cargo_armory.yml new file mode 100644 index 00000000000..c96ffc9dcc8 --- /dev/null +++ b/Resources/Prototypes/ADT/Catalog/Cargo/cargo_armory.yml @@ -0,0 +1,9 @@ +- type: cargoProduct + id: ADTArmoryEnergyShotguns + icon: + sprite: Objects/Weapons/Guns/Battery/energy_shotgun.rsi + state: icon + product: ADTCrateArmoryEnergyShotgun + cost: 12000 + category: cargoproduct-category-name-armory # Визарды, сделайте пожалуйста паренты для категорий. + group: market diff --git a/Resources/Prototypes/ADT/Catalog/Fills/Crates/armory.yml b/Resources/Prototypes/ADT/Catalog/Fills/Crates/armory.yml new file mode 100644 index 00000000000..e3809ff308f --- /dev/null +++ b/Resources/Prototypes/ADT/Catalog/Fills/Crates/armory.yml @@ -0,0 +1,8 @@ +- type: entity + id: ADTCrateArmoryEnergyShotgun + parent: CrateArmoryShotgun + components: + - type: StorageFill + contents: + - id: WeaponEnergyShotgun + amount: 2 diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Battery/battery_gun.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Battery/battery_gun.yml index 25432adafdf..7edff5be225 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Battery/battery_gun.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Battery/battery_gun.yml @@ -158,3 +158,57 @@ proto: ADTBulletCutterAdv fireCost: 75 - type: Appearance + +- type: entity + name: X-01 multiphas laser pistol + parent: BaseWeaponBatterySmall + id: ADTWeaponPistolX01 + description: new version of antique gun witout selfrcharge + components: + - type: Sprite + sprite: ADT/Objects/Weapons/Guns/Battery/multifazpistol.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-unshaded-4 + visible: false + map: ["enum.GunVisualLayers.MagUnshaded"] + shader: unshaded + - type: Appearance + - type: MagazineVisuals + magState: mag + steps: 5 + zeroVisible: false + - type: Clothing + sprite: ADT/Objects/Weapons/Guns/Battery/multifazpistol.rsi + - type: Gun + fireRate: 3 + selectedMode: FullAuto + availableModes: + - SemiAuto + - FullAuto + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/laser_cannon.ogg + - type: ProjectileBatteryAmmoProvider + proto: ADTBulletDisabler + fireCost: 50 + - type: BatteryWeaponFireModes + fireModes: + - proto: ADTBulletDisabler + fireCost: 50 + - proto: ADTBulletLaser + fireCost: 50 + - proto: ADTBulletIon + fireCost: 150 + - type: Battery + maxCharge: 1500 + startingCharge: 1500 + - type: Tag + tags: + - HighRiskItem + - type: StealTarget + stealGroup: ADTWeaponPistolX01 + - type: StaticPrice + price: 7500 + - type: Item + size: Normal diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Projectiles/impact.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Projectiles/impact.yml new file mode 100644 index 00000000000..3e7b15aa455 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Projectiles/impact.yml @@ -0,0 +1,37 @@ +- type: entity + id: ADTBulletImpactEffectLaser + name: Laser boltik + categories: [ HideSpawnMenu ] + components: + - type: TimedDespawn + lifetime: 0.2 + - type: Sprite + drawdepth: Effects + layers: + - shader: unshaded + map: ["enum.EffectLayers.Unshaded"] + sprite: ADT/Objects/Weapons/Guns/Projectiles/projectiles_ss.rsi + state: impact_laser_red + - type: EffectVisuals + - type: Tag + tags: + - HideContextMenu + +- type: entity + id: ADTBulletImpactEffectIon + categories: [ HideSpawnMenu ] + name: Kinetic bolt + components: + - type: TimedDespawn + lifetime: 0.2 + - type: Sprite + drawdepth: Effects + layers: + - shader: unshaded + map: ["enum.EffectLayers.Unshaded"] + sprite: ADT/Objects/Weapons/Guns/Projectiles/projectiles_ss.rsi + state: impact_laser_yellow + - type: EffectVisuals + - type: Tag + tags: + - HideContextMenu diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml index d687966e0f0..bd05c153067 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -112,3 +112,101 @@ Heat: 20 - type: TimedDespawn lifetime: 0.25 + +- type: entity + name: Laser bolt + id: ADTBulletLaser + parent: BaseBullet + categories: [ HideSpawnMenu ] + components: + - type: Reflective + reflective: + - Energy + - type: FlyBySound + sound: + collection: EnergyMiss + params: + volume: 5 + - type: Fixtures + fixtures: + projectile: + shape: + !type:PhysShapeAabb + bounds: "-0.15,-0.3,0.15,0.3" + hard: false + mask: + - Opaque + - type: Sprite + sprite: ADT/Objects/Weapons/Guns/Projectiles/projectiles_ss.rsi + layers: + - state: omnilaser + shader: unshaded + - type: Physics + - type: Ammo + - type: Projectile + impactEffect: ADTBulletImpactEffectLaser + damage: + types: + Heat: 12 + soundHit: + collection: WeakHit + forceSound: true + +- type: entity + name: ion bolt + id: ADTBulletIon + parent: BaseBullet + categories: [ HideSpawnMenu ] + components: + - type: Reflective + reflective: + - Energy + - type: FlyBySound + sound: + collection: EnergyMiss + params: + volume: 5 + - type: Fixtures + fixtures: + projectile: + shape: + !type:PhysShapeAabb + bounds: "-0.15,-0.3,0.15,0.3" + hard: false + mask: + - Opaque + - type: Sprite + sprite: ADT/Objects/Weapons/Guns/Projectiles/projectiles_ss.rsi + layers: + - state: omnilaser_yellow + shader: unshaded + - type: Physics + - type: Ammo + - type: Projectile + impactEffect: ADTBulletImpactEffectIon + damage: + types: + Shock: 1 + soundHit: + collection: WeakHit + forceSound: true + - type: EmpOnCollide + energyConsumption: 10000 + disableDuration: 20 + +- type: entity + name: stanner bolt + id: ADTBulletDisabler + parent: BulletDisabler + categories: [ HideSpawnMenu ] + components: + - type: StaminaDamageOnCollide + damage: 17 + - type: Projectile + impactEffect: BulletImpactEffectDisabler + damage: + types: + Heat: 4 + soundHit: + collection: WeakHit + forceSound: true diff --git a/Resources/Prototypes/ADT/Objectives/stealTargetGroups.yml b/Resources/Prototypes/ADT/Objectives/stealTargetGroups.yml index 39e307d07e3..979105a325c 100644 --- a/Resources/Prototypes/ADT/Objectives/stealTargetGroups.yml +++ b/Resources/Prototypes/ADT/Objectives/stealTargetGroups.yml @@ -13,6 +13,13 @@ sprite: ADT/Objects/Specific/Medical/mobile_defib.rsi state: icon +- type: stealTargetGroup + id: ADTWeaponPistolX01 + name: steal-target-groups-adt-pistol-x01 + sprite: + sprite: ADT/Objects/Weapons/Guns/Battery/multifazpistol.rsi + state: icon + - type: stealTargetGroup id: ADTClothingMaskGasCE name: steal-target-groups-clothing-mask-gas-ce diff --git a/Resources/Prototypes/ADT/Objectives/traitor.yml b/Resources/Prototypes/ADT/Objectives/traitor.yml index 3ff93ad8fda..352b6bae9cf 100644 --- a/Resources/Prototypes/ADT/Objectives/traitor.yml +++ b/Resources/Prototypes/ADT/Objectives/traitor.yml @@ -1,9 +1,23 @@ - type: entity categories: [ HideSpawnMenu ] parent: BaseTraitorStealObjective - id: ADTCMODefibrillatorStealObjective + id: ADTMobileDefibrillatorStealObjective components: - type: NotJobRequirement job: ChiefMedicalOfficer - type: StealCondition stealGroup: ADTMobileDefibrillator + owner: job-name-cmo + +- type: entity + categories: [ HideSpawnMenu ] + parent: BaseTraitorStealObjective + id: ADTX01StealObjective + components: + - type: Objective + difficulty: 3 + - type: NotJobRequirement + job: HeadOfSecurity + - type: StealCondition + stealGroup: ADTWeaponPistolX01 + owner: job-name-hos diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml index 2374069d89d..345b589c9b7 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml @@ -365,7 +365,8 @@ id: LockerFillHeadOfSecurityNoHardsuit table: !type:AllSelector children: - - id: WeaponEnergyShotgun + - id: ADTWeaponPistolX01 # ADT tweak Мультифаза для гсб +# - id: WeaponEnergyShotgun ADT tweak Дробовик для смотрителя - id: BookSpaceLaw - id: BoxEncryptionKeySecurity - id: CigarGoldCase diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index ddb2263d3a3..d2a89fbe1d6 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -747,17 +747,19 @@ fireCost: 100 - proto: BulletLaserHeavySpread fireCost: 100 - - proto: BulletDisablerSmgSpread - fireCost: 100 +# - proto: BulletDisablerSmgSpread # ADT nerf +# fireCost: 100 # ADT nerf - type: Item size: Large shape: - - 0,0,3,1 + - 0,0,3,3 # ADT tweak before 0 0 3 1 sprite: Objects/Weapons/Guns/Battery/inhands_64x.rsi heldPrefix: energy - - type: Tag - tags: - - HighRiskItem +# ADT tweak start +# - type: Tag +# tags: +# - HighRiskItem +# ADT tweak end - type: StealTarget stealGroup: WeaponEnergyShotgun - type: GunRequiresWield #remove when inaccuracy on spreads is fixed diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml index ccca1079be2..edb419bf364 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -1030,7 +1030,7 @@ impactEffect: BulletImpactEffectOrangeDisabler damage: types: - Heat: 13 + Heat: 10 # ADT nerf from 13 - type: entity name: wide laser barrage @@ -1052,7 +1052,7 @@ - type: Projectile damage: types: - Heat: 15 + Heat: 11 # ADT nerf from 15 - type: entity name: narrow laser barrage diff --git a/Resources/Prototypes/Objectives/objectiveGroups.yml b/Resources/Prototypes/Objectives/objectiveGroups.yml index e3054398c99..7220fa72683 100644 --- a/Resources/Prototypes/Objectives/objectiveGroups.yml +++ b/Resources/Prototypes/Objectives/objectiveGroups.yml @@ -22,7 +22,9 @@ CaptainGunStealObjective: 0.5 CaptainJetpackStealObjective: 0.5 HandTeleporterStealObjective: 0.5 - EnergyShotgunStealObjective: 0.5 +# EnergyShotgunStealObjective: 0.5 # ADT objective + ADTMobileDefibrillatorStealObjective: 1 # ADT Objective + ADTX01StealObjective: 0.5 # ADT Objective - type: weightedRandom id: TraitorObjectiveGroupKill diff --git a/Resources/Prototypes/Objectives/traitor.yml b/Resources/Prototypes/Objectives/traitor.yml index 3ac2a004eab..57b2bce512b 100644 --- a/Resources/Prototypes/Objectives/traitor.yml +++ b/Resources/Prototypes/Objectives/traitor.yml @@ -192,7 +192,7 @@ - type: StealCondition stealGroup: HandTeleporter -## hos +## hos # adt warden - type: entity categories: [ HideSpawnMenu ] @@ -203,10 +203,10 @@ # HoS will have this on them a lot of the time so.. difficulty: 3 - type: NotJobRequirement - job: HeadOfSecurity + job: Warden # ADT tweak - type: StealCondition stealGroup: WeaponEnergyShotgun - owner: job-name-hos + owner: job-name-warden # ADT tweak ## ce diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/multifazpistol.rsi/base.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/multifazpistol.rsi/base.png new file mode 100644 index 0000000000000000000000000000000000000000..0ad702a3d07237bd437007c6368089203c48cbf0 GIT binary patch literal 1141 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 Wv9s;-t9)S6VeoYIb6Mw<&;$VU#s4h; literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/multifazpistol.rsi/inhand-left-2.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/multifazpistol.rsi/inhand-left-2.png new file mode 100644 index 0000000000000000000000000000000000000000..0ea4dda80ba24a75212fbb00d60316c3a0d3c579 GIT binary patch literal 619 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|S$+ zr;B4q#hkaZHhM8T3bg%a{;H@F%hfr_&Hsqn)YK^X18#!6cHJ(j%P!j8xOr4-u3C5} z8#lM&F9tETEfM8S+F>WFb_+8Z%eSbcl;=Iaz4!E?b22T9nG|G186K`+;BaSku+U;S z6v!yh$JI~}!Vv!8Q`FIz6xk&XO_FV{4uzF>Yk1mEym>B{kQT|*-SGT)o|DkGoL|q& zc(1%ZzAVi8*Yp;f+D`|{xF@u{`qt{moe>xJS6ea5yLOpl31i9o`{{F2%9HPzL@z(t z{deDm*9&I;I=%8h4;K;RUVQ(YRBz|smA%>a719Z%#iw<|rd_Dt;r!;N`VG0J zZ>^WSGEK6laHw9bf8p=baO=jlwqF7&A9j@<{$`MJmm|=~&uRDFZ+=a;cGcNka!R<* z`OLS$y0AU3RS`#MAO%$W)0~2+QpS=m`!;IM_P=+=ap-J!@Q7{T7cpNg z+q*9KNL|317fepCm}&}^A8-G*c`x6(=(`JUTx4yz!usPu7Q0_i_50hecid{+^KlUu z$4c%Gi7{^(*6y(}T)e(vPbs5a&uZBd-XV;NKxV-ez72o4pRDEnpjh^n;kMs|&o%aG hId{37p;30ue21^meVM0vVZhYG;OXk;vd$@?2>^ux2-W}q literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/multifazpistol.rsi/inhand-left-3.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/multifazpistol.rsi/inhand-left-3.png new file mode 100644 index 0000000000000000000000000000000000000000..b712af68bb03c9e930a78c91613cf00fcc32e918 GIT binary patch literal 625 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|S$? zr;B4q#hkaZ485HV1&;sczrwG0SH@*&x1Hd0zrMRmcE^fbe3U+M)fK&6;@k5|UoFd3 zzxe2Z!j(D(c5bU9F@}$>v`vo@d{-B6>(Y}+zxPhR?vTfKD3DR0kE@{|grQ|IlY)#W z!^0H}9PX?R7FrG31$B!P)>Y*$acHXN>26qh)%UZZ)WUT8a>mc|RX1={RK8MCd3a!1 zedhZ{9icSUzFf`;ElDp=Enu8t&b8v*+gV;uk7zH<`g&!``h14nEjv2(8m|3wUO)Fu z{@K}8k8LWq-WT7MdnNe4MCojsuP2w+C*7@8)hj#mbCWIetMa+`JL{IUezcCgnOV-b zRgrNWzvIbZpT3=L;tt^*YSB8fGao*XT>RbqiCFRD`+8YhSN>hun{6+_w_)GjWU=DY zFYNCrf4i!FL$2vt>(s4NKZY)L(OCH}xju{O%CT*xSK1XC&mPmgeRx8tvdc*e&b48u ztvRz^|N7~{-B_zW!<6ye5!qd$ZCJvD0WG+uZ9W)zmGuIrk?fwfITEho2CH{5blv|g zsn0S^RUkjR(kCv4R_(0*ep obB?v+xzB%RY%JC0fyLVW6i%%j(|9NN1Je+Lr>mdKI;Vst0O=eKzyJUM literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/multifazpistol.rsi/inhand-left.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/multifazpistol.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..444862e0f8df36d531d33bb2dde8b48af4f11441 GIT binary patch literal 618 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|S$c zr;B4q#hkaZ_Io)SinP~@UuoC4YvnOjFG^5c{rI|C265LdKXe|+XNlkKj^1undik5* zQZaV+g})g1#7a6Wle&VX^NPG4&f#zInml>Vd$sM2b5uFpSsg627!Cz83iNR`6ofFe zEM`)W5oLI|f??f(rDtP{Czl1V3F#QRoHKzUUqShPu$!8 z+I#uFo&Lue`02{>kbmN@A6ge~Og=aLt?Y%07k+BLTu(-yJAdA1ZJCuRW7g#zduM-9 z)Trz_X?Xnw(+kdvDcV<)KigFu`|+6fXUxCvyH{7$rqyRXzSV!v{l<-(#ykILwKcmR zsr$up+xx=5g*)Q@)MicLP&Jj|Nmp~o&53rdG)Q%4oMEwLWS4Oj-7|Y33SbP@!9m+|t|gj~8xbj(qGY3et3V%Pq#J z%E%C!)k3IKR2YxNWk+^S^axZd8f1L1S!= Yydlsse%bX(z{JDg>FVdQ&MBb@03KWY_y7O^ literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/multifazpistol.rsi/inhand-right-0.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/multifazpistol.rsi/inhand-right-0.png new file mode 100644 index 0000000000000000000000000000000000000000..dbfbf5457fb2f5933525918d51ec9cc668c2102d GIT binary patch literal 1032 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGojKx9jP7LeL$-HD>U_RvO;uum9 z_jay*hH#+F@p!iOB@c8=n{PNyTI3zDy~|mxROq0mRj5n1LW^7q)$9Gc*mr+_M*U6W`CfOweE#|0u||7#YirgmVDY+8 z(x%PDpwGm$fWd&Vz{a|P=>W@tk8c>b7=#&)Z)VnD@L`ZS&xb16us`yE@X|%?y{unX z-f!-BRbqAVa=L!vPsKY+nnZt;YZ<>fvGLbA8#8k|mZ=IKZkONQ@JHZ-sDQWbgjrvlJ~!Ple(wGaE8=YHMQWa&PGz6^UTEJHtD6xWd0(rw zd=J^}FnW-@f4Se^ec$xw+KQ~*_d9aZd*?r53qI$vWVjWk6;AWq`kf;pvQl8}y1h4S z{g~&kp5LeSbklcv=aPNAHG6NlKmPbmHM-@+Ebs2=S3iAvTgzQ{UVQ7%sF1m9-}Ol5 z@rM5V5NH~0yO8bm`{qAduo%m$te%ZNKgNN7wgH5I-MpyuZZU_fbw_#~1uBh?#q1e@Hvi0W(cv zf)#I=!zC9;FkW7EJt_2a|D-?J;rc7XR;O<5Sj+Z&{<`1FsoW2~ua|!HFT=X@`NrQ@ z>_toKe#hPRYAR zZKrNEzh5o<=%=f`yC18_P5F3{b0*avy3JPiIk4sTtSZI3=aG zaOV4v2A`^1e?PiDXgOiPIpdjJ!g~0jlNTm^snZUi|qB-v%F>BX<7vX0c)ykR%&=J^dVU*oc+jsRe@i&OhvaomUAk6`nzC$ zh$+{D-7Gba%sGJ6pF`$l4!1V{`RkuOso@-d;k=d87pzJD*}j8s@n`1)=ie}V+5G3? z&jLmxMleHBMdClJ?3cga6%}r!NU+`zc^+ZR$Yo&ssfvZQ;%K&>A7h$ZT>k=w^%ZB2 mY92Uq;7E=otr$tWa0KZ-(S9Uw@_z#*1=%l&eCA1#BfHCF`U+3lJKiyJaGG2%dYpfCSLC0t zgB=aCgE&7%)NHu>wsd2C$(p2(xh1#y7gh*eknwa-t6o@jSNx0pz534qX8LX{CAVY` zOD@o`ab#Z+#h)!-Be5&dT3)4ma&xG6qz6;#=Ueq}N0-5 z_MmjemDK_%r~AHf%~;O1{_v8xR)vc~2Kl^k?V(?_biRnp*vhv4v{sd`20{}KQI literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/multifazpistol.rsi/inhand-right-2.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/multifazpistol.rsi/inhand-right-2.png new file mode 100644 index 0000000000000000000000000000000000000000..8bb3755bcc512f9f081449e9161865e0b720042c GIT binary patch literal 624 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|S$i zr;B4q#hkaZZ2b=fh_u~Td(p3u!^76wozTNQSy|iufNS!U579kI8@S)~N=y6YaLnZq zVrLhA!fxTQ=eH;?sQ@I0=%BY5+s)_PO8B*U6uJTl@9bofvPuRWae!W;W~QYXFtaR#%FhJ_2!)4S;HE-TJoi`f8;UGj-R|Ya;_H6Ej(Ad zI%SSbj>hJXxo?(j&bqpu^_|S#;$=E%Y87WDFnoVeZ}~7b!@Y#p!DYeDS-ty1U#D?K zu{ty5ok~@C)OqlE-umvnhm}SBa~58%>p3#F;h6_h(a++mulFtZ|MB1K_Dw$xRTf-+ zCvlF!^&#gi$E#HlKOe-sXnMP6!YxnUFx^x|&M9Z}e^1PISQ}=1=b&TrB8Ibf&pOU* z+V*)bubbtL>6t|*78~FQ4+f;5%HUqGEBfdh`6SIuU#fP_?gIF`UW4IR1`K;2S_GQ{{yS;xs&P6g8yD-d9W;!4v$ndO#!N8rR z!BUCgj38q|AIFE^8yQ#RD77wMmYU%DQN-cl>~G)G*SFueHm|C7-TEag;f#Jif~&RL zj9V;iQazdGeU=xTa6W$Jo4dApv&1gVG}215y^=mp@8O@16Hh(Wi!JWq(75@~TuN-+ zBmci44E>)kIz+m-T<-uvb_YUlfsu`S^&Tb9) z9lh00?9{VuTx~3OM7lfN7X5wex4rppv$JSt-lDrzJVz%tJo8|>G_&~X+dT`ufBZMQ zebY`ul?8XRq`xt^KIF7=I9e0&>p}Ac-rN5a_Q}3qA9cz}NMrWxf6Ct*vbJVfH1B0= zWt_EpaI@~du;VW+d zXKl<+OAfYb(WbOz-VMLl^WK^o_;daT^4+2tu0FUlb5oP$KDPCzm8wLyuztz@kangTe~DWM4f&f*SC literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/multifazpistol.rsi/inhand-right.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/multifazpistol.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..17e978be31e0e6d3d45f348bfca9c2f57c2ffe73 GIT binary patch literal 627 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|S$) zr;B4q#hkaZZ2b=fh_u~Td(p3u!^76wozTNQSy|h@!8Lixk7%Bx39R3b_3|#yGFmPvS zuvB6=BgmN0$06}OSvX*4id6r$)CAv;q7DyppZ{Kb-MOYZey@$`wVf-Ezq+Gm>Hm$%iZy6j=gG1HA%Iw$+Sj?{5>=~XfR zjmjoxZhiHgsl2bbc$to+I`K*C9l=}Hr{S&!>)mM4SH{4%f;80v% z9H6%UuZ?_jBA?v}6U!%|5|BV(z#Tpe#ambd?ygOWmI$xpo#gseD}#H%K1QvD{#y3z z2NTviT{u(98Swu=?`AeJ&4=|sK2TmNMlCwfK>hlI(nz=UP1_pkc<<>*tq;EPp!DPG zP>xUbTUgFSHD6DRS?@GK*ZP)r!ZfKpe2=R{n_RpPtTC;SopyD#!S&#TTT*-UPQM79 q@!PlH;$D_+yM24OnxWBl&iqch`h34zhIYVI#Ng@b=d#Wzp$P!D+5SiX literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/multifazpistol.rsi/mag-unshaded-0.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/multifazpistol.rsi/mag-unshaded-0.png new file mode 100644 index 0000000000000000000000000000000000000000..3c4a6d7ae19b2ab9f69b12e83042197c5d6209e6 GIT binary patch literal 220 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5DA?!e z;uumf=j|0kz6J#z)(iegb1YWM9ID{3(G=$HYA6hjUd*?jGgJLnhLlx}42yunfqF*H zTBD9MZARaH{3p&v+pbFwN)cSJ@6S|=yNxUR0%z$n_9;(qNlTjhrKx9Lu1@I<@i4Xt zE_p9bFH3G_xoNwq{s5~){=~KmhZXnnXK-YGc4xSy(7?dN0V2feoQ%(xEjii?bQy!E LtDnm{r-UW|sf9@w literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/multifazpistol.rsi/mag-unshaded-1.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/multifazpistol.rsi/mag-unshaded-1.png new file mode 100644 index 0000000000000000000000000000000000000000..04d6bef9d47955498145c41a1a773c0e768a9630 GIT binary patch literal 157 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5DCqC$ z;uumf=j}N~J_bdBqZjN?rirSzel7?WVH06#Pjc9@>|5`xX<>&m$!D{y-K s607%o7I(!GR&Bc{TVMs0go5jgvXX9m+;+eJZUBjRy85}Sb4q9e07!T&;s5{u literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/multifazpistol.rsi/mag-unshaded-2.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/multifazpistol.rsi/mag-unshaded-2.png new file mode 100644 index 0000000000000000000000000000000000000000..b671daa0d37a23d7394931fdf0b4217a2f5ebcf7 GIT binary patch literal 161 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}(Vi}jArbCx zFB|e5P~dS6tbTcAcG0|hTY{$-Fg;OpUh-;liUZ5%fHe=FKK$*|>|I6wdZ literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/multifazpistol.rsi/mag-unshaded-3.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/multifazpistol.rsi/mag-unshaded-3.png new file mode 100644 index 0000000000000000000000000000000000000000..0d510dc42a1112eaf19f019a54956a3f30a84084 GIT binary patch literal 160 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}QJyZ2ArbCx zFDvpLFyL_xoXzugneF*JE0albil$vAe4qA+`TaA^6ckkOBbE&P2lW$vBZBe(?SdVLs@ot@AR1z8XQC_mcNSpl<9ll zhE1b)(>DLt|CyI?=DmN+l_$OAJBtGYBZ~l-$PoX*u%F*U@sSc!G0++YPgg&ebxsLQ E0751-Q~&?~ literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/multifazpistol.rsi/mag-unshaded.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/multifazpistol.rsi/mag-unshaded.png new file mode 100644 index 0000000000000000000000000000000000000000..49f1a1c1add83b517bf536b7154f4b7c6ee1c0e5 GIT binary patch literal 321 zcmeAS@N?(olHy`uVBq!ia0vp^3P9|@!3HF&`%2dVDb50q$YKTtz9S&aI8~cZ8YuYL z)5S5QV$Rze8+i{I2(Vt*EVA?ygU1FoQR9H%4U8`(o8-(EEJ$P1y2jAS7_+mmWLi?7 z;B!9~;lJ5$)IOg6DRVOXVm~v`91Zae_tzYLSY+z%y|7S4&Xpl<&+PXxzPyzmHJCn3 zzwB`_nz?Py#h%E9?^C>;CU5lm#pGr$zusiJ(j~Eit3?l=Eb9}$vu>JUv8)Sghx@T# z4toC|ets(_`1z<0zeh*oL5?7oo%M%28JMm#-^1ik-@yF0u|-1S1-}UIfwvNpCpbY08^nZnukH5Ucs>`z^K|ud JS?83{1OSR-cenrm literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/multifazpistol.rsi/meta.json b/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/multifazpistol.rsi/meta.json new file mode 100644 index 00000000000..1ccbf469d0a --- /dev/null +++ b/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/multifazpistol.rsi/meta.json @@ -0,0 +1,121 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/484fcb08e8e2058b81059424fb5aa77034a3fcf1", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "mag-unshaded", + "delays": [ + [ + 0.3, + 0.3 + ] + ] + }, + { + "name": "mag-unshaded-0" + }, + { + "name": "mag-unshaded-1" + }, + { + "name": "mag-unshaded-2" + }, + { + "name": "mag-unshaded-3" + }, + { + "name": "mag-unshaded-4" + }, + { + "name": "inhand-left-0", + "directions": 4, + "delays": [ + [ + 0.3, + 0.3 + ], + [ + 0.3, + 0.3 + ], + [ + 0.3, + 0.3 + ], + [ + 0.3, + 0.3 + ] + ] + }, + { + "name": "inhand-right-0", + "directions": 4, + "delays": [ + [ + 0.3, + 0.3 + ], + [ + 0.3, + 0.3 + ], + [ + 0.3, + 0.3 + ], + [ + 0.3, + 0.3 + ] + ] + }, + { + "name": "inhand-left-1", + "directions": 4 + }, + { + "name": "inhand-right-1", + "directions": 4 + }, + { + "name": "inhand-left-2", + "directions": 4 + }, + { + "name": "inhand-right-2", + "directions": 4 + }, + { + "name": "inhand-left-3", + "directions": 4 + }, + { + "name": "inhand-right-3", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BELT", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Projectiles/projectiles_ss.rsi/impact_laser_red.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Projectiles/projectiles_ss.rsi/impact_laser_red.png index 13d69ab3631ee157c786b643933287ed8255d1bc..4d451d8593b52e3b845c60a84e919cb9796972c2 100644 GIT binary patch delta 766 zcmV=PH zPcbVJV`7M62rD0;cWh?dI18$JZWmQuw|<~#sW0iMP1EPpxz)d3Ad|^tGUv;MZG+nj z>n6!q_Xb@6=x>&vwr&4>e{0vbE&w@b!JYV7$`z(Cq6VOtsDI#8!WYB9b(A_UQ37C? z(29pbbXCnl`FmyZ5gY)+gi$;MjV>MZQ2cx)>$E;h0bB-{kPFDVY8%sG;)xpiP%I;{ z49RDO;X7Jb0a#3Ui`&qISP;DtfU#Ic0Dh6rs>0X`VGV#`!dsjP4U<-V+?h_$nNEOR z2+|MrVJ!rA27ee$goryr54Uk=I>Fcb2fp4vXb5BdSIxK_0(&NI9t+$&7T)4bh}lEW zIWqWa@YfIbxPG{&Apra5guAAh=o&x`X+W?D*;gvA0=~Q0&gQb}>fl%E#;)`?%g=Rh z0PJQ#ZGYR@yqX2Tt`OVVT>5xM{jyj#U6Q#opd`P)3V#tPC@$xaK@6QGpF=D91C)xg^trRZ^)k5E9{>P<-*;Bhg!;d^*hJTFb$>t%{gdqvIF^1Z z`U8~98cVlzGMV$`A1|DDrun$hxc~qF07*qoM6N<$f*;mp3;+NC delta 1574 zcmV+>2HE+d2Ez=HFnH;P10j^p5{HUzPF5MHJj1`8HaoC}`G*xfNH1UL_F z*bjmt09ZVTj{3ZN0{GHONOcGcfnXUd58~PKwx>ptl}wjCPsBE@;sJ;u=&FKXHW&zS zLtr7KYveT90I>LtzLP}4*zG>QJhL;|=!NZVc*q|kQ-7SA5ODO9LWKj%lSGY98yy*` z_#J^RU&dNYnaEm==5_k0gQ3x!(8vXf0DyRBK0Z9>8!Nv)^P}m{(=Su-@X58?RH!$Y z9*fNBFa$MH0RU7eiso}^PmLfe8RN6a_c~Dl*m-TlpB4g_FJmhtkvmwkExMlzWC4Ka zgLqFSa(^bTH(T%eCa4on{v)Q|7)JK`{rX}VO-6h%>#at0t379s6Iz7;0Ma~9gY^rn zIfio{i|@X21p!D*PopD-0O?@lb1v+HMroi309ZfETDtw*l1+c@8a46B$LPU#KmCkY zy*@*jOSxp;X->eomH~WG>tFbC^g*szBw)73;(y`Z006{$-+d1~Kl07j2*QpF@WjaH z9p*B z`7h`geZ3SIjm%TOjl7b!@YzInA;I;oKW@1sLIuDRpx6a+QUJ=LK(ic7ge|84L=@(M zzkddUsOI-4!+lOJru%91Y8BqUHh+VPyItk`Cr0vT|6NHyPta=q!+miH+|Fh8RDk^^ zL6|i4W-ICrRRaKn!aV>$5a$$#hv<7YBd94-1Hi5_SmE7J-u5elxB{qN2C)lp=O=B1 z)D$iTi(LTcP&s@~BSeVGA5;w77OU0>iGK%GZykU?S0nP`XNeazJ=z1jt-v+gV!9O0>qBKh30^c4xb8x*Bqb%#E!m&=75e4 zp9+I-+5zp{A5c$c#OApnJ?~9NuPSAt7(l!C2S^1;g~v@!JAB8PkEh_M6oMiEhp|6E z3;>G<(Hnhxw*m#0Ly95D25=br1App?f7IVkqzrcZ@WcCl{5f0ZdH8#7aQuN%2#Nr- zdw+lw0Ejp8g>%d9q4?$5Y0vF}NhEyi(VS(?H4r`<|Hp|T$V~-V01j(^00sco2l2L2 zDo|idrg`5e|3WlMjK6gO?Gc*&ZYBmtdp;GnvRP-u>P1eF13?jhw(buQg?}Fd0PANA zR!3iIy;`1{rBiV0kma*Km!07gVhKr?K;6!3FPmV1K}VQVRqw3kw;7sFv$B~exiz(5XTe}HrnTo?+X zn%|S(@;hP){jY(`S$O~I!hbK8q^o=Tq4QMKzxsC)dICB557#OJ02j1#e?X%i03e7z z2k{X7-t~3V6sZmXyP)0s1Edge=O=B1lnTf9mF)oWK-#%KK<+vKe@|}YTLOUHARgR- z?hmL#LAoYTD!gR?^&-=W=bB1^P89mQF>3&hQZ$>Px%bV)=(RCt{2n!j$sFc8MCRmI3$MTHq5R)&s|I`9s>P2YvFI|C9U11qYSp~?d= zGIhwGUaod>XFCv!`$-6Jz~ALNJC36RP!vT`lqlJ+M$`RjH1+A@DO51Gf}C(tyk}*@ ze0lzs^yg%N&2_1`hh}2^VPOV07LfsrAVlI0x>WO>eBVjqU>m>)LM-m6i%&W&-nXbt z6vwki5akO{TlE{?ixYvGo*G`pIND$tzzD)gybXhi???~prU3AX+N#8~C8E^;Mi9>8 zOt6_X)5ntqj3)~)953T&O$2uYScC8p7gD?6jVBAZUJh`*9Hd@CtlN+n!qxkrAPtOsR`)h8}%h7 z^twI(W5~Q!-!wgJ#84kVVe4~xd1--2gxRrj?^#LLDds`oHEBz?y1IV(* z(&sLPG1LcOMEV?hT_1p%FV7otWjE?~awiDTU9qwYO-o#71{A_~sSmKkQZvD2BLtw^ gVMS3CMNuA@U%}xth2{%bbpQYW07*qoM6N<$f(?l=s{jB1 literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Projectiles/projectiles_ss.rsi/meta.json b/Resources/Textures/ADT/Objects/Weapons/Guns/Projectiles/projectiles_ss.rsi/meta.json index ee65042bd36..64e5143d518 100644 --- a/Resources/Textures/ADT/Objects/Weapons/Guns/Projectiles/projectiles_ss.rsi/meta.json +++ b/Resources/Textures/ADT/Objects/Weapons/Guns/Projectiles/projectiles_ss.rsi/meta.json @@ -13,6 +13,9 @@ { "name": "omnilaser_greyscale" }, + { + "name": "omnilaser_yellow" + }, { "name": "impact_bullet", "delays": [ @@ -46,6 +49,17 @@ 0.05 ] ] + }, + { + "name": "impact_laser_yellow", + "delays": [ + [ + 0.05, + 0.05, + 0.05, + 0.05 + ] + ] } ] } diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Projectiles/projectiles_ss.rsi/omnilaser.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Projectiles/projectiles_ss.rsi/omnilaser.png index 41d3e030099571904b70d8e7459186ad452b050a..58156ee91587cd52d4d63394369713dcac4f4618 100644 GIT binary patch delta 210 zcmV;@04@L10{Q`vFn<8FNkl40ju`vWp;Q%&*8#sqsIMQw59By!s z#sMr8J65sS+Bp?BN>ZSDWeV;4FQrufKcj#$`h9e z$;kx+?f|N0Lvli3)ByvY21Xq);2}WOTrk*bL;5#Jkm8eIlZ?d1DRFfHT7nwTMk&lK y1KKP{a>T%OOeKiS<^+|Il?Di!N`is`cK`rZYkV+DH6%d*0000!VG`NKs=c-*{n(i0K{8jJ3)u&Vp%X3nk)`%L||pwAJD zhG_{`7#H(Nlpa{Y>?UjQsv(e_r&fQ^Y#(kB;k2%k literal 0 HcmV?d00001