diff --git a/Resources/Locale/en-US/_DV/store/uplink/weaponry.ftl b/Resources/Locale/en-US/_DV/store/uplink/weaponry.ftl index a374059555c..b9412062426 100644 --- a/Resources/Locale/en-US/_DV/store/uplink/weaponry.ftl +++ b/Resources/Locale/en-US/_DV/store/uplink/weaponry.ftl @@ -5,3 +5,6 @@ uplink-home-run-bat-desc = Rigged bat pre-coated in blood for Syndicate tee-ball uplink-foam-sabre-name = Sharp Foam Sabre uplink-foam-sabre-desc = A blade disguised as a toy foam sabre. Perfect for assassins that pretend playing around. + +uplink-rigged-laser-tag-gun-name = Rigged Laser Tag Gun +uplink-rigged-laser-tag-gun-desc = This laser tag gun has been tampered with to fire a much more harmful laser and can switch modes to be more covert and look like a regular laser tag gun. diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml index 76f3fc1beb2..83f040b5103 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml @@ -173,6 +173,7 @@ - id: ClothingUniformJumpsuitFamilyGuy - id: WristwatchGold - id: ClothingBeltFoamSheathFilled # DeltaV - Add small chance of it spawning in maints locker. + - id: WeaponLaserTagGun # DeltaV - Add small chance of it spawning in maints locker. #- id: RubberStampGreytide # Delta-V: prevent greytide stamp from spawning - type: entity diff --git a/Resources/Prototypes/_DV/Catalog/Cargo/cargo_fun.yml b/Resources/Prototypes/_DV/Catalog/Cargo/cargo_fun.yml index ddf3ebdb9e1..a0bd0430c92 100644 --- a/Resources/Prototypes/_DV/Catalog/Cargo/cargo_fun.yml +++ b/Resources/Prototypes/_DV/Catalog/Cargo/cargo_fun.yml @@ -17,3 +17,13 @@ cost: 1000 category: Fun group: market + +- type: cargoProduct + id: LaserTagSet + icon: + sprite: _DV/Objects/Weapons/Guns/Battery/laser_tag_gun.rsi + state: icon + product: CrateLaserTagSet + cost: 750 + category: Fun + group: market diff --git a/Resources/Prototypes/_DV/Catalog/Fills/Crates/fun.yml b/Resources/Prototypes/_DV/Catalog/Fills/Crates/fun.yml index 186abe04b0a..e3135a71f01 100644 --- a/Resources/Prototypes/_DV/Catalog/Fills/Crates/fun.yml +++ b/Resources/Prototypes/_DV/Catalog/Fills/Crates/fun.yml @@ -21,3 +21,18 @@ amount: 2 - id: BoxCartridgeCap amount: 2 + +- type: entity + parent: CratePlastic + id: CrateLaserTagSet + name: laser tag set + description: A crate filled with a full set of laser tag guns, harmless fun for 6 people. + components: + - type: StorageFill + contents: + - id: WeaponLaserTagGun + amount: 6 + - id: ClothingNeckScarfStripedRed + amount: 3 + - id: ClothingNeckScarfStripedBlue + amount: 3 diff --git a/Resources/Prototypes/_DV/Catalog/Uplink/weaponry.yml b/Resources/Prototypes/_DV/Catalog/Uplink/weaponry.yml index 58b80606976..2b377d8c236 100644 --- a/Resources/Prototypes/_DV/Catalog/Uplink/weaponry.yml +++ b/Resources/Prototypes/_DV/Catalog/Uplink/weaponry.yml @@ -27,3 +27,18 @@ Telecrystal: 6 categories: - UplinkWeaponry + +- type: listing + id: WeaponRiggedLaserTagGun + name: uplink-rigged-laser-tag-gun-name + description: uplink-rigged-laser-tag-gun-desc + productEntity: WeaponRiggedLaserTagGun + icon: + entity: WeaponRiggedLaserTagGun + discountCategory: usualDiscounts + discountDownTo: + Telecrystal: 5 + cost: + Telecrystal: 10 + categories: + - UplinkWeaponry 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 8f29e93713e..0cc45a22206 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 @@ -544,3 +544,78 @@ - type: BatterySelfRecharger autoRecharge: true autoRechargeRate: 25 + +- type: entity + parent: BaseWeaponBatterySmall + id: WeaponLaserTagGun + name: laser tag gun + description: A somewhat bulky toy laser gun used in laser tag that shoots a mostly harmless laser. + components: + - type: Sprite + sprite: _DV/Objects/Weapons/Guns/Battery/laser_tag_gun.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-unshaded-4 + map: ["enum.GunVisualLayers.MagUnshaded"] + shader: unshaded + - state: mode-disabler + shader: unshaded + - type: Clothing + sprite: _DV/Objects/Weapons/Guns/Battery/laser_tag_gun.rsi + slots: + - Belt + - type: Appearance + - type: MagazineVisuals + magState: mag + steps: 5 + zeroVisible: true + - type: Gun + fireRate: 2 + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/taser2.ogg + soundEmpty: + path: /Audio/_DV/Weapons/Guns/Empty/dry_fire.ogg + - type: ProjectileBatteryAmmoProvider + proto: BulletDisablerPractice + fireCost: 50 + - type: Tag + tags: + - Taser + - Sidearm + - type: PacifismAllowedGun + - type: StaticPrice + price: 50 + +- type: entity + parent: WeaponLaserTagGun + id: WeaponRiggedLaserTagGun + suffix: Rigged + components: + - type: Sprite + sprite: _DV/Objects/Weapons/Guns/Battery/laser_tag_gun.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mode-disabler + map: [ "Firemode" ] + shader: unshaded + - state: mag-unshaded-4 + map: [ "enum.GunVisualLayers.MagUnshaded" ] + shader: unshaded + - type: EnergyGun + fireModes: + - proto: BulletDisablerPractice + fireCost: 50 + name: disable + state: disabler + - proto: BulletEnergyGunLaser + fireCost: 150 + name: lethal + state: lethal + - type: GenericVisualizer + visuals: + enum.EnergyGunFireModeVisuals.State: + Firemode: + Disabler: { state: mode-disabler } + Lethal: { state: mode-lethal } diff --git a/Resources/Textures/_DV/Objects/Weapons/Guns/Battery/laser_tag_gun.rsi/base.png b/Resources/Textures/_DV/Objects/Weapons/Guns/Battery/laser_tag_gun.rsi/base.png new file mode 100644 index 00000000000..8e840f687b6 Binary files /dev/null and b/Resources/Textures/_DV/Objects/Weapons/Guns/Battery/laser_tag_gun.rsi/base.png differ diff --git a/Resources/Textures/_DV/Objects/Weapons/Guns/Battery/laser_tag_gun.rsi/disabler-inhand-left.png b/Resources/Textures/_DV/Objects/Weapons/Guns/Battery/laser_tag_gun.rsi/disabler-inhand-left.png new file mode 100644 index 00000000000..7dd85b744b7 Binary files /dev/null and b/Resources/Textures/_DV/Objects/Weapons/Guns/Battery/laser_tag_gun.rsi/disabler-inhand-left.png differ diff --git a/Resources/Textures/_DV/Objects/Weapons/Guns/Battery/laser_tag_gun.rsi/disabler-inhand-right.png b/Resources/Textures/_DV/Objects/Weapons/Guns/Battery/laser_tag_gun.rsi/disabler-inhand-right.png new file mode 100644 index 00000000000..aa03f0f539e Binary files /dev/null and b/Resources/Textures/_DV/Objects/Weapons/Guns/Battery/laser_tag_gun.rsi/disabler-inhand-right.png differ diff --git a/Resources/Textures/_DV/Objects/Weapons/Guns/Battery/laser_tag_gun.rsi/equipped-BELT.png b/Resources/Textures/_DV/Objects/Weapons/Guns/Battery/laser_tag_gun.rsi/equipped-BELT.png new file mode 100644 index 00000000000..626bf1ebca9 Binary files /dev/null and b/Resources/Textures/_DV/Objects/Weapons/Guns/Battery/laser_tag_gun.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/_DV/Objects/Weapons/Guns/Battery/laser_tag_gun.rsi/icon.png b/Resources/Textures/_DV/Objects/Weapons/Guns/Battery/laser_tag_gun.rsi/icon.png new file mode 100644 index 00000000000..d52c0ce2844 Binary files /dev/null and b/Resources/Textures/_DV/Objects/Weapons/Guns/Battery/laser_tag_gun.rsi/icon.png differ diff --git a/Resources/Textures/_DV/Objects/Weapons/Guns/Battery/laser_tag_gun.rsi/inhand-left.png b/Resources/Textures/_DV/Objects/Weapons/Guns/Battery/laser_tag_gun.rsi/inhand-left.png new file mode 100644 index 00000000000..7dd85b744b7 Binary files /dev/null and b/Resources/Textures/_DV/Objects/Weapons/Guns/Battery/laser_tag_gun.rsi/inhand-left.png differ diff --git a/Resources/Textures/_DV/Objects/Weapons/Guns/Battery/laser_tag_gun.rsi/inhand-right.png b/Resources/Textures/_DV/Objects/Weapons/Guns/Battery/laser_tag_gun.rsi/inhand-right.png new file mode 100644 index 00000000000..aa03f0f539e Binary files /dev/null and b/Resources/Textures/_DV/Objects/Weapons/Guns/Battery/laser_tag_gun.rsi/inhand-right.png differ diff --git a/Resources/Textures/_DV/Objects/Weapons/Guns/Battery/laser_tag_gun.rsi/lethal-inhand-left.png b/Resources/Textures/_DV/Objects/Weapons/Guns/Battery/laser_tag_gun.rsi/lethal-inhand-left.png new file mode 100644 index 00000000000..480cf1b3876 Binary files /dev/null and b/Resources/Textures/_DV/Objects/Weapons/Guns/Battery/laser_tag_gun.rsi/lethal-inhand-left.png differ diff --git a/Resources/Textures/_DV/Objects/Weapons/Guns/Battery/laser_tag_gun.rsi/lethal-inhand-right.png b/Resources/Textures/_DV/Objects/Weapons/Guns/Battery/laser_tag_gun.rsi/lethal-inhand-right.png new file mode 100644 index 00000000000..24916d3622f Binary files /dev/null and b/Resources/Textures/_DV/Objects/Weapons/Guns/Battery/laser_tag_gun.rsi/lethal-inhand-right.png differ diff --git a/Resources/Textures/_DV/Objects/Weapons/Guns/Battery/laser_tag_gun.rsi/mag-unshaded-0.png b/Resources/Textures/_DV/Objects/Weapons/Guns/Battery/laser_tag_gun.rsi/mag-unshaded-0.png new file mode 100644 index 00000000000..6696c39033e Binary files /dev/null and b/Resources/Textures/_DV/Objects/Weapons/Guns/Battery/laser_tag_gun.rsi/mag-unshaded-0.png differ diff --git a/Resources/Textures/_DV/Objects/Weapons/Guns/Battery/laser_tag_gun.rsi/mag-unshaded-1.png b/Resources/Textures/_DV/Objects/Weapons/Guns/Battery/laser_tag_gun.rsi/mag-unshaded-1.png new file mode 100644 index 00000000000..48b18a3b7bd Binary files /dev/null and b/Resources/Textures/_DV/Objects/Weapons/Guns/Battery/laser_tag_gun.rsi/mag-unshaded-1.png differ diff --git a/Resources/Textures/_DV/Objects/Weapons/Guns/Battery/laser_tag_gun.rsi/mag-unshaded-2.png b/Resources/Textures/_DV/Objects/Weapons/Guns/Battery/laser_tag_gun.rsi/mag-unshaded-2.png new file mode 100644 index 00000000000..60b26807bde Binary files /dev/null and b/Resources/Textures/_DV/Objects/Weapons/Guns/Battery/laser_tag_gun.rsi/mag-unshaded-2.png differ diff --git a/Resources/Textures/_DV/Objects/Weapons/Guns/Battery/laser_tag_gun.rsi/mag-unshaded-3.png b/Resources/Textures/_DV/Objects/Weapons/Guns/Battery/laser_tag_gun.rsi/mag-unshaded-3.png new file mode 100644 index 00000000000..e7cdcaa6d24 Binary files /dev/null and b/Resources/Textures/_DV/Objects/Weapons/Guns/Battery/laser_tag_gun.rsi/mag-unshaded-3.png differ diff --git a/Resources/Textures/_DV/Objects/Weapons/Guns/Battery/laser_tag_gun.rsi/mag-unshaded-4.png b/Resources/Textures/_DV/Objects/Weapons/Guns/Battery/laser_tag_gun.rsi/mag-unshaded-4.png new file mode 100644 index 00000000000..b4002f1c452 Binary files /dev/null and b/Resources/Textures/_DV/Objects/Weapons/Guns/Battery/laser_tag_gun.rsi/mag-unshaded-4.png differ diff --git a/Resources/Textures/_DV/Objects/Weapons/Guns/Battery/laser_tag_gun.rsi/meta.json b/Resources/Textures/_DV/Objects/Weapons/Guns/Battery/laser_tag_gun.rsi/meta.json new file mode 100644 index 00000000000..85fd580c658 --- /dev/null +++ b/Resources/Textures/_DV/Objects/Weapons/Guns/Battery/laser_tag_gun.rsi/meta.json @@ -0,0 +1,72 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by https://github.com/SubspaceEmber for DeltaV.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "mode-disabler" + }, + { + "name": "mode-lethal" + }, + { + "name": "mag-unshaded-0", + "delays": [ + [ + 0.3, + 0.3 + ] + ] + }, + { + "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": "disabler-inhand-left", + "directions": 4 + }, + { + "name": "disabler-inhand-right", + "directions": 4 + }, + { + "name": "lethal-inhand-left", + "directions": 4 + }, + { + "name": "lethal-inhand-right", + "directions": 4 + }, + { + "name": "equipped-BELT", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_DV/Objects/Weapons/Guns/Battery/laser_tag_gun.rsi/mode-disabler.png b/Resources/Textures/_DV/Objects/Weapons/Guns/Battery/laser_tag_gun.rsi/mode-disabler.png new file mode 100644 index 00000000000..ce912e31d07 Binary files /dev/null and b/Resources/Textures/_DV/Objects/Weapons/Guns/Battery/laser_tag_gun.rsi/mode-disabler.png differ diff --git a/Resources/Textures/_DV/Objects/Weapons/Guns/Battery/laser_tag_gun.rsi/mode-lethal.png b/Resources/Textures/_DV/Objects/Weapons/Guns/Battery/laser_tag_gun.rsi/mode-lethal.png new file mode 100644 index 00000000000..9e85e479e97 Binary files /dev/null and b/Resources/Textures/_DV/Objects/Weapons/Guns/Battery/laser_tag_gun.rsi/mode-lethal.png differ