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 00000000000..0ad702a3d07 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/multifazpistol.rsi/base.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/multifazpistol.rsi/equipped-BELT.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/multifazpistol.rsi/equipped-BELT.png new file mode 100644 index 00000000000..a4d64471de7 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/multifazpistol.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/multifazpistol.rsi/icon.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/multifazpistol.rsi/icon.png new file mode 100644 index 00000000000..35daccd2394 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/multifazpistol.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/multifazpistol.rsi/inhand-left-0.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/multifazpistol.rsi/inhand-left-0.png new file mode 100644 index 00000000000..80a6ce64685 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/multifazpistol.rsi/inhand-left-0.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/multifazpistol.rsi/inhand-left-1.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/multifazpistol.rsi/inhand-left-1.png new file mode 100644 index 00000000000..31fb152e6e6 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/multifazpistol.rsi/inhand-left-1.png differ 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 00000000000..0ea4dda80ba Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/multifazpistol.rsi/inhand-left-2.png differ 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 00000000000..b712af68bb0 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/multifazpistol.rsi/inhand-left-3.png differ 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 00000000000..444862e0f8d Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/multifazpistol.rsi/inhand-left.png differ 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 00000000000..dbfbf5457fb Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/multifazpistol.rsi/inhand-right-0.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/multifazpistol.rsi/inhand-right-1.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/multifazpistol.rsi/inhand-right-1.png new file mode 100644 index 00000000000..bf3da0587c3 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/multifazpistol.rsi/inhand-right-1.png differ 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 00000000000..8bb3755bcc5 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/multifazpistol.rsi/inhand-right-2.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/multifazpistol.rsi/inhand-right-3.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/multifazpistol.rsi/inhand-right-3.png new file mode 100644 index 00000000000..34acbc27452 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/multifazpistol.rsi/inhand-right-3.png differ 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 00000000000..17e978be31e Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/multifazpistol.rsi/inhand-right.png differ 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 00000000000..3c4a6d7ae19 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/multifazpistol.rsi/mag-unshaded-0.png differ 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 00000000000..04d6bef9d47 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/multifazpistol.rsi/mag-unshaded-1.png differ 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 00000000000..b671daa0d37 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/multifazpistol.rsi/mag-unshaded-2.png differ 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 00000000000..0d510dc42a1 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/multifazpistol.rsi/mag-unshaded-3.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/multifazpistol.rsi/mag-unshaded-4.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/multifazpistol.rsi/mag-unshaded-4.png new file mode 100644 index 00000000000..ebb4d9af627 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/multifazpistol.rsi/mag-unshaded-4.png differ 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 00000000000..49f1a1c1add Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/multifazpistol.rsi/mag-unshaded.png differ 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 13d69ab3631..4d451d8593b 100644 Binary files a/Resources/Textures/ADT/Objects/Weapons/Guns/Projectiles/projectiles_ss.rsi/impact_laser_red.png and b/Resources/Textures/ADT/Objects/Weapons/Guns/Projectiles/projectiles_ss.rsi/impact_laser_red.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Projectiles/projectiles_ss.rsi/impact_laser_yellow.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Projectiles/projectiles_ss.rsi/impact_laser_yellow.png new file mode 100644 index 00000000000..d378470d2ba Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Projectiles/projectiles_ss.rsi/impact_laser_yellow.png differ 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 41d3e030099..58156ee9158 100644 Binary files a/Resources/Textures/ADT/Objects/Weapons/Guns/Projectiles/projectiles_ss.rsi/omnilaser.png and b/Resources/Textures/ADT/Objects/Weapons/Guns/Projectiles/projectiles_ss.rsi/omnilaser.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Projectiles/projectiles_ss.rsi/omnilaser_yellow.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Projectiles/projectiles_ss.rsi/omnilaser_yellow.png new file mode 100644 index 00000000000..ef545a2eecf Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Projectiles/projectiles_ss.rsi/omnilaser_yellow.png differ