Skip to content
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.

Sign up for GitHub

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

Kanabō Fix #658

Closed
wants to merge 14 commits into from
Closed

Kanabō Fix #658

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
eb66895
Bull + Shaved Oni Horns
ps3moira Dec 19, 2023
488308f
Merge remote-tracking branch 'upstream/master' into Oni-Update
ps3moira Dec 28, 2023
4191fbe
Fix Kanabo Damage and Tweaked Back Sprite
ps3moira Dec 28, 2023
5d2e289
Merge remote-tracking branch 'upstream/master' into Oni-Update
ps3moira Dec 28, 2023
0ba8536
Merge remote-tracking branch 'upstream/master' into Oni-Update
ps3moira Dec 29, 2023
60abe9a
Merge branch 'master' into Oni-Update
ps3moira Dec 31, 2023
036e603
Merge branch 'master' into Oni-Update
ps3moira Dec 31, 2023
3beb87b
Merge branch 'master' into Oni-Update
ps3moira Jan 2, 2024
ab791cc
Merge branch 'master' into Oni-Update
ps3moira Jan 3, 2024
5bdc366
Merge remote-tracking branch 'upstream/master' into Oni-Update
ps3moira Jan 9, 2024
8dbc2cc
Update Oni.ftl
ps3moira Jan 9, 2024
f522cf8
Update Oni_horns.yml
ps3moira Jan 9, 2024
ce6165c
Remove Seperate PR's sprites
ps3moira Jan 9, 2024
a9149c1
Update blunt.yml
ps3moira Jan 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Resources/Locale/en-US/nyanotrasen/markings/Oni.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ marking-OniHornSingleRightCurved = Single Right Curved
marking-OniHornDoubleCurvedOutwards = Double Curved Outwards
marking-OniHornDoubleCurved = Double Curved
marking-OniHornDoubleLeftBrokeCurved = Double Left Broke Curved
marking-OniHornDoubleRightBrokeCurved = Double Right Broke Curved
marking-OniHornDoubleRightBrokeCurved = Double Right Broke Curved
2 changes: 1 addition & 1 deletion Resources/Prototypes/Nyanotrasen/Entities/Mobs/Customization/Markings/Oni_horns.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,4 +66,4 @@
speciesRestriction: [Oni]
sprites:
- sprite: Nyanotrasen/Mobs/Customization/oni_horns.rsi
state: double_right_broke_curved
state: double_right_broke_curved
3 changes: 3 additions & 0 deletions Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Melee/blunt.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
damage:
types:
Blunt: 16
Structural: 10 # Delta-V
soundHit:
path: /Audio/Nyanotrasen/Weapons/club.ogg
bluntStaminaDamageFactor: 1.60 # 25.6 stamina damage
Expand All @@ -26,6 +27,8 @@
damage:
types:
Blunt: 14
Structural: 8 # Delta-V
bluntStaminaDamageFactor: 2.60 # 25.6 stamina damage
- type: Clothing
sprite: Nyanotrasen/Objects/Weapons/Melee/kanabou.rsi
quickEquip: false
Expand Down
Binary file modified ...es/Textures/Nyanotrasen/Objects/Weapons/Melee/kanabou.rsi/equipped-BACKPACK.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions Resources/Textures/Nyanotrasen/Objects/Weapons/Melee/kanabou.rsi/meta.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"version": 2,
"license": "CC-BY-SA-3.0",
"copyright": "Made by Findorsal",
"copyright": "Made by Findorsal. Back-sprite tweaked by ps3moira.",
"size": {
"x": 32,
"y": 32
Expand Down
Loading