From: Emisse <99158783+Emisse@users.noreply.github.com> Date: Sun, 17 Dec 2023 03:43:49 +0000 (-0700) Subject: Svalinn Experimental Battery Ammo Research [T3] (#22045) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=8c1eecffd471700fa951997bdef2df7eb1c80c14;p=space-station-14.git Svalinn Experimental Battery Ammo Research [T3] (#22045) --- diff --git a/Resources/Locale/en-US/research/technologies.ftl b/Resources/Locale/en-US/research/technologies.ftl index 6a6a0e5ff2..efd1126eed 100644 --- a/Resources/Locale/en-US/research/technologies.ftl +++ b/Resources/Locale/en-US/research/technologies.ftl @@ -42,6 +42,7 @@ research-technology-concentrated-laser-weaponry = Concentrated Laser Weaponry research-technology-wave-particle-harnessing = Wave Particle Harnessing research-technology-advanced-riot-control = Advanced Riot Control research-technology-portable-microfusion-weaponry = Portable Microfusion Weaponry +research-technology-experimental-battery-ammo = Experimental Battery Ammo research-technology-basic-robotics = Basic Robotics research-technology-basic-anomalous-research = Basic Anomalous Research diff --git a/Resources/Prototypes/Entities/Objects/Power/powercells.yml b/Resources/Prototypes/Entities/Objects/Power/powercells.yml index 01680dec3a..841288c479 100644 --- a/Resources/Prototypes/Entities/Objects/Power/powercells.yml +++ b/Resources/Prototypes/Entities/Objects/Power/powercells.yml @@ -28,9 +28,13 @@ - type: Tag tags: - DroneUsable + - PowerCell - type: Appearance - type: PowerCellVisuals - type: Riggable + - type: HitscanBatteryAmmoProvider + proto: RedLightLaser + fireCost: 50 - type: entity name: potato battery @@ -112,7 +116,7 @@ startingCharge: 720 - type: MachinePart part: PowerCell - rating: 2 + rating: 2 - type: entity id: PowerCellMediumPrinted @@ -151,7 +155,7 @@ - type: MachinePart part: PowerCell rating: 3 - + - type: entity id: PowerCellHighPrinted suffix: Empty @@ -189,7 +193,7 @@ - type: MachinePart part: PowerCell rating: 4 - + - type: entity id: PowerCellHyperPrinted suffix: Empty 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 dc920caec0..b4d3ce5b91 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -31,6 +31,41 @@ - type: StaticPrice price: 500 +- type: entity + id: BaseWeaponPowerCell + parent: BaseItem + abstract: true + components: + - type: Sprite + - type: Item + size: Huge + - type: AmmoCounter + - type: Gun + fireRate: 2 + selectedMode: SemiAuto + availableModes: + - SemiAuto + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/laser.ogg + - type: MagazineAmmoProvider + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: PowerCellSmall + insertSound: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg + ejectSound: /Audio/Weapons/Guns/MagOut/batrifle_magout.ogg + whitelist: + tags: + - PowerCell + - PowerCellSmall + - type: Appearance + - type: StaticPrice + price: 500 + - type: ContainerContainer + containers: + gun_magazine: !type:ContainerSlot + - type: entity id: BaseWeaponBatterySmall parent: BaseWeaponBattery @@ -47,6 +82,43 @@ slots: - Belt +- type: entity + id: BaseWeaponPowerCellSmall + parent: BaseWeaponPowerCell + abstract: true + components: + - type: Item + size: Small + - type: Tag + tags: + - Sidearm + - type: Clothing + sprite: Objects/Weapons/Guns/Battery/taser.rsi + quickEquip: false + slots: + - Belt + +- type: entity + name: svalinn laser pistol + parent: BaseWeaponPowerCellSmall + id: WeaponLaserSvalinn + description: A cheap and widely used laser pistol. + components: + - type: Sprite + sprite: Objects/Weapons/Guns/Battery/svalinn.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-unshaded-4 + map: ["enum.GunVisualLayers.MagUnshaded"] + shader: unshaded + - type: Item + sprite: Objects/Weapons/Guns/Battery/svalinn.rsi + - type: MagazineVisuals + magState: mag + steps: 5 + zeroVisible: true + - type: entity name: retro laser blaster parent: BaseWeaponBatterySmall diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index d2bb9efde3..f1f504f8f2 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -267,6 +267,7 @@ - WeaponCrusherDagger - WeaponCrusherGlaive - WeaponForceGun + - WeaponLaserSvalinn - WeaponProtoKineticAccelerator - WeaponTetherGun - WeaponGrapplingGun diff --git a/Resources/Prototypes/Recipes/Lathes/security.yml b/Resources/Prototypes/Recipes/Lathes/security.yml index 6c4ca98938..e576021b5a 100644 --- a/Resources/Prototypes/Recipes/Lathes/security.yml +++ b/Resources/Prototypes/Recipes/Lathes/security.yml @@ -55,6 +55,14 @@ Plastic: 750 Gold: 500 +- type: latheRecipe + id: WeaponLaserSvalinn + result: WeaponLaserSvalinn + completetime: 5 + materials: + Steel: 2000 + Gold: 500 + - type: latheRecipe id: WeaponXrayCannon result: WeaponXrayCannon diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml index 0ff93e3a55..e092b5e54f 100644 --- a/Resources/Prototypes/Research/arsenal.yml +++ b/Resources/Prototypes/Research/arsenal.yml @@ -158,3 +158,15 @@ cost: 15000 recipeUnlocks: - WeaponAdvancedLaser + +- type: technology + id: ExperimentalBatteryAmmo + name: research-technology-experimental-battery-ammo + icon: + sprite: Objects/Weapons/Guns/Battery/svalinn.rsi + state: icon + discipline: Arsenal + tier: 3 + cost: 15000 + recipeUnlocks: + - WeaponLaserSvalinn diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml index a65ea0d5fa..69400c986f 100644 --- a/Resources/Prototypes/tags.yml +++ b/Resources/Prototypes/tags.yml @@ -878,6 +878,9 @@ - type: Tag id: PotatoBattery +- type: Tag + id: PowerCell + - type: Tag id: PowerCellSmall diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/base.png new file mode 100644 index 0000000000..b5a65edff4 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/base.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/icon.png new file mode 100644 index 0000000000..a85afab712 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/inhand-left-0.png b/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/inhand-left-0.png new file mode 100644 index 0000000000..f4e9e49a5a Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/inhand-left-0.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/inhand-left-1.png b/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/inhand-left-1.png new file mode 100644 index 0000000000..9d2a4d004e Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/inhand-left-1.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/inhand-left-2.png b/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/inhand-left-2.png new file mode 100644 index 0000000000..88bab46c51 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/inhand-left-2.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/inhand-left-3.png b/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/inhand-left-3.png new file mode 100644 index 0000000000..57142eecd9 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/inhand-left-3.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/inhand-left.png new file mode 100644 index 0000000000..a2ed57443d Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/inhand-right-0.png b/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/inhand-right-0.png new file mode 100644 index 0000000000..5b51ce4741 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/inhand-right-0.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/inhand-right-1.png b/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/inhand-right-1.png new file mode 100644 index 0000000000..2e3c8ec1d9 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/inhand-right-1.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/inhand-right-2.png b/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/inhand-right-2.png new file mode 100644 index 0000000000..ea72601137 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/inhand-right-2.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/inhand-right-3.png b/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/inhand-right-3.png new file mode 100644 index 0000000000..3a9db1d3e3 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/inhand-right-3.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/inhand-right.png new file mode 100644 index 0000000000..b23c4f39e3 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/mag-unshaded-0.png b/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/mag-unshaded-0.png new file mode 100644 index 0000000000..2f4c8db73b Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/mag-unshaded-0.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/mag-unshaded-1.png b/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/mag-unshaded-1.png new file mode 100644 index 0000000000..a90970412c Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/mag-unshaded-1.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/mag-unshaded-2.png b/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/mag-unshaded-2.png new file mode 100644 index 0000000000..5b62a04dfa Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/mag-unshaded-2.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/mag-unshaded-3.png b/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/mag-unshaded-3.png new file mode 100644 index 0000000000..f34af9bae0 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/mag-unshaded-3.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/mag-unshaded-4.png b/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/mag-unshaded-4.png new file mode 100644 index 0000000000..046c1328b3 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/mag-unshaded-4.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/meta.json new file mode 100644 index 0000000000..8e2e71fb88 --- /dev/null +++ b/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/meta.json @@ -0,0 +1,72 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from CEV Eris at commit https://github.com/discordia-space/CEV-Eris/commit/d75bd7c51620423bacf0b8accc8d29ffbfc387d8, edited by Emisse for SS14", + "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-0", + "directions": 4 + }, + { + "name": "inhand-right-0", + "directions": 4 + }, + { + "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 + } + ] +}