diff --git a/Resources/Locale/en-US/_DV/research/technologies.ftl b/Resources/Locale/en-US/_DV/research/technologies.ftl index 321ad2d667..1715d6ec51 100644 --- a/Resources/Locale/en-US/_DV/research/technologies.ftl +++ b/Resources/Locale/en-US/_DV/research/technologies.ftl @@ -10,6 +10,7 @@ research-technology-engineering-eva = EVA PPE Suits research-technology-cloning = Cloning research-technology-artifact-display = Artifact Display Technology research-technology-psionic-prosthetics = Psionic Prosthetics +research-technology-directed-radiation = Directed Radiation # Civilian research-technology-civilian-mechs = Civilian Mechs diff --git a/Resources/Prototypes/Recipes/Lathes/Packs/science.yml b/Resources/Prototypes/Recipes/Lathes/Packs/science.yml index acd530f6f0..ac7801160c 100644 --- a/Resources/Prototypes/Recipes/Lathes/Packs/science.yml +++ b/Resources/Prototypes/Recipes/Lathes/Packs/science.yml @@ -60,6 +60,7 @@ #- WeaponTetherGun # End DeltaV Removals - WeaponGauntletGorilla + - WeaponMicrowaveEmitter # DeltaV - Microwave emitter # Only contains parts for making basic modular grenades, no actual explosives - type: latheRecipePack diff --git a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index 6a1bb86d36..6943590f5e 100644 --- a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -620,3 +620,38 @@ Firemode: Disabler: { state: mode-disabler } Lethal: { state: mode-lethal } + +- type: entity + name: microwave emitter + parent: BaseWeaponBatterySmall + id: WeaponMicrowaveEmitter + description: A handheld device emitting concentrated, low-intensity radiation. Does not cook your food. + components: + - type: Sprite + sprite: _DV/Objects/Weapons/Guns/Battery/microwave_emitter.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-unshaded-4 + map: ["enum.GunVisualLayers.MagUnshaded"] + shader: unshaded + - type: MagazineVisuals + magState: mag + steps: 5 + zeroVisible: false + - type: Item + shape: + - 0,0,1,1 + size: Small + sprite: _DV/Objects/Weapons/Guns/Battery/microwave_emitter.rsi + - type: Gun + selectedMode: FullAuto + fireRate: 5 + availableModes: + - FullAuto + soundGunshot: + path: /Audio/_DV/Weapons/Guns/Gunshots/beamcannon.ogg + - type: ProjectileBatteryAmmoProvider + proto: BulletRadiation + fireCost: 100 + - type: Appearance diff --git a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Projectiles/impacts.yml b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Projectiles/impacts.yml index 869da03ded..e15abae2f8 100644 --- a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Projectiles/impacts.yml +++ b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Projectiles/impacts.yml @@ -16,3 +16,22 @@ - type: Tag tags: - HideContextMenu + +- type: entity + id: BulletImpactEffectLightGreenDisabler + categories: [ HideSpawnMenu ] + components: + - type: TimedDespawn + lifetime: 0.2 + - type: Sprite + drawdepth: Effects + layers: + - shader: unshaded + map: ["enum.EffectLayers.Unshaded"] + sprite: Objects/Weapons/Guns/Projectiles/projectiles_tg.rsi + state: impact_laser_greyscale + color: lightgreen + - type: EffectVisuals + - type: Tag + tags: + - HideContextMenu diff --git a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml index 3143d1d299..1dec84e7b4 100644 --- a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -183,3 +183,24 @@ Shadow: 20 - type: TimedDespawn lifetime: 0.4 # really short, shouldn't travel far at all + +- type: entity + id: BulletRadiation + name: radiation wave + parent: BulletEnergyGunLaser + categories: [ HideSpawnMenu ] + description: Sheer gamma radiation! Hopefully you are shielded. + components: + - type: Projectile + impactEffect: BulletImpactEffectLightGreenDisabler + damage: + types: + Radiation: 2 + - type: Sprite + sprite: Objects/Weapons/Guns/Projectiles/projectiles_tg.rsi + layers: + - state: omnilaser_greyscale + shader: unshaded + color: lightgreen + - type: TimedDespawn + lifetime: 0.08 diff --git a/Resources/Prototypes/_DV/Recipes/Lathes/devices.yml b/Resources/Prototypes/_DV/Recipes/Lathes/devices.yml index 9895680e3f..48ff2a41b6 100644 --- a/Resources/Prototypes/_DV/Recipes/Lathes/devices.yml +++ b/Resources/Prototypes/_DV/Recipes/Lathes/devices.yml @@ -36,3 +36,14 @@ Steel: 100 Glass: 100 Gold: 100 + +- type: latheRecipe + id: WeaponMicrowaveEmitter + result: WeaponMicrowaveEmitter + categories: + - Tools + completetime: 5 + materials: + Steel: 500 + Glass: 400 + Uranium: 100 diff --git a/Resources/Prototypes/_DV/Research/experimental.yml b/Resources/Prototypes/_DV/Research/experimental.yml index 7ddab88ffe..49be970daa 100644 --- a/Resources/Prototypes/_DV/Research/experimental.yml +++ b/Resources/Prototypes/_DV/Research/experimental.yml @@ -23,3 +23,15 @@ - DispelLeftArm - RecallLeftArm - ForcewallLeftArm + +- type: technology + id: DirectedRadiation + name: research-technology-directed-radiation + icon: + sprite: _DV/Objects/Weapons/Guns/Battery/microwave_emitter.rsi + state: icon + discipline: Experimental + tier: 1 + cost: 5000 + recipeUnlocks: + - WeaponMicrowaveEmitter diff --git a/Resources/Textures/_DV/Objects/Weapons/Guns/Battery/microwave_emitter.rsi/base.png b/Resources/Textures/_DV/Objects/Weapons/Guns/Battery/microwave_emitter.rsi/base.png new file mode 100644 index 0000000000..a43bad4f2c Binary files /dev/null and b/Resources/Textures/_DV/Objects/Weapons/Guns/Battery/microwave_emitter.rsi/base.png differ diff --git a/Resources/Textures/_DV/Objects/Weapons/Guns/Battery/microwave_emitter.rsi/icon.png b/Resources/Textures/_DV/Objects/Weapons/Guns/Battery/microwave_emitter.rsi/icon.png new file mode 100644 index 0000000000..f737a56088 Binary files /dev/null and b/Resources/Textures/_DV/Objects/Weapons/Guns/Battery/microwave_emitter.rsi/icon.png differ diff --git a/Resources/Textures/_DV/Objects/Weapons/Guns/Battery/microwave_emitter.rsi/inhand-left.png b/Resources/Textures/_DV/Objects/Weapons/Guns/Battery/microwave_emitter.rsi/inhand-left.png new file mode 100644 index 0000000000..52edc9fc98 Binary files /dev/null and b/Resources/Textures/_DV/Objects/Weapons/Guns/Battery/microwave_emitter.rsi/inhand-left.png differ diff --git a/Resources/Textures/_DV/Objects/Weapons/Guns/Battery/microwave_emitter.rsi/inhand-right.png b/Resources/Textures/_DV/Objects/Weapons/Guns/Battery/microwave_emitter.rsi/inhand-right.png new file mode 100644 index 0000000000..f8946404dd Binary files /dev/null and b/Resources/Textures/_DV/Objects/Weapons/Guns/Battery/microwave_emitter.rsi/inhand-right.png differ diff --git a/Resources/Textures/_DV/Objects/Weapons/Guns/Battery/microwave_emitter.rsi/mag-unshaded-0.png b/Resources/Textures/_DV/Objects/Weapons/Guns/Battery/microwave_emitter.rsi/mag-unshaded-0.png new file mode 100644 index 0000000000..4f86356f08 Binary files /dev/null and b/Resources/Textures/_DV/Objects/Weapons/Guns/Battery/microwave_emitter.rsi/mag-unshaded-0.png differ diff --git a/Resources/Textures/_DV/Objects/Weapons/Guns/Battery/microwave_emitter.rsi/mag-unshaded-1.png b/Resources/Textures/_DV/Objects/Weapons/Guns/Battery/microwave_emitter.rsi/mag-unshaded-1.png new file mode 100644 index 0000000000..683b1ccc71 Binary files /dev/null and b/Resources/Textures/_DV/Objects/Weapons/Guns/Battery/microwave_emitter.rsi/mag-unshaded-1.png differ diff --git a/Resources/Textures/_DV/Objects/Weapons/Guns/Battery/microwave_emitter.rsi/mag-unshaded-2.png b/Resources/Textures/_DV/Objects/Weapons/Guns/Battery/microwave_emitter.rsi/mag-unshaded-2.png new file mode 100644 index 0000000000..e7539c7889 Binary files /dev/null and b/Resources/Textures/_DV/Objects/Weapons/Guns/Battery/microwave_emitter.rsi/mag-unshaded-2.png differ diff --git a/Resources/Textures/_DV/Objects/Weapons/Guns/Battery/microwave_emitter.rsi/mag-unshaded-3.png b/Resources/Textures/_DV/Objects/Weapons/Guns/Battery/microwave_emitter.rsi/mag-unshaded-3.png new file mode 100644 index 0000000000..9e2d14c7cf Binary files /dev/null and b/Resources/Textures/_DV/Objects/Weapons/Guns/Battery/microwave_emitter.rsi/mag-unshaded-3.png differ diff --git a/Resources/Textures/_DV/Objects/Weapons/Guns/Battery/microwave_emitter.rsi/mag-unshaded-4.png b/Resources/Textures/_DV/Objects/Weapons/Guns/Battery/microwave_emitter.rsi/mag-unshaded-4.png new file mode 100644 index 0000000000..e1a36d5f23 Binary files /dev/null and b/Resources/Textures/_DV/Objects/Weapons/Guns/Battery/microwave_emitter.rsi/mag-unshaded-4.png differ diff --git a/Resources/Textures/_DV/Objects/Weapons/Guns/Battery/microwave_emitter.rsi/meta.json b/Resources/Textures/_DV/Objects/Weapons/Guns/Battery/microwave_emitter.rsi/meta.json new file mode 100644 index 0000000000..b67548a18c --- /dev/null +++ b/Resources/Textures/_DV/Objects/Weapons/Guns/Battery/microwave_emitter.rsi/meta.json @@ -0,0 +1,40 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprites by EmberAstra (github)", + "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 + } + ] +}