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

3 Глобуса #13646

Merged
merged 6 commits into from
Nov 27, 2024
Merged

3 Глобуса #13646

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
56c29ee
3 глобуса
DarthSidiousPalpatine Nov 25, 2024
e8d96d6
Merge remote-tracking branch 'upstream/master' into 3Глобуса
DarthSidiousPalpatine Nov 26, 2024
a2b083d
Merge remote-tracking branch 'upstream/master' into 3Глобуса
DarthSidiousPalpatine Nov 26, 2024
da249d3
Обновил ПР в связи с мержами.
DarthSidiousPalpatine Nov 26, 2024
051b83f
F
DarthSidiousPalpatine Nov 26, 2024
528800f
Update decorations.dm
DarthSidiousPalpatine Nov 26, 2024
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
29 changes: 25 additions & 4 deletions code/game/objects/items/decorations.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,11 +82,32 @@
front_side.layer = layer + 0.01
add_overlay(front_side)

/obj/item/mars_globe
name = "mars globe"
desc = "Глобус Марса."
/obj/item/globe
icon = 'icons/obj/items.dmi'
icon_state = "globe"

/obj/item/globe/mars
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.

всм

Copy link
Member

Choose a reason for hiding this comment

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

image

Ты жесткий тип там задал и смотришь на жетский тип

Copy link
Contributor Author

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.

ща верну как было крч)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Киборг, ты что, хочешь чтобы я в этом ПРе всё таки это сделал? Просто ПР про 3 глобуса. Не хочу в нём фиксить полку. Можно мерж 3 глобуса и я заливаю ещё 3 глобуса для "нарративного дизайна"? :3

Copy link
Member

Choose a reason for hiding this comment

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

Тогда мне будет нужен еще один пр, где ты глобусы пихаешь в один тайп, а у полки пишешь is_type_in_list

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Киборг, а вопрос такой, у меня по коду потом надо выдернуть оффсеты по типу. И как я их выдерну если у меня тип в списке будет не совпадать с типом предмета?
image

Copy link
Contributor Author

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.

Аааа, сорян, я уже нашёл что там ниже есть прок get_type_in_list, удобно)

name = "mars globe"
cases = list("глобус Марса", "глобуса Марса", "глобусу Марса", "глобус Марса", "глобусом Марса", "глобусе Марса")
desc = "Точное отображение поверхности Марса."
icon_state = "globe_mars"

/obj/item/globe/venus
name = "venus globe"
cases = list("глобус Венеры", "глобуса Венеры", "глобусу Венеры", "глобус Венеры", "глобусом Венеры", "глобусе Венеры")
desc = "Точное отображение поверхности Венеры."
icon_state = "globe_venus"

/obj/item/globe/earth
name = "earth globe"
cases = list("глобус Земли", "глобуса Земли", "глобусу Земли", "глобус Земли", "глобусом Земли", "глобусе Земли")
desc = "Точное отображение поверхности Земли."
icon_state = "globe_earth"

/obj/item/globe/yargon
name = "yargon IV globe"
cases = list("глобус Яргона-4", "глобуса Яргона-4", "глобусу Яргона-4", "глобус Яргона-4", "глобусом Яргона-4", "глобусе Яргона-4")
desc = "Точное отображение поверхности Яргона-4."
icon_state = "globe_yargon4"

/obj/item/newtons_pendulum
name = "newton's pendulum"
Expand Down
3 changes: 2 additions & 1 deletion code/modules/library/lib_items.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,8 @@
var/list/canbeplaced = list(
/obj/item/mars_globe = list(4, -6),
/obj/item/newtons_pendulum = list(5, -8),
/obj/item/bust = list(4, -6)
/obj/item/bust = list(4, -6),
/obj/item/globe = list(4, -6)
)

/obj/structure/bookcase/shelf/atom_init()
Expand Down
Binary file modified icons/obj/items.dmi
View file
Open in desktop
Binary file not shown.
Loading