forked from ParadiseSS13/Paradise
-
Notifications
You must be signed in to change notification settings - Fork 134
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Предметы в лодаут по баунти. (#1825)
## Что этот PR делает Добавляет 3 новых предмета в лодаут, два предмета в Т2 подписку и 1 предмет в обычный лодаут. Сделано по баунти https://discord.com/channels/1097181193939730453/1344300928307822622 одобрено @Максимилиан ## Почему это хорошо для игры Добавляет больше косметики в игру, а особая косметика в Т2 вероятно принесёт проекту донатики, что хорошо. На баланс и геймлей никак не влияет. ## Скриншоты   ## Тестирование Зашел на локалку, в лодауте взял то что бесплатно, а то что платно заспавнил через админ панель. В лодауте всё присутствует, бесплатное выдаётся точно, все спрайты есть и отображаются корректно, конфликтов не замечено. ## Changelog :cl: Hans add: Добавил 3 новых косметических предмета в лодаут - два предмета в Т2 лодаут по подписке (особые высокие берцы и шипованный ошейник) , и 1 предмет в бесплатный лодаут (ошейник с кварцевым камнем). /:cl: <!-- Оба :cl:'а должны быть на месте, что-бы чейнджлог работал! Вы можете написать свой ник справа от первого :cl:, если хотите. Иначе будет использован ваш ник на ГитХабе. --> <!-- Вы можете использовать несколько записей с одинаковым префиксом (Они используются только для иконки в игре) и удалить ненужные. Помните, что чейнджлог должен быть понятен обычным игроком. --> <!-- Если чейнджлог не влияет на игроков(например, это рефактор), вы можете исключить всю секцию. --> ## Обзор от Sourcery Новые функции: - Добавлены три новых косметических предмета в набор снаряжения: два предмета в набор снаряжения по подписке T2 (особые высокие ботинки и ошейник с шипами) и один предмет в бесплатный набор снаряжения (голографическое ожерелье-ошейник). <details> <summary>Original summary in English</summary> ## Summary by Sourcery New Features: - Adds three new cosmetic items to the loadout: two items to the T2 subscription loadout (special high boots and a spiked collar) and one item to the free loadout (holographic collar necklace). </details> --------- Co-authored-by: Mikhail Dzianishchyts <[email protected]>
- Loading branch information
1 parent
bb9a445
commit a0fa55f
Showing
16 changed files
with
96 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -11,3 +11,4 @@ | |
#include "code/shoes.dm" | ||
#include "code/suits.dm" | ||
#include "code/under.dm" | ||
#include "code/neck.dm" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,52 @@ | ||
/obj/item/clothing/neck/necklace/collarspike | ||
name = "шипованый ошейник" | ||
desc = "Стильный кожаный ошейник с стальными шипами. На внутренней стороне ошейника выжженно слово Rerro." | ||
icon = 'modular_ss220/clothing/icons/object/neck.dmi' | ||
icon_state = "collarspike_s" | ||
sprite_sheets = list( | ||
"Human" = 'modular_ss220/clothing/icons/mob/neck.dmi', | ||
"Tajaran" = 'modular_ss220/clothing/icons/mob/neck.dmi', | ||
"Vulpkanin" = 'modular_ss220/clothing/icons/mob/neck.dmi', | ||
"Kidan" = 'modular_ss220/clothing/icons/mob/species/kidan/neck.dmi', | ||
"Skrell" = 'modular_ss220/clothing/icons/mob/neck.dmi', | ||
"Nucleation" = 'modular_ss220/clothing/icons/mob/neck.dmi', | ||
"Skeleton" = 'modular_ss220/clothing/icons/mob/neck.dmi', | ||
"Slime People" = 'modular_ss220/clothing/icons/mob/neck.dmi', | ||
"Unathi" = 'modular_ss220/clothing/icons/mob/neck.dmi', | ||
"Grey" = 'modular_ss220/clothing/icons/mob/species/grey/neck.dmi', | ||
"Abductor" = 'modular_ss220/clothing/icons/mob/neck.dmi', | ||
"Golem" = 'modular_ss220/clothing/icons/mob/neck.dmi', | ||
"Machine" = 'modular_ss220/clothing/icons/mob/neck.dmi', | ||
"Diona" = 'modular_ss220/clothing/icons/mob/neck.dmi', | ||
"Nian" = 'modular_ss220/clothing/icons/mob/neck.dmi', | ||
"Shadow" = 'modular_ss220/clothing/icons/mob/neck.dmi', | ||
"Vox" = 'modular_ss220/clothing/icons/mob/species/vox/neck.dmi', | ||
"Drask" = 'modular_ss220/clothing/icons/mob/neck.dmi', | ||
) | ||
|
||
/obj/item/clothing/neck/necklace/holocollar | ||
name = "ошейник с кварцевым камнем" | ||
desc = "Ошейник ручной работы с огранённым кварцем нежно-голубого оттенка. Чёрная кожаная привязь с магнитным замком обеспечивает удобную фиксацию. Справа выгравированы три слова: BODY. MIND. SOUL., а слева — тёмно-фиолетовой каллиграфией нанесено LiteCore." | ||
icon = 'modular_ss220/clothing/icons/object/neck.dmi' | ||
icon_state = "collarholo_s" | ||
sprite_sheets = list( | ||
"Human" = 'modular_ss220/clothing/icons/mob/neck.dmi', | ||
"Tajaran" = 'modular_ss220/clothing/icons/mob/neck.dmi', | ||
"Vulpkanin" = 'modular_ss220/clothing/icons/mob/neck.dmi', | ||
"Kidan" = 'modular_ss220/clothing/icons/mob/species/kidan/neck.dmi', | ||
"Skrell" = 'modular_ss220/clothing/icons/mob/neck.dmi', | ||
"Nucleation" = 'modular_ss220/clothing/icons/mob/neck.dmi', | ||
"Skeleton" = 'modular_ss220/clothing/icons/mob/neck.dmi', | ||
"Slime People" = 'modular_ss220/clothing/icons/mob/neck.dmi', | ||
"Unathi" = 'modular_ss220/clothing/icons/mob/neck.dmi', | ||
"Grey" = 'modular_ss220/clothing/icons/mob/species/grey/neck.dmi', | ||
"Abductor" = 'modular_ss220/clothing/icons/mob/neck.dmi', | ||
"Golem" = 'modular_ss220/clothing/icons/mob/neck.dmi', | ||
"Machine" = 'modular_ss220/clothing/icons/mob/neck.dmi', | ||
"Diona" = 'modular_ss220/clothing/icons/mob/neck.dmi', | ||
"Nian" = 'modular_ss220/clothing/icons/mob/neck.dmi', | ||
"Shadow" = 'modular_ss220/clothing/icons/mob/neck.dmi', | ||
"Vox" = 'modular_ss220/clothing/icons/mob/species/vox/neck.dmi', | ||
"Drask" = 'modular_ss220/clothing/icons/mob/species/drask/neck.dmi', | ||
) | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -7,3 +7,4 @@ | |
#include "code/shoes.dm" | ||
#include "code/suit.dm" | ||
#include "code/under.dm" | ||
#include "code/neck.dm" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
/datum/gear/neck/holocollar | ||
display_name = "Ошейник с кварцевым камнем" | ||
path = /obj/item/clothing/neck/necklace/holocollar | ||
slot = ITEM_SLOT_NECK |