Vox Update v1 #1925

EstKemran · 2024-09-23T21:22:42Z

Описание PR

PR на добавление часто и не очень встречающихся спрайтов для воксов, на которых не правильно работает / нет карты наложение.

todo:

OuterClothing

Armor

Bio

Coats

Hardsuits

Misc

Suits

Vest

WinterCoats

Head
Cloak / Neck
Boots
Медиа

Проверки

PR полностью завершён и мне не нужна помощь чтобы его закончить.
Я ознакомился с наставлениями по работе с репозиторием и следовал им при создании PR'а.
Я внимательно просмотрел все свои изменения и багов в них не нашёл.
Я запускал локальный сервер со своими изменениями и всё протестировал.
Я добавил скриншот/видео демонстрации PR в игре, или этот PR этого не требует.

Изменения
🆑 Kemran, Dinazewwr, DaGo

add: Добавлены воксы
add: Добавлено более 100 спрайтов под воксов
remove: Отключена возможность выбора фелинидов в лобби игры до пересмотра их концепта

github-actions · 2024-09-23T21:23:21Z

RSI Diff Bot; head commit ccfdec8 merging into d169d16
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Clothing/Head/Helmets/security.rsi

State	Old	New	Status
equipped-HELMET-vox			Modified

Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-vox			Modified

Resources/Textures/Clothing/OuterClothing/Armor/security.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-vox			Modified

Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-vox			Modified
open-equipped-OUTERCLOTHING-vox			Modified

Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-vox			Modified
open-equipped-OUTERCLOTHING-vox			Modified

Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-vox			Modified
open-equipped-OUTERCLOTHING-vox			Modified

Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-vox			Modified
open-equipped-OUTERCLOTHING-vox			Modified

Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-vox			Modified
open-equipped-OUTERCLOTHING-vox			Modified

Resources/Textures/Clothing/OuterClothing/Misc/apronbotanist.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-vox			Modified

Resources/Textures/Clothing/OuterClothing/Suits/fire.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-vox			Modified

Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-vox			Modified

Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-vox			Modified

Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-vox			Modified

Resources/Textures/Clothing/OuterClothing/Vests/mercwebvest.rsi

State	Old	New	Status
equipped-OUTERCLOTHING			Modified
icon			Modified
inhand-left			Modified
inhand-right			Modified
equipped-OUTERCLOTHING-vox			Added

Resources/Textures/Clothing/OuterClothing/Vests/vest.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-vox			Modified

Resources/Textures/Clothing/Shoes/Boots/magboots-advanced.rsi

State	Old	New	Status
equipped-FEET-vox			Modified
on-equipped-FEET-vox			Modified

Resources/Textures/Clothing/Shoes/Boots/magboots-syndicate.rsi

State	Old	New	Status
equipped-FEET-vox			Modified
on-equipped-FEET-vox			Modified

Resources/Textures/Clothing/Shoes/Boots/magboots.rsi

State	Old	New	Status
equipped-FEET-vox			Modified
on-equipped-FEET-vox			Modified

Resources/Textures/SS220/Clothing/OuterClothing/Coats/centcom_field_officer_coat.rsi

State	Old	New	Status
equipped-OUTERCLOTHING			Modified
equipped-OUTERCLOTHING-vox			Added

Resources/Textures/Clothing/Head/Hardsuits/brigmedic.rsi

State	Old	New	Status
off-equipped-HELMET-vox			Added
on-equipped-HELMET-vox			Added

Resources/Textures/Clothing/Head/Hats/plaguedoctor.rsi

State	Old	New	Status
equipped-HELMET-vox			Added

Resources/Textures/Clothing/Head/Hats/syndiecap_maa.rsi

State	Old	New	Status
equipped-HELMET-vox			Added

Resources/Textures/Clothing/Head/Hats/tacticalmaidheadband.rsi

State	Old	New	Status
equipped-HELMET-vox			Added

Resources/Textures/Clothing/Head/Hats/warden.rsi

State	Old	New	Status
equipped-HELMET-vox			Added

Resources/Textures/Clothing/Head/Helmets/cosmonaut.rsi

State	Old	New	Status
equipped-HELMET-vox			Added

Resources/Textures/Clothing/Head/Helmets/ert_security.rsi

State	Old	New	Status
equipped-HELMET-vox			Added

Resources/Textures/Clothing/Head/Helmets/janitor_bombsuit.rsi

State	Old	New	Status
equipped-HELMET-vox			Added

Resources/Textures/Clothing/Head/Helmets/merc_helmet.rsi

State	Old	New	Status
equipped-HELMET-vox			Added

Resources/Textures/Clothing/Neck/Cloaks/moth.rsi

State	Old	New	Status
equipped-NECK-vox			Added

Resources/Textures/Clothing/OuterClothing/Armor/mpolice_armor.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-vox			Added

Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-vox			Added

Resources/Textures/Clothing/OuterClothing/Coats/hos_greatcoat.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-vox			Added

