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

Jump to bottom

Новые спрайты одежды карго #13315

Merged
merged 21 commits into from
Jul 22, 2024
Merged

Новые спрайты одежды карго #13315

merged 21 commits into from
Jul 22, 2024

Conversation

KatoMarika
Copy link
Contributor

@KatoMarika KatoMarika commented Jul 16, 2024 •
edited
Loading

Описание изменений

Новые спрайты карго за авторством @WROTL
image
Выше для инвентаря, ниже для мира
image

Почему и что этот ПР улучшит

Визуальная составляющая

Авторство

WROTL

Чеинжлог

🆑

  • image: обновление униформы карго.

@TauKitty
Copy link
Contributor

Changelog status: ✔️

@TauKitty TauKitty requested a review from a team July 16, 2024 18:14
maleyvich
maleyvich reviewed Jul 16, 2024
View reviewed changes
code/modules/clothing/under/miscellaneous.dm
@@ -457,12 +457,6 @@
icon_state = "skirt_cadet"
item_state = "skirt_cadet"

/obj/item/clothing/under/rank/cargo_fem
name = "quartermaster's dress"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

а за шо

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Задание партии, удалить юбки из карго.

@TauKitty TauKitty requested a review from a team July 16, 2024 18:54
@AirBlack
Copy link
Contributor

ура удалили гейские шортики

KIBORG04
KIBORG04 reviewed Jul 17, 2024
View reviewed changes
code/modules/clothing/suits/jobs.dm
Comment on lines -292 to -308
//Recycler
/obj/item/clothing/suit/recyclervest
name = "recycler vest"
desc = "This is Recycler vest."
icon = 'icons/obj/clothing/suits.dmi'
icon_state = "recycler_vest_open"
item_state = "recycler_vest"
blood_overlay_type = "coat" //it's the less thing that I can put here
body_parts_covered = 0
item_action_types = list(/datum/action/item_action/hands_free/toggle_vest_buttons)

/datum/action/item_action/hands_free/toggle_vest_buttons
name = "Toggle vest buttons"

/datum/action/item_action/hands_free/toggle_vest_buttons/Activate()
var/obj/item/clothing/suit/recyclervest/S = target
S.toggle()
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

А куда вы дели его? Я вроде не нашел замены, к тому же ты recycler_vest спрайт оставил в билде, не убрав его. Так и надо?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Они в 90% времени в космосе, в спейссьютах, если так подумать им жилетка не нужна и по факту очередной мусорный(ха) айтем.

KIBORG04
KIBORG04 reviewed Jul 17, 2024
View reviewed changes
code/modules/clothing/suits/jobs.dm Outdated
/datum/action/item_action/hands_free/toggle_vest_buttons/Activate()
var/obj/item/clothing/suit/recyclervest/S = target
S.toggle()

/obj/item/clothing/suit/recyclervest/proc/toggle()
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

но при этом, эту хуйню не удалил. Че.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Почистил.

@TauKitty TauKitty requested a review from a team July 17, 2024 12:25
@KatoMarika
Copy link
Contributor Author

Обновил спрайты, кучка фиксов от автора, еще и воксов подвезли.

@KatoMarika KatoMarika requested a review from KIBORG04 July 21, 2024 08:52
@KatoMarika
Copy link
Contributor Author

Спасибо @maleyvich за пинок в правильном направлении.

@KatoMarika
Copy link
Contributor Author

Удалил иконку из мира в коде, в спрайтах оставил на будущее.
Согласно обсуждению в дискорде.

KIBORG04
KIBORG04 approved these changes Jul 22, 2024
View reviewed changes
Copy link
Member

@KIBORG04 KIBORG04 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

После фикса конфликтов мерж

KIBORG04
KIBORG04 previously requested changes Jul 22, 2024
View reviewed changes
Copy link
Member

@KIBORG04 KIBORG04 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

После резолва двух сообщений и фикса конфликтов - мерж

@KatoMarika
Copy link
Contributor Author

Вроде все, пофиксил.

@KatoMarika KatoMarika mentioned this pull request Jul 22, 2024
Merged
@KatoMarika
Copy link
Contributor Author

Это готово к мержу, но лучше мержить вместе с #13356
Конфликт указанный выше я не смог осилить в рамках данного ПРа, поэтому решил вынести inhands иконки отдельно.
Гоните и насмехайтесь.

@LudwigVonChesterfield LudwigVonChesterfield dismissed KIBORG04’s stale review July 22, 2024 23:20

зарезолвали.

@LudwigVonChesterfield LudwigVonChesterfield merged commit 57a4c40 into TauCetiStation:master Jul 22, 2024
12 checks passed
TauKitty added a commit to TauCetiStation/ClassicChangelog that referenced this pull request Jul 22, 2024
@TauKitty
Automatic changelog generation for PR TauCetiStation/TauCetiClassic#1…
390a0fe 
…3315
@KatoMarika KatoMarika deleted the NewCargoSprites branch July 24, 2024 09:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@KIBORG04 KIBORG04 KIBORG04 left review comments

@maleyvich maleyvich maleyvich left review comments

@WatlerJe WatlerJe WatlerJe approved these changes

Assignees
No one assigned
Labels
Sprites
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@KatoMarika @TauKitty @AirBlack @WatlerJe @KIBORG04 @maleyvich @LudwigVonChesterfield