Skip to content

Commit

Permalink
Merge pull request #620 from Us3rn4me228/bonespear-resprite
Browse files Browse the repository at this point in the history
Bonespear resprite
  • Loading branch information
modern-nm committed May 20, 2024
2 parents d398b17 + 22e9011 commit f61e759
Show file tree
Hide file tree
Showing 9 changed files with 52 additions and 45 deletions.
23 changes: 15 additions & 8 deletions Resources/Changelog/ChangelogADT.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1681,14 +1681,8 @@ Entries:
changes:
- { message: "Инженеры NanoTrasen совместно с DSW не прекращают работу, на сей раз они полностью переработали дизайн и характеристики Вархаммера.", type: Tweak}
- { message: "Инженеры Nanotrasen слегка модифицировали конструкцию глефы-крашера, увеличив её длину и слегка снизив её массу, делая её более лёгкой в использовании.", type: Tweak}
id: 55732 #костыль отображения в Обновлениях
time: '2024-04-15T02:17:00.0000000+00:00'

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

- author: Шрёдингер
changes:
Expand All @@ -1697,10 +1691,16 @@ Entries:
id: 55734
time: '2024-04-22T08:20:00.0000000+00:00'

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

- author: 1Stepka1
changes:
- {message: "Плазма в живых организмах непредвидено изменила свои свойства, вследствии чего живым существам состоящим из плазмы больше не нужно пить и частичные функции потребления жидкостей переключились на пищеварительную систему", type: Tweak}
id: 55735
id: 55736
time: '2024-04-24T16:30:00.0000000+00:00'

- author: Ratyyy
Expand Down Expand Up @@ -1785,3 +1785,10 @@ Entries:
- {message: "Частично пофикшена видимость невидимок визорами.", type: Fix}
id: 55750 #костыль отображения в Обновлениях
time: '2024-05-13T08:20:00.0000000+00:00'

- author: Username228
changes:
- { message: "Изменен спрайт Костяного копья, теперь оно выглядит круче", type: Tweak}
id: 55750 #костыль отображения в Обновлениях
time: '2024-04-16T01:40: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.
74 changes: 37 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,37 @@
{
"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": "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
}
]
}
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 modified Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/spear1.png
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.

0 comments on commit f61e759

Please sign in to comment.