Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Added new skirts to suitdispenser
Browse files Browse the repository at this point in the history
TheFckReal committed Mar 15, 2024
1 parent 6b6ca2a commit 77078be
Showing 4 changed files with 292 additions and 0 deletions.
49 changes: 49 additions & 0 deletions modular_ss220/balance/code/species/machine.dm
Original file line number Diff line number Diff line change
@@ -16,3 +16,52 @@
to_chat(user, "<span class='notice'>[G] не имеет внешних разъемов для подзарядки.</span>")
return
. = ..()

/obj/machinery/economy/vending/suitdispenser/Initialize(mapload)
src.products += list(/obj/item/clothing/under/yellowgreen_skirt = 10,
/obj/item/clothing/under/aqua_skirt = 10,

Check failure on line 22 in modular_ss220/balance/code/species/machine.dm

GitHub Actions / Run Linters

Check Grep

modular_ss220/balance/code/species/machine.dm:22: Mixed <tab><space> indentation detected, please stick to tab indentation.
/obj/item/clothing/under/black_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/prisoner_skirt = 1,
/obj/item/clothing/under/rainbow_skirt = 1)

src.prices += list(/obj/item/clothing/under/yellowgreen_skirt = 10,
/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 = 50,
/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)
. = ..()

243 changes: 243 additions & 0 deletions modular_ss220/clothing/code/under.dm
Original file line number Diff line number Diff line change
@@ -45,3 +45,246 @@
"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"
item_state = "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"
item_state = "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"
item_state = "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"
item_state = "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"
item_state = "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"
item_state = "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"
item_state = "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"
item_state = "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"
item_state = "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"
item_state = "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"
item_state = "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"
item_state = "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"
item_state = "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"
item_state = "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"
item_state = "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"
item_state = "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"
item_state = "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"
item_state = "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"
item_state = "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"
item_state = "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"
item_state = "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"
item_state = "yellow_skirt"
sprite_sheets = list(
"Human" = 'modular_ss220/clothing/icons/mob/under.dmi',
)

Binary file modified modular_ss220/clothing/icons/mob/under.dmi
Binary file not shown.
Binary file modified modular_ss220/clothing/icons/object/under.dmi
Binary file not shown.

0 comments on commit 77078be

Please sign in to comment.