diff --git a/Resources/Changelog/ChangelogADT.yml b/Resources/Changelog/ChangelogADT.yml index 424898b8d47..3fc997ed4c9 100644 --- a/Resources/Changelog/ChangelogADT.yml +++ b/Resources/Changelog/ChangelogADT.yml @@ -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: @@ -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 @@ -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' + diff --git a/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/equipped-BACKPACK.png index 585f2279403..95266b75c83 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/equipped-BACKPACK.png and b/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/inhand-left.png index 48b74e934a5..7990958a5b8 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/inhand-left.png and b/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/inhand-right.png index b739e105cfa..9130e0e65d0 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/inhand-right.png and b/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/meta.json index 49209bf2dcd..5adaa998bbe 100644 --- a/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/meta.json @@ -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 + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/spear.png b/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/spear.png index e46cb9bea85..cb037cf61f4 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/spear.png and b/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/spear.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/spear1.png b/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/spear1.png index ed04f597774..e897e73e9b1 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/spear1.png and b/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/spear1.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/wielded-inhand-left.png index 5f2a9d893b3..a87f69dfd5f 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/wielded-inhand-left.png and b/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/wielded-inhand-right.png index a10d676762a..89c84fa8798 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/wielded-inhand-right.png and b/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/wielded-inhand-right.png differ