Resources/Textures/Clothing/OuterClothing/Coats/labcoat_rd.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-vox			Added
open-equipped-OUTERCLOTHING-vox			Added

Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_physician.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-vox			Added
open-equipped-OUTERCLOTHING-vox			Added

Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_researcher.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-vox			Added
open-equipped-OUTERCLOTHING-vox			Added

Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmedic.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-vox			Added

Resources/Textures/Clothing/OuterClothing/Misc/apron.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-vox			Added

Resources/Textures/Clothing/OuterClothing/Misc/apronbar.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-vox			Added

Resources/Textures/Clothing/OuterClothing/Misc/black_hoodie.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-vox			Added
open-equipped-OUTERCLOTHING-vox			Added

Resources/Textures/Clothing/OuterClothing/Misc/chaplain_hoodie.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-vox			Added

Resources/Textures/Clothing/OuterClothing/Misc/cultrobes.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-vox			Added

Resources/Textures/Clothing/OuterClothing/Misc/flannel_jacket.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-lines-vox			Added
equipped-OUTERCLOTHING-vox			Added

Resources/Textures/Clothing/OuterClothing/Misc/hospitalgown.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-vox			Added

Resources/Textures/Clothing/OuterClothing/Misc/judge.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-vox			Added

Resources/Textures/Clothing/OuterClothing/Misc/plaguedoctorsuit.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-vox			Added

Resources/Textures/Clothing/OuterClothing/Misc/poncho.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-vox			Added

Resources/Textures/Clothing/OuterClothing/Misc/santa.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-vox			Added

Resources/Textures/Clothing/OuterClothing/Suits/atmos_firesuit.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-vox			Added

Resources/Textures/Clothing/OuterClothing/Suits/spaceninja.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-vox			Added

Resources/Textures/Corvax/Clothing/OuterClothing/Coats/captain.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-vox			Added

Resources/Textures/Corvax/Clothing/OuterClothing/Coats/hop.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-vox			Added

Resources/Textures/Corvax/Clothing/OuterClothing/Coats/labcoat_security_medic.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-vox			Added

Resources/Textures/Corvax/Clothing/OuterClothing/Coats/noirdet.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-vox			Added

Resources/Textures/Corvax/Clothing/OuterClothing/Coats/sec_leather.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-vox			Added

Resources/Textures/Corvax/Clothing/OuterClothing/Coats/warden_alt.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-vox			Added

Resources/Textures/Corvax/Clothing/OuterClothing/Vests/armor_sec.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-vox			Added

Resources/Textures/Corvax/Clothing/OuterClothing/Vests/armor_sec_med.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-vox			Added

Resources/Textures/Corvax/Clothing/OuterClothing/Vests/vest_security_medic.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-vox			Added

Resources/Textures/SS220/Clothing/Head/Hardsuits/blueshield.rsi

State	Old	New	Status
off-equipped-HELMET-vox			Added
on-equipped-HELMET-vox			Added

Resources/Textures/SS220/Clothing/Head/Helmets/opscore.rsi

State	Old	New	Status
equipped-HELMET-vox			Added

Resources/Textures/SS220/Clothing/Neck/Cloaks/nanotrasen_admiral.rsi

State	Old	New	Status
equipped-NECK-vox			Added

Resources/Textures/SS220/Clothing/OuterClothing/Armor/centcom_naval_carapace.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-vox			Added

Resources/Textures/SS220/Clothing/OuterClothing/Armor/reactive_armor.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-vox			Added
on-equipped-OUTERCLOTHING-vox			Added

Resources/Textures/SS220/Clothing/OuterClothing/Armor/whitecapcarapace.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-vox			Added

Resources/Textures/SS220/Clothing/OuterClothing/Coats/cap_coat.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-vox			Added

Resources/Textures/SS220/Clothing/OuterClothing/Coats/ce_coat.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-vox			Added

Resources/Textures/SS220/Clothing/OuterClothing/Coats/centcom_coat.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-vox			Added

Resources/Textures/SS220/Clothing/OuterClothing/Coats/centcom_officer_coat.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-vox			Added

Resources/Textures/SS220/Clothing/OuterClothing/Coats/cmo_coat.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-vox			Added

Resources/Textures/SS220/Clothing/OuterClothing/Coats/danger_coat.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-vox			Added

Resources/Textures/SS220/Clothing/OuterClothing/Coats/hop_coat.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-vox			Added

Resources/Textures/SS220/Clothing/OuterClothing/Coats/hos_coat.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-vox			Added

Resources/Textures/SS220/Clothing/OuterClothing/Coats/qm_warehouseman.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-vox			Added

Resources/Textures/SS220/Clothing/OuterClothing/Coats/rd_coat.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-vox			Added

Resources/Textures/SS220/Clothing/OuterClothing/Coats/whitecapcoat.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-vox			Added

Resources/Textures/SS220/Clothing/OuterClothing/Hardsuits/blueshield.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-vox			Added

