-
Notifications
You must be signed in to change notification settings - Fork 340
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Home run bat #823
Closed
Closed
Home run bat #823
Changes from all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
32de6f8
syndicate home run bat
musicmanvr 497f67f
working
musicmanvr e55e392
locale doofus
musicmanvr c66918b
dumb comment
musicmanvr 1d214c0
update to avoid deceptive damage values
musicmanvr ce3a27a
Merge branch 'master' into Home-Run-Bat
musicmanvr dfd9e7d
errors
musicmanvr 9c254b9
Merge branch 'master' into Home-Run-Bat
VMSolidus 6ed75bb
Update bat_home_run.yml
musicmanvr 1df36be
Merge remote-tracking branch 'upstream/master' into Home-Run-Bat
musicmanvr File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
39 changes: 39 additions & 0 deletions
39
Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Melee/bat_home_run.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,39 @@ | ||
# DeltaV "Home Run Bat" | ||
|
||
- type: entity | ||
name: home run bat | ||
parent: BaseItem | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. why cant this parent bat and remove like 75% of components |
||
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 |
Binary file added
BIN
+6.42 KB
...es/Textures/DeltaV/Objects/Weapons/Melee/home_run_bat.rsi/equipped-BACKPACK.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+832 Bytes
Resources/Textures/DeltaV/Objects/Weapons/Melee/home_run_bat.rsi/icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+5.88 KB
Resources/Textures/DeltaV/Objects/Weapons/Melee/home_run_bat.rsi/inhand-left.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+5.88 KB
Resources/Textures/DeltaV/Objects/Weapons/Melee/home_run_bat.rsi/inhand-right.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
34 changes: 34 additions & 0 deletions
34
Resources/Textures/DeltaV/Objects/Weapons/Melee/home_run_bat.rsi/meta.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 | ||
} | ||
] | ||
} |
Binary file added
BIN
+5.97 KB
.../Textures/DeltaV/Objects/Weapons/Melee/home_run_bat.rsi/wielded-inhand-left.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+5.92 KB
...Textures/DeltaV/Objects/Weapons/Melee/home_run_bat.rsi/wielded-inhand-right.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
sus