diff --git a/Resources/Locale/en-US/deltav/store/uplink-catalog.ftl b/Resources/Locale/en-US/deltav/store/uplink-catalog.ftl index ca5d0f8e74a..d8296d268c6 100644 --- a/Resources/Locale/en-US/deltav/store/uplink-catalog.ftl +++ b/Resources/Locale/en-US/deltav/store/uplink-catalog.ftl @@ -1,6 +1,9 @@ # Utility uplink-reinforcement-radio-nukie-mouse-name = Mouse Operative Reinforcement Teleporter uplink-reinforcement-radio-nukie-mouse-desc = Calls in a specially trained mouse operative to assist you. +# Weapons +uplink-homerunbat-name = Home Run Bat +uplink-homerunbat-desc = Rigged bat pre-coated in blood for Syndicate tee-ball practice. Launch your foes! # Implants uplink-bionic-syrinx-implanter-name = Bionic Syrinx Implanter uplink-bionic-syrinx-implanter-desc = An implant that enhances a harpy's natural talent for mimicry to let you adjust your voice to whoever you can think of. diff --git a/Resources/Prototypes/DeltaV/Catalog/uplink_catalog.yml b/Resources/Prototypes/DeltaV/Catalog/uplink_catalog.yml index 9a7587a2157..987473a7e08 100644 --- a/Resources/Prototypes/DeltaV/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/DeltaV/Catalog/uplink_catalog.yml @@ -9,6 +9,37 @@ categories: - UplinkAllies +- type: listing + id: Home Run Bat + name: uplink-homerunbat-name + description: uplink-homerunbat-desc + productEntity: BaseBallBatHomerun + icon: { sprite: DeltaV/Objects/Weapons/Melee/home_run_bat.rsi, state: icon } + cost: + Telecrystal: 20 + categories: + - UplinkWeapons + +#- type: listing +# id: UplinkCyborgBeaconSyndicate +# name: uplink-borg-beacon-name +# description: uplink-borg-beacon-desc +# productEntity: CyborgBeaconSyndicate +# icon: { sprite: Objects/Devices/communication.rsi, state: old-radio } +# cost: +# Telecrystal: 65 +# categories: +# - UplinkUtility +# conditions: +# - !type:StoreWhitelistCondition +# whitelist: +# tags: +# - NukeOpsUplink +# - !type:BuyerWhitelistCondition +# blacklist: +# components: +# - SurplusBundle + - type: listing id: UplinkBionicSyrinxImplanter name: uplink-bionic-syrinx-implanter-name diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Melee/bat_home_run.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Melee/bat_home_run.yml new file mode 100644 index 00000000000..eb56cea5b20 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Melee/bat_home_run.yml @@ -0,0 +1,39 @@ +# DeltaV "Home Run Bat" + +- type: entity + name: home run bat + parent: BaseItem + id: BaseBallBatHomerun + description: Heavy metal bat with an extra kick. + components: + - type: Sprite + sprite: DeltaV/Objects/Weapons/Melee/home_run_bat.rsi + state: icon + - type: MeleeWeapon + wideAnimationRotation: -135 + damage: + types: + Blunt: 15 + Structural: 5 + soundHit: + collection: ExplosionSmall + - type: MeleeRequiresWield # You can't hit a home run with one hand, jimbo. + - type: Wieldable + - type: MeleeThrowOnHit + speed: 30 + lifetime: 5 + - type: Item + size: Large + - type: Tool + qualities: + - Rolling + speed: 0.50 # it's very heavy, it does it slower than a wooden bat + - type: Clothing + quickEquip: false + slots: + - back + - type: UseDelay + delay: 2 + - type: Tag + tags: + - BaseballBat diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Melee/home_run_bat.rsi/equipped-BACKPACK.png b/Resources/Textures/DeltaV/Objects/Weapons/Melee/home_run_bat.rsi/equipped-BACKPACK.png new file mode 100644 index 00000000000..0f42b7f1472 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Melee/home_run_bat.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Melee/home_run_bat.rsi/icon.png b/Resources/Textures/DeltaV/Objects/Weapons/Melee/home_run_bat.rsi/icon.png new file mode 100644 index 00000000000..33eec9258c6 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Melee/home_run_bat.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Melee/home_run_bat.rsi/inhand-left.png b/Resources/Textures/DeltaV/Objects/Weapons/Melee/home_run_bat.rsi/inhand-left.png new file mode 100644 index 00000000000..e5705afdbff Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Melee/home_run_bat.rsi/inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Melee/home_run_bat.rsi/inhand-right.png b/Resources/Textures/DeltaV/Objects/Weapons/Melee/home_run_bat.rsi/inhand-right.png new file mode 100644 index 00000000000..c846a248398 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Melee/home_run_bat.rsi/inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Melee/home_run_bat.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Weapons/Melee/home_run_bat.rsi/meta.json new file mode 100644 index 00000000000..5fe0f17f41b --- /dev/null +++ b/Resources/Textures/DeltaV/Objects/Weapons/Melee/home_run_bat.rsi/meta.json @@ -0,0 +1,34 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-3.0", + "copyright": "Homerun bat variant modified by Mike, Taken from goonstation and modified by Swept at commit https://github.com/goonstation/goonstation/pull/3555/commits/b24eb6260647c0fcfe858268a26b6160bc50017a, wielded version by Easypoll", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + } + ] + } diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Melee/home_run_bat.rsi/wielded-inhand-left.png b/Resources/Textures/DeltaV/Objects/Weapons/Melee/home_run_bat.rsi/wielded-inhand-left.png new file mode 100644 index 00000000000..2ca1fd0a79c Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Melee/home_run_bat.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Melee/home_run_bat.rsi/wielded-inhand-right.png b/Resources/Textures/DeltaV/Objects/Weapons/Melee/home_run_bat.rsi/wielded-inhand-right.png new file mode 100644 index 00000000000..9bc7096335c Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Melee/home_run_bat.rsi/wielded-inhand-right.png differ