Skip to content

Commit

Permalink
Bounty: New donor item "Vi Jacket' (#598)
Browse files Browse the repository at this point in the history
<!-- By ticking or leaving ticked the option "Allow edits and access to
secrets by maintainers" you give permission for repository maintainers
to push changes to your branch without explicilty asking. -->

<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## Что этот PR делает
Добавляет новый донорский предмет "Жакет Вай"
<!-- Include a small to medium description of what your PR changes. -->
<!-- Document all changes, as not doing this may delay reviews or even
discourage maintainers from merging your PR! -->
<!-- If your PR fixes an issue, add "Fixes #1234" somewhere in the PR
description. This will automatically close the bug upon PR submission.
-->

## Почему это хорошо для игры
Ещё одна вещь для тех кто хотят выделиться
<!-- Add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

## Изображения изменений

![image](https://github.com/ss220club/Paradise-SS220/assets/108077473/1b225060-274b-46cc-b54c-399beed031fe)

![image](https://github.com/ss220club/Paradise-SS220/assets/108077473/7c5a4acc-b38f-4a18-b6ce-70eff9fb8f3d)

<!-- If you did not make a map or sprite edit, you may delete this
section. You may include a gif or mp4 of your feature if you want. -->

## Тестирование
Протестировано
<!-- How did you test the PR, if at all? -->

## Changelog
:cl:
add: Добавлен донорский предмет "Куртка Вай"
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->


<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
<!-- If a PR has no impact on players (i.e. a code refactor that does
not change functionality) then the entire Changelog heading and contents
can be removed. -->
  • Loading branch information
Yata9arasu authored Nov 7, 2023
1 parent 145b0cd commit bbb3088
Show file tree
Hide file tree
Showing 10 changed files with 44 additions and 2 deletions.
2 changes: 1 addition & 1 deletion modular_ss220/clothing/_clothing.dm
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/datum/modpack/clothing
name = "Одежда"
desc = "Всё для модного приговора."
author = "Aylong220"
author = "Aylong220, Yata9arasu"
36 changes: 36 additions & 0 deletions modular_ss220/clothing/code/suits.dm
Original file line number Diff line number Diff line change
Expand Up @@ -88,3 +88,39 @@
icon_state = "jacket_syndie"
icon_override = 'modular_ss220/clothing/icons/mob/suits.dmi'
item_state = "jacket_syndie"

/obj/item/clothing/suit/hooded/vi_arcane
name = "куртка Вай"
desc = "Слегка потрёпанный жакет боевой девчушки Вай."
icon = 'modular_ss220/clothing/icons/object/suits.dmi'
icon_state = "vi_arcane"
icon_override = 'modular_ss220/clothing/icons/mob/suits.dmi'
item_state = "vi_arcane"
lefthand_file = 'modular_ss220/clothing/icons/inhands/left_hand.dmi'
righthand_file = 'modular_ss220/clothing/icons/inhands/right_hand.dmi'
flags_inv = HIDEJUMPSUIT
hoodtype = /obj/item/clothing/head/hooded/vi_arcane

/obj/item/clothing/head/hooded/vi_arcane
name = "капюшон Вай"
desc = "Капюшон, прикреплённый к жакету Вай."
icon = 'modular_ss220/clothing/icons/object/hats.dmi'
icon_state = "vi_arcane"
icon_override = 'modular_ss220/clothing/icons/mob/hats.dmi'
item_state = "vi_arcane"
body_parts_covered = HEAD
cold_protection = HEAD
min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
flags = BLOCKHAIR
flags_inv = HIDEEARS

/obj/item/clothing/suit/hooded/vi_arcane
name = "жакет Вай."
icon_state = "vi_arcane"
item_state = "vi_arcane"
hoodtype = /obj/item/clothing/head/hooded/vi_arcane

/obj/item/clothing/head/hooded/vi_arcane
name = "капюшон Вай"
icon_state = "vi_arcane"
item_state = "vi_arcane"
Binary file modified modular_ss220/clothing/icons/inhands/left_hand.dmi
Binary file not shown.
Binary file modified modular_ss220/clothing/icons/inhands/right_hand.dmi
Binary file not shown.
Binary file modified modular_ss220/clothing/icons/mob/hats.dmi
Binary file not shown.
Binary file modified modular_ss220/clothing/icons/mob/suits.dmi
Binary file not shown.
Binary file modified modular_ss220/clothing/icons/object/hats.dmi
Binary file not shown.
Binary file modified modular_ss220/clothing/icons/object/suits.dmi
Binary file not shown.
2 changes: 1 addition & 1 deletion modular_ss220/loadout/_loadout.dm
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/datum/modpack/loadout
name = "Loadout"
desc = "Добавляет новые вещи в Loadout."
author = "Aylong220"
author = "Aylong220, Yata9arasu"
6 changes: 6 additions & 0 deletions modular_ss220/loadout/code/donor.dm
Original file line number Diff line number Diff line change
Expand Up @@ -51,3 +51,9 @@
path = /obj/item/clothing/under/costume/katarina_cybersuit
donator_tier = 4
cost = 1

/datum/gear/donor/v_jacket
display_name = "Куртка Вай"
path = /obj/item/clothing/suit/hooded/vi_arcane
donator_tier = 3
cost = 2

0 comments on commit bbb3088

Please sign in to comment.