diff --git a/Resources/Locale/en-US/deltav/research/technologies.ftl b/Resources/Locale/en-US/deltav/research/technologies.ftl index ae1a8fe69ab..e26eb2c2d3b 100644 --- a/Resources/Locale/en-US/deltav/research/technologies.ftl +++ b/Resources/Locale/en-US/deltav/research/technologies.ftl @@ -6,3 +6,4 @@ research-technology-energy-gun-advance = Advanced Energy Manipulation research-technology-advance-laser = Advanced Laser Manipulation research-technology-robust-melee = Robust Melee research-technology-syringe-gun = Syringe Gun +research-technology-biopulse-emitter = Bio-Pulse Emitter diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index 8885134daef..b64eb6fe1ee 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -262,6 +262,38 @@ zeroVisible: true - type: Appearance +- type: entity + parent: BaseWeaponBattery + id: WeaponHealGun + name: Medi-Beam + description: "A high-tech firearm that shoots specialized healing projectiles." + components: + - type: Sprite + sprite: DeltaV/Objects/Weapons/Guns/Battery/heal_gun.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-unshaded-4 + map: ["enum.GunVisualLayers.MagUnshaded"] + shader: unshaded + - type: Clothing + sprite: DeltaV/Objects/Weapons/Guns/Battery/heal_gun.rsi + - type: Gun + soundGunshot: + path: /Audio/DeltaV/Weapons/Guns/Gunshots/laser.ogg + soundEmpty: + path: /Audio/DeltaV/Weapons/Guns/Empty/dry_fire.ogg + selectedMode: SemiAuto + fireRate: 2 + availableModes: + - SemiAuto + - type: Battery + maxCharge: 2000 + startingCharge: 2000 + - type: ProjectileBatteryAmmoProvider + proto: BulletHealLaser + fireCost: 100 + - type: entity parent: [ BaseWeaponBattery, BaseGunWieldable, BaseSecurityContraband ] id: WeaponBeamCannon diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml index 2eac2b57f9c..2203249f2b2 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -1,3 +1,33 @@ + - type: entity + parent: BaseBullet + id: BulletHealLaser + name: heal bolt + categories: [ HideSpawnMenu ] + components: + - type: Reflective + reflective: + - Energy + - type: FlyBySound + sound: + collection: EnergyMiss + params: + volume: 5 + - type: Sprite + sprite: Objects/Weapons/Guns/Projectiles/projectiles_tg.rsi + layers: + - state: omnilaser_greyscale + shader: unshaded + color: mediumseagreen + - type: Ammo + - type: Physics + - type: Projectile + damage: + groups: + Brute: -15 + Burn: -10 + Airloss: -15 + ignoreResistances: true + # Because Hitscan lasers aren't fun to shoot in my opinion, we give the HoS pistol a special lethal laser that moves - type: entity parent: BaseBullet diff --git a/Resources/Prototypes/DeltaV/Recipes/Lathes/medical.yml b/Resources/Prototypes/DeltaV/Recipes/Lathes/medical.yml index 945829974eb..8c2a8864916 100644 --- a/Resources/Prototypes/DeltaV/Recipes/Lathes/medical.yml +++ b/Resources/Prototypes/DeltaV/Recipes/Lathes/medical.yml @@ -22,3 +22,13 @@ materials: Plastic: 150 Steel: 50 + +- type: latheRecipe + parent: BaseWeaponRecipe + id: WeaponHealGun + result: WeaponHealGun + materials: + Plastic: 1000 + Glass: 500 + Steel: 750 + Gold: 100 diff --git a/Resources/Prototypes/DeltaV/Research/experimental.yml b/Resources/Prototypes/DeltaV/Research/experimental.yml new file mode 100644 index 00000000000..c5c3c265f51 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Research/experimental.yml @@ -0,0 +1,11 @@ +- type: technology + id: BioPulseEmitter + name: research-technology-biopulse-emitter + icon: + sprite: DeltaV/Objects/Weapons/Guns/Battery/heal_gun.rsi + state: icon + discipline: Experimental + tier: 3 + cost: 10000 + recipeUnlocks: + - WeaponHealGun diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 3bec2417ef1..5cdd3ed6b15 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -896,6 +896,7 @@ - ClothingOuterHardsuitSyndieReverseEngineered - ClothingShoesBootsSecurityMagboots - AdvancedTruncheon + - WeaponHealGun - WeaponBeamCannon # End DeltaV additions - type: MaterialStorage @@ -1025,6 +1026,7 @@ # Begin DeltaV additions - LauncherSyringe - MiniSyringe + - WeaponHealGun # End DeltaV additions - ChemicalPayload - CryostasisBeaker diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/heal_gun.rsi/0-inhand-left.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/heal_gun.rsi/0-inhand-left.png new file mode 100644 index 00000000000..db5f11f725e Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/heal_gun.rsi/0-inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/heal_gun.rsi/0-inhand-right.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/heal_gun.rsi/0-inhand-right.png new file mode 100644 index 00000000000..e5f453e600a Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/heal_gun.rsi/0-inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/heal_gun.rsi/25-inhand-left.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/heal_gun.rsi/25-inhand-left.png new file mode 100644 index 00000000000..c88cbee0c0e Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/heal_gun.rsi/25-inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/heal_gun.rsi/25-inhand-right.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/heal_gun.rsi/25-inhand-right.png new file mode 100644 index 00000000000..b9313c24669 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/heal_gun.rsi/25-inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/heal_gun.rsi/50-inhand-left.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/heal_gun.rsi/50-inhand-left.png new file mode 100644 index 00000000000..40397084e9a Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/heal_gun.rsi/50-inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/heal_gun.rsi/50-inhand-right.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/heal_gun.rsi/50-inhand-right.png new file mode 100644 index 00000000000..dc68d72439a Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/heal_gun.rsi/50-inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/heal_gun.rsi/75-inhand-left.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/heal_gun.rsi/75-inhand-left.png new file mode 100644 index 00000000000..b7aaba0f9b3 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/heal_gun.rsi/75-inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/heal_gun.rsi/75-inhand-right.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/heal_gun.rsi/75-inhand-right.png new file mode 100644 index 00000000000..b10d33cdb52 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/heal_gun.rsi/75-inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/heal_gun.rsi/base.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/heal_gun.rsi/base.png new file mode 100644 index 00000000000..1f29eded581 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/heal_gun.rsi/base.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/heal_gun.rsi/equipped-BACKPACK.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/heal_gun.rsi/equipped-BACKPACK.png new file mode 100644 index 00000000000..2b2a8db9c77 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/heal_gun.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/heal_gun.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/heal_gun.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 00000000000..2b2a8db9c77 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/heal_gun.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/heal_gun.rsi/icon.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/heal_gun.rsi/icon.png new file mode 100644 index 00000000000..055316e8f8f Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/heal_gun.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/heal_gun.rsi/inhand-left.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/heal_gun.rsi/inhand-left.png new file mode 100644 index 00000000000..c60c5299b40 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/heal_gun.rsi/inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/heal_gun.rsi/inhand-right.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/heal_gun.rsi/inhand-right.png new file mode 100644 index 00000000000..4edbe9a13ac Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/heal_gun.rsi/inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/heal_gun.rsi/mag-unshaded-0.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/heal_gun.rsi/mag-unshaded-0.png new file mode 100644 index 00000000000..6be3d0816f3 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/heal_gun.rsi/mag-unshaded-0.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/heal_gun.rsi/mag-unshaded-1.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/heal_gun.rsi/mag-unshaded-1.png new file mode 100644 index 00000000000..87bf6f93e10 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/heal_gun.rsi/mag-unshaded-1.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/heal_gun.rsi/mag-unshaded-2.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/heal_gun.rsi/mag-unshaded-2.png new file mode 100644 index 00000000000..66f68198726 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/heal_gun.rsi/mag-unshaded-2.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/heal_gun.rsi/mag-unshaded-3.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/heal_gun.rsi/mag-unshaded-3.png new file mode 100644 index 00000000000..39d4011c5ea Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/heal_gun.rsi/mag-unshaded-3.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/heal_gun.rsi/mag-unshaded-4.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/heal_gun.rsi/mag-unshaded-4.png new file mode 100644 index 00000000000..215f17ad91c Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/heal_gun.rsi/mag-unshaded-4.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/heal_gun.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/heal_gun.rsi/meta.json new file mode 100644 index 00000000000..b9b7ef7e3cd --- /dev/null +++ b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/heal_gun.rsi/meta.json @@ -0,0 +1,80 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from vgstation at https://github.com/vgstation-coders/vgstation13/commit/125c975f1b3bf9826b37029e9ab5a5f89e975a7e, backpack sprite by Peptide, backpack sling sprite edited by Boaz1111, wield sprites by RiceMar1244,Edited for DeltaV by Stop_Sign and bogus", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "mag-unshaded-0" + }, + { + "name": "mag-unshaded-1" + }, + { + "name": "mag-unshaded-2" + }, + { + "name": "mag-unshaded-3" + }, + { + "name": "mag-unshaded-4" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "0-inhand-left", + "directions": 4 + }, + { + "name": "0-inhand-right", + "directions": 4 + }, + { + "name": "25-inhand-left", + "directions": 4 + }, + { + "name": "25-inhand-right", + "directions": 4 + }, + { + "name": "50-inhand-left", + "directions": 4 + }, + { + "name": "50-inhand-right", + "directions": 4 + }, + { + "name": "75-inhand-left", + "directions": 4 + }, + { + "name": "75-inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + } + ] +}