Resources/Textures/SS220/Clothing/OuterClothing/Misc/apronbard.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-vox			Added

Resources/Textures/SS220/Clothing/OuterClothing/Misc/chaplain_hoodiewhite.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-vox			Added

Resources/Textures/SS220/Clothing/OuterClothing/Misc/salvage_exosuit.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-vox			Added

Edit: diff updated after ccfdec8

EstKemran · 2024-10-13T10:45:58Z

@Kirus59 дай ревью

Resources/Prototypes/Entities/Mobs/Player/humanoid.yml

Kirus59 · 2024-10-13T11:03:00Z

Resources/Textures/Clothing/OuterClothing/Coats/labcoat_rd.rsi/meta.json

+    {
+      "name": "equipped-OUTERCLOTHING-vox",
+      "directions": 4
+    },
+    {
+      "name": "open-equipped-OUTERCLOTHING-vox",
+      "directions": 4
+    },


Копирайт забыл добавить?

Так там был до этого уже копирайт Китовраса, может он и нарисовал стейт для воксов?

Resources/Textures/SS220/Clothing/OuterClothing/Armor/whitecapcarapace.rsi/meta.json

…carapace.rsi/meta.json Co-authored-by: Kirus59 <[email protected]>

Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/meta.json

…ce.rsi/meta.json Co-authored-by: Stalen <[email protected]>

…ation-14 into vox-update-v1

stalengd · 2024-10-13T11:16:31Z

@EstKemran changelog у тебя нерабочий

EstKemran · 2024-10-13T11:20:27Z

@EstKemran changelog у тебя нерабочий

Исправил

stalengd

Пойдёт

UrPrice · 2024-10-14T19:43:35Z

70082b2697adcab61cd45fd855debb35.mp4

UrPrice · 2024-10-14T19:43:43Z

Кошечки вы упали

EstKemran added 3 commits September 22, 2024 23:37

coats

3e7e3d0

armor

1cc530b

vest

ad57b91

github-actions bot added Changes: Sprites Изменение затронуло файлы ".rsu / .png" Changes: Prototypes Изменение затронуло файлы ".yml" кроме неймспейса "maps" labels Sep 23, 2024

EstKemran added 7 commits October 6, 2024 21:50

suits

2972fa8

misc

3e4f45b

hardsuit

19957d4

Merge remote-tracking branch 'upstream/master' into vox-update-v1

cdb3576

common-update

fbb610c

protorype-update

30a8bf1

fix

cc2aca7

EstKemran marked this pull request as ready for review October 13, 2024 10:22

fix2

3061909

EstKemran changed the title ~~Vox Update v0.1~~ Vox Update v1 Oct 13, 2024

stalengd self-assigned this Oct 13, 2024

Kirus59 reviewed Oct 13, 2024

View reviewed changes

Update Resources/Textures/SS220/Clothing/OuterClothing/Armor/whitecap…

8e91023

…carapace.rsi/meta.json Co-authored-by: Kirus59 <[email protected]>

stalengd reviewed Oct 13, 2024

View reviewed changes

Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/meta.json Outdated Show resolved Hide resolved

EstKemran and others added 3 commits October 13, 2024 14:14

Update Resources/Textures/Clothing/OuterClothing/Armor/captain_carapa…

f22b7b8

…ce.rsi/meta.json Co-authored-by: Stalen <[email protected]>

Update meta.json

45d74d8

Merge branch 'vox-update-v1' of https://github.com/EstKemran/space-st…

ccfdec8

…ation-14 into vox-update-v1

stalengd approved these changes Oct 13, 2024

View reviewed changes

stalengd merged commit 75b9193 into SerbiaStrong-220:master Oct 13, 2024
15 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Vox Update v1 #1925

Vox Update v1 #1925

EstKemran commented Sep 23, 2024 •

edited

Loading

github-actions bot commented Sep 23, 2024 •

edited

Loading

EstKemran commented Oct 13, 2024

Kirus59 Oct 13, 2024

stalengd Oct 13, 2024

stalengd commented Oct 13, 2024

EstKemran commented Oct 13, 2024

stalengd left a comment

UrPrice commented Oct 14, 2024

UrPrice commented Oct 14, 2024

Vox Update v1 #1925

Vox Update v1 #1925

Conversation

EstKemran commented Sep 23, 2024 • edited Loading

Описание PR

github-actions bot commented Sep 23, 2024 • edited Loading

EstKemran commented Oct 13, 2024

Kirus59 Oct 13, 2024

Choose a reason for hiding this comment

stalengd Oct 13, 2024

Choose a reason for hiding this comment

stalengd commented Oct 13, 2024

EstKemran commented Oct 13, 2024

stalengd left a comment

Choose a reason for hiding this comment

UrPrice commented Oct 14, 2024

UrPrice commented Oct 14, 2024

EstKemran commented Sep 23, 2024 •

edited

Loading

github-actions bot commented Sep 23, 2024 •

edited

Loading