diff --git a/Resources/Locale/en-US/deltav/store/uplink-catalog.ftl b/Resources/Locale/en-US/deltav/store/uplink-catalog.ftl index aed51cb9e69..204ab670aab 100644 --- a/Resources/Locale/en-US/deltav/store/uplink-catalog.ftl +++ b/Resources/Locale/en-US/deltav/store/uplink-catalog.ftl @@ -16,3 +16,6 @@ uplink-generic-radio-implanter-desc = A cranial implant with a bluespace compart uplink-doorjack-name = Airlock Access Override uplink-doorjack-desc = A specialized cryptographic sequencer, designed solely to doorjack NanoTrasen's updated airlocks. Does not tamper with anything else. + +uplink-home-run-bat-name = Home Run Bat +uplink-home-run-bat-desc = Rigged bat pre-coated in blood for Syndicate tee-ball practice. Launch your foes! diff --git a/Resources/Prototypes/DeltaV/Catalog/uplink_catalog.yml b/Resources/Prototypes/DeltaV/Catalog/uplink_catalog.yml index 1f8970bfc0f..1b387bd9dbd 100644 --- a/Resources/Prototypes/DeltaV/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/DeltaV/Catalog/uplink_catalog.yml @@ -81,3 +81,15 @@ Telecrystal: 6 categories: - UplinkDisruption + +- type: listing + id: BaseBallBatHomeRun + name: uplink-home-run-bat-name + description: uplink-home-run-bat-desc + productEntity: BaseBallBatHomeRun + icon: + entity: BaseBallBatHomeRun + cost: + Telecrystal: 16 + categories: + - UplinkWeaponry diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Melee/home_run_bat.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Melee/home_run_bat.yml new file mode 100644 index 00000000000..ce90e8638b2 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Melee/home_run_bat.yml @@ -0,0 +1,28 @@ +- type: entity + parent: BaseBallBat + id: BaseBallBatHomeRun + name: home run bat + description: Heavy metal bat with an extra kick. + components: + - type: Sprite + sprite: DeltaV/Objects/Weapons/Melee/home_run_bat.rsi + state: icon + - type: MeleeWeapon + damage: + types: + Blunt: 15 + soundHit: + collection: ExplosionSmall + - type: MeleeRequiresWield # You can't hit a home run with one hand, jimbo. + - type: MeleeThrowOnHit + speed: 30 + lifetime: 5 + - type: Item + size: Large + - type: Tool + speedModifier: 0.5 # it's very heavy, it rolls slower than a wooden bat + - type: UseDelay + delay: 2 + - type: PhysicalComposition + materialComposition: + Steel: 350 # it's not made of wood 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..9fc426bdc68 --- /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