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.

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

Bonespear resprite #620

Merged
merged 9 commits into from
May 20, 2024
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
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
11 changes: 9 additions & 2 deletions Resources/Changelog/ChangelogADT.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1681,11 +1681,18 @@ Entries:
changes:
- { message: "Инженеры NanoTrasen совместно с DSW не прекращают работу, на сей раз они полностью переработали дизайн и характеристики Вархаммера.", type: Tweak}
- { message: "Инженеры Nanotrasen слегка модифицировали конструкцию глефы-крашера, увеличив её длину и слегка снизив её массу, делая её более лёгкой в использовании.", type: Tweak}
id: 55732 #костыль отображения в Обновлениях
id: 55733 #костыль отображения в Обновлениях
time: '2024-04-15T02:17:00.0000000+00:00'

- author: Username228
changes:
- { message: "Изменен спрайт Костяного копья, теперь оно выглядит круче", type: Tweak}/
id: 55734 #костыль отображения в Обновлениях
time: '2024-04-16T01:40:00.0000000+00:00'

- author: Шрёдингер
changes:
- {message: "Возращаем старый хот бар, быстрых действий слева.", type: Tweak}
id: 55733 #костыль отображения в Обновлениях
id: 55735 #костыль отображения в Обновлениях
time: '2024-04-16T08:20:00.0000000+00:00'

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
71 changes: 34 additions & 37 deletions Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -1,37 +1,34 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "spear"
},
{
"name": "spear1"
},
{
"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
}
]
}
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "https://github.com/ss220-space/Paradise/blob/master220/icons/obj/items.dmi",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "spear"
},
{
"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 modified Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/spear.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 not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading