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

Added new skirts to suitdispenser #1101

Merged
merged 6 commits into from
Mar 20, 2024
Merged

Added new skirts to suitdispenser #1101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
77078be
Added new skirts to suitdispenser
TheFckReal Mar 15, 2024
bba2dac
style fix
TheFckReal Mar 15, 2024
37ca04d
Files changed and decreased code-size
TheFckReal Mar 15, 2024
d6fb35a
Changed prices
TheFckReal Mar 15, 2024
14241d5
Removed useless src
TheFckReal Mar 20, 2024
8321288
Removed all useless src
TheFckReal Mar 20, 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
221 changes: 221 additions & 0 deletions modular_ss220/clothing/code/under.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,3 +45,224 @@
"Vox" = 'modular_ss220/clothing/icons/mob/species/vox/under.dmi',
"Vulpkanin" = 'modular_ss220/clothing/icons/mob/under.dmi',
)

/obj/item/clothing/under/yellowgreen_skirt
name = "жёлто-зеленая юбка"
desc = "Выделитесь одной из множеств новых юбок от NT Couture. Жёлто-зеленый экземпляр."
icon = 'modular_ss220/clothing/icons/object/under.dmi'
icon_state = "yellowgreen_skirt"
item_color = "yellowgreen_skirt"
sprite_sheets = list(
"Human" = 'modular_ss220/clothing/icons/mob/under.dmi',
)

/obj/item/clothing/under/aqua_skirt
name = "юбка цвета морской волны"
desc = "Выделитесь одной из множеств новых юбок от NT Couture. Морской экземпляр. Любите длинные названия?"
icon = 'modular_ss220/clothing/icons/object/under.dmi'
icon_state = "aqua_skirt"
item_color = "aqua_skirt"
sprite_sheets = list(
"Human" = 'modular_ss220/clothing/icons/mob/under.dmi',
)

/obj/item/clothing/under/black_skirt
name = "чёрная юбка"
desc = "Выделитесь одной из множеств новых юбок от NT Couture. Чёрный экземпляр."
icon = 'modular_ss220/clothing/icons/object/under.dmi'
icon_state = "black_skirt"
item_color = "black_skirt"
sprite_sheets = list(
"Human" = 'modular_ss220/clothing/icons/mob/under.dmi',
)

/obj/item/clothing/under/blue_skirt
name = "синяя юбка"
desc = "Выделитесь одной из множеств новых юбок от NT Couture. Синий экземпляр."
icon = 'modular_ss220/clothing/icons/object/under.dmi'
icon_state = "blue_skirt"
item_color = "blue_skirt"
sprite_sheets = list(
"Human" = 'modular_ss220/clothing/icons/mob/under.dmi',
)

/obj/item/clothing/under/brown_skirt
name = "коричневая юбка"
desc = "Выделитесь одной из множеств новых юбок от NT Couture. Коричневый экземпляр."
icon = 'modular_ss220/clothing/icons/object/under.dmi'
icon_state = "brown_skirt"
item_color = "brown_skirt"
sprite_sheets = list(
"Human" = 'modular_ss220/clothing/icons/mob/under.dmi',
)

/obj/item/clothing/under/darkblue_skirt
name = "тёмно-синяя юбка"
desc = "Выделитесь одной из множеств новых юбок от NT Couture. Тёмно-синий экземпляр."
icon = 'modular_ss220/clothing/icons/object/under.dmi'
icon_state = "darkblue_skirt"
item_color = "darkblue_skirt"
sprite_sheets = list(
"Human" = 'modular_ss220/clothing/icons/mob/under.dmi',
)

/obj/item/clothing/under/darkred_skirt
name = "тёмно-красная юбка"
desc = "Выделитесь одной из множеств новых юбок от NT Couture. Тёмно-красный экземпляр."
icon = 'modular_ss220/clothing/icons/object/under.dmi'
icon_state = "darkred_skirt"
item_color = "darkred_skirt"
sprite_sheets = list(
"Human" = 'modular_ss220/clothing/icons/mob/under.dmi',
)

/obj/item/clothing/under/green_skirt
name = "зелёная юбка"
desc = "Выделитесь одной из множеств новых юбок от NT Couture. Зелёный экземпляр."
icon = 'modular_ss220/clothing/icons/object/under.dmi'
icon_state = "green_skirt"
item_color = "green_skirt"
sprite_sheets = list(
"Human" = 'modular_ss220/clothing/icons/mob/under.dmi',
)

/obj/item/clothing/under/grey_skirt
name = "серая юбка"
desc = "Выделитесь одной из множеств новых юбок от NT Couture. Серый экземпляр. Не забудьте противогаз."
icon = 'modular_ss220/clothing/icons/object/under.dmi'
icon_state = "grey_skirt"
item_color = "grey_skirt"
sprite_sheets = list(
"Human" = 'modular_ss220/clothing/icons/mob/under.dmi',
)

/obj/item/clothing/under/lightblue_skirt
name = "голубая юбка"
desc = "Выделитесь одной из множеств новых юбок от NT Couture. Голубой экземпляр."
icon = 'modular_ss220/clothing/icons/object/under.dmi'
icon_state = "lightblue_skirt"
item_color = "lightblue_skirt"
sprite_sheets = list(
"Human" = 'modular_ss220/clothing/icons/mob/under.dmi',
)

/obj/item/clothing/under/lightbrown_skirt
name = "светло-коричневая юбка"
desc = "Выделитесь одной из множеств новых юбок от NT Couture. Светло-коричневый экземпляр."
icon = 'modular_ss220/clothing/icons/object/under.dmi'
icon_state = "lightbrown_skirt"
item_color = "lightbrown_skirt"
sprite_sheets = list(
"Human" = 'modular_ss220/clothing/icons/mob/under.dmi',
)

/obj/item/clothing/under/lightgreen_skirt
name = "салатовая юбка"
desc = "Выделитесь одной из множеств новых юбок от NT Couture. Салатовый экземпляр."
icon = 'modular_ss220/clothing/icons/object/under.dmi'
icon_state = "lightgreen_skirt"
item_color = "lightgreen_skirt"
sprite_sheets = list(
"Human" = 'modular_ss220/clothing/icons/mob/under.dmi',
)

/obj/item/clothing/under/lightpurple_skirt
name = "сиреневая юбка"
desc = "Выделитесь одной из множеств новых юбок от NT Couture. Сиреневый экземпляр."
icon = 'modular_ss220/clothing/icons/object/under.dmi'
icon_state = "lightpurple_skirt"
item_color = "lightpurple_skirt"
sprite_sheets = list(
"Human" = 'modular_ss220/clothing/icons/mob/under.dmi',
)

/obj/item/clothing/under/lightred_skirt
name = "пунцовая юбка"
desc = "Выделитесь одной из множеств новых юбок от NT Couture. Пунцовый экземпляр."
icon = 'modular_ss220/clothing/icons/object/under.dmi'
icon_state = "lightred_skirt"
item_color = "lightred_skirt"
sprite_sheets = list(
"Human" = 'modular_ss220/clothing/icons/mob/under.dmi',
)

/obj/item/clothing/under/orange_skirt
name = "оранжевая юбка"
desc = "Выделитесь одной из множеств новых юбок от NT Couture. Оранжевый экземпляр."
icon = 'modular_ss220/clothing/icons/object/under.dmi'
icon_state = "orange_skirt"
item_color = "orange_skirt"
sprite_sheets = list(
"Human" = 'modular_ss220/clothing/icons/mob/under.dmi',
)

/obj/item/clothing/under/pink_skirt
name = "розовая юбка"
desc = "Выделитесь одной из множеств новых юбок от NT Couture. Розовый экземпляр. Очень нежный."
icon = 'modular_ss220/clothing/icons/object/under.dmi'
icon_state = "pink_skirt"
item_color = "pink_skirt"
sprite_sheets = list(
"Human" = 'modular_ss220/clothing/icons/mob/under.dmi',
)

/obj/item/clothing/under/prisoner_skirt
name = "тюремная юбка"
desc = "Выделитесь одной из множеств новых юбок от NT Couture. Тюремный экземпляр. Для самых милых и робких."
icon = 'modular_ss220/clothing/icons/object/under.dmi'
icon_state = "prisoner_skirt"
item_color = "prisoner_skirt"
sprite_sheets = list(
"Human" = 'modular_ss220/clothing/icons/mob/under.dmi',
)

/obj/item/clothing/under/purple_skirt
name = "фиолетовая юбка"
desc = "Выделитесь одной из множеств новых юбок от NT Couture. Фиолетовый экземпляр."
icon = 'modular_ss220/clothing/icons/object/under.dmi'
icon_state = "purple_skirt"
item_color = "purple_skirt"
sprite_sheets = list(
"Human" = 'modular_ss220/clothing/icons/mob/under.dmi',
)

/obj/item/clothing/under/rainbow_skirt
name = "разноцветная юбка"
desc = "Выделитесь одной из множеств новых юбок от NT Couture. Разноцветный экземпляр. Для неопределившихся."
icon = 'modular_ss220/clothing/icons/object/under.dmi'
icon_state = "rainbow_skirt"
item_color = "rainbow_skirt"
sprite_sheets = list(
"Human" = 'modular_ss220/clothing/icons/mob/under.dmi',
)

/obj/item/clothing/under/red_skirt
name = "красная юбка"
desc = "Выделитесь одной из множеств новых юбок от NT Couture. Красный экземпляр. Работая по обе стороны, не забывайте про любовь."
icon = 'modular_ss220/clothing/icons/object/under.dmi'
icon_state = "red_skirt"
item_color = "red_skirt"
sprite_sheets = list(
"Human" = 'modular_ss220/clothing/icons/mob/under.dmi',
)

/obj/item/clothing/under/white_skirt
name = "белая юбка"
desc = "Выделитесь одной из множеств новых юбок от NT Couture. Белый экземпляр. Возможно, отбеливатель был лишним."
icon = 'modular_ss220/clothing/icons/object/under.dmi'
icon_state = "white_skirt"
item_color = "white_skirt"
sprite_sheets = list(
"Human" = 'modular_ss220/clothing/icons/mob/under.dmi',
)

/obj/item/clothing/under/yellow_skirt
name = "жёлтая юбка"
desc = "Выделитесь одной из множеств новых юбок от NT Couture. Жёлтый экземпляр."
icon = 'modular_ss220/clothing/icons/object/under.dmi'
icon_state = "yellow_skirt"
item_color = "yellow_skirt"
sprite_sheets = list(
"Human" = 'modular_ss220/clothing/icons/mob/under.dmi',
)

Binary file modified modular_ss220/clothing/icons/mob/under.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified modular_ss220/clothing/icons/object/under.dmi
View file
Open in desktop
Binary file not shown.
49 changes: 49 additions & 0 deletions modular_ss220/vending/code/vending.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,3 +162,52 @@
icon_state = "Cola_Machine_Red"
icon_lightmask = "Cola_Machine_Red"
slogan_list = list("Кола в космосе!")

/obj/machinery/economy/vending/suitdispenser/Initialize(mapload)
products += list(/obj/item/clothing/under/yellowgreen_skirt = 10,
/obj/item/clothing/under/black_skirt = 10,
/obj/item/clothing/under/aqua_skirt = 10,
/obj/item/clothing/under/blue_skirt = 10,
/obj/item/clothing/under/brown_skirt = 10,
/obj/item/clothing/under/darkblue_skirt = 10,
/obj/item/clothing/under/darkred_skirt = 10,
/obj/item/clothing/under/green_skirt = 10,
/obj/item/clothing/under/grey_skirt = 10,
/obj/item/clothing/under/lightblue_skirt = 10,
/obj/item/clothing/under/lightbrown_skirt = 10,
/obj/item/clothing/under/lightgreen_skirt = 10,
/obj/item/clothing/under/lightpurple_skirt = 10,
/obj/item/clothing/under/lightred_skirt = 10,
/obj/item/clothing/under/orange_skirt = 10,
/obj/item/clothing/under/pink_skirt = 10,
/obj/item/clothing/under/purple_skirt = 10,
/obj/item/clothing/under/red_skirt = 10,
/obj/item/clothing/under/white_skirt = 10,
/obj/item/clothing/under/yellow_skirt = 10,
/obj/item/clothing/under/rainbow_skirt = 1)

contraband += list(/obj/item/clothing/under/prisoner_skirt = 1)

prices += list(/obj/item/clothing/under/yellowgreen_skirt = 30,
/obj/item/clothing/under/aqua_skirt = 50,
/obj/item/clothing/under/black_skirt = 30,
/obj/item/clothing/under/blue_skirt = 50,
/obj/item/clothing/under/brown_skirt = 30,
/obj/item/clothing/under/darkblue_skirt = 50,
/obj/item/clothing/under/darkred_skirt = 50,
/obj/item/clothing/under/green_skirt = 50,
/obj/item/clothing/under/grey_skirt = 30,
/obj/item/clothing/under/lightblue_skirt = 30,
/obj/item/clothing/under/lightbrown_skirt = 30,
/obj/item/clothing/under/lightgreen_skirt = 50,
/obj/item/clothing/under/lightpurple_skirt = 50,
/obj/item/clothing/under/lightred_skirt = 50,
/obj/item/clothing/under/orange_skirt = 50,
/obj/item/clothing/under/pink_skirt = 50,
/obj/item/clothing/under/purple_skirt = 50,
/obj/item/clothing/under/red_skirt = 50,
/obj/item/clothing/under/white_skirt = 50,
/obj/item/clothing/under/yellow_skirt = 50,
/obj/item/clothing/under/prisoner_skirt = 175,
/obj/item/clothing/under/rainbow_skirt = 100)
. = ..()
Loading