forked from ParadiseSS13/Paradise
-
Notifications
You must be signed in to change notification settings - Fork 130
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: Ratge hat & Chef Drip Update (#915)
<!-- Пишите **НИЖЕ** заголовков и **ВЫШЕ** комментариев, иначе что то может пойти не так. --> <!-- Вы можете прочитать Contributing.MD, если хотите узнать больше. --> ## Что этот PR делает Добавлена шляпа знаменитейшего ratge Добавлен новый красный дрип для повара из сериала "Кухня", за спрайты спасибо @PiotrTheTchaikowsky (Discord) Новый поварской дрип можно достать в поварском вендомате, или выбрав под-профу "Сulinary Artist" <!-- Вкратце опишите изменения, которые вносите. --> <!-- Опишите **все** изменения, так как противное может сказаться на рассмотрении этого PR'а! --> <!-- Если вы исправляете Issue, добавьте "Fixes #1234" (где 1234 - номер Issue) где-нибудь в описании PR'а. Это автоматически закроет Issue после принятия PR'а. --> ## Почему это хорошо для игры Больше разнообразия одежды, больше пиздеца в коде... <!-- Опишите, почему, по вашему, следует добавить эти изменения в игру. --> ## Изображения изменений ![image](https://github.com/ss220club/Paradise-SS220/assets/69762909/faffe64d-f4c6-497a-9efc-a092a03d2b6f) ![image](https://github.com/ss220club/Paradise-SS220/assets/69762909/2425b26c-eb57-4b74-b52e-1298b4d90e04) <!-- Если вы не меняли карту или спрайты, можете опустить эту секцию. Если хотите, можете вставить видео. --> ## Тестирование Вроде всё нормис <!-- Как вы тестировали свой PR, если делали это вовсе? --> ## Changelog :cl: Пётр Чайковский, Aylong add: Новый дрип для повара из сериала "Кухня", достать можно в поварском клозмате, или выбрав под-профу "Culinary Artist" add: Голова "ratge" доступна в автодробах, в каждом 1 голова и стоит 75 кредитов, налетай :ratge: fix: Рассовые спрайты байкерского шлема, теперь корректно отображаются на... рассах, жертвой стал код, который теперь НАС РАНО /:cl: <!-- Оба :cl:'а должны быть на месте, что-бы чейнджлог работал! Вы можете написать свой ник справа от первого :cl:, если хотите. Иначе будет использован ваш ник на ГитХабе. --> <!-- Вы можете использовать несколько записей с одинаковым префиксом (Они используются только для иконки в игре) и удалить ненужные. Помните, что чейнджлог должен быть понятен обычным игроком. --> <!-- Если чейнджлог не влияет на игроков(например, это рефактор), вы можете исключить всю секцию. -->
- Loading branch information
Showing
46 changed files
with
213 additions
and
48 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
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,32 @@ | ||
/obj/item/storage/belt/chef/apron | ||
name = "фартук" | ||
desc = "Фартук с широкими карманами. Такому обзавидуется любой мясник." | ||
icon = 'modular_ss220/clothing/icons/object/accessories.dmi' | ||
icon_state = "apron" | ||
item_state = "apron" | ||
sprite_sheets = list( | ||
"Abductor" = 'modular_ss220/clothing/icons/mob/accessories.dmi', | ||
"Ancient Skeleton" = 'modular_ss220/clothing/icons/mob/accessories.dmi', | ||
"Diona" = 'modular_ss220/clothing/icons/mob/accessories.dmi', | ||
"Drask" = 'modular_ss220/clothing/icons/mob/species/drask/accessories.dmi', | ||
"Golem" = 'modular_ss220/clothing/icons/mob/accessories.dmi', | ||
"Grey" = 'modular_ss220/clothing/icons/mob/species/grey/accessories.dmi', | ||
"Human" = 'modular_ss220/clothing/icons/mob/accessories.dmi', | ||
"Kidan" = 'modular_ss220/clothing/icons/mob/accessories.dmi', | ||
"Machine" = 'modular_ss220/clothing/icons/mob/accessories.dmi', | ||
"Monkey" = 'modular_ss220/clothing/icons/mob/species/monkey/accessories.dmi', | ||
"Nian" = 'modular_ss220/clothing/icons/mob/accessories.dmi', | ||
"Plasmaman" = 'modular_ss220/clothing/icons/mob/accessories.dmi', | ||
"Shadow" = 'modular_ss220/clothing/icons/mob/accessories.dmi', | ||
"Skrell" = 'modular_ss220/clothing/icons/mob/accessories.dmi', | ||
"Slime People" = 'modular_ss220/clothing/icons/mob/accessories.dmi', | ||
"Tajaran" = 'modular_ss220/clothing/icons/mob/accessories.dmi', | ||
"Unathi" = 'modular_ss220/clothing/icons/mob/accessories.dmi', | ||
"Vox" = 'modular_ss220/clothing/icons/mob/species/vox/accessories.dmi', | ||
"Vulpkanin" = 'modular_ss220/clothing/icons/mob/accessories.dmi', | ||
) | ||
|
||
/obj/item/storage/belt/chef/apron/red | ||
name = "красный фартук" | ||
icon_state = "apron_red" | ||
item_state = "apron_red" |
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,25 @@ | ||
/obj/machinery/economy/vending/autodrobe/Initialize(mapload) | ||
products += list( | ||
/obj/item/clothing/head/ratge = 1, | ||
) | ||
prices += list( | ||
/obj/item/clothing/head/ratge = 75, | ||
) | ||
. = ..() | ||
|
||
/obj/machinery/economy/vending/chefdrobe/Initialize(mapload) | ||
products += list( | ||
/obj/item/clothing/under/rank/civilian/chef/red = 2, | ||
/obj/item/clothing/suit/chef/red = 2, | ||
/obj/item/clothing/head/chefhat/red = 2, | ||
/obj/item/storage/belt/chef/apron = 1, | ||
/obj/item/storage/belt/chef/apron/red = 1, | ||
) | ||
prices += list( | ||
/obj/item/clothing/under/rank/civilian/chef/red = 50, | ||
/obj/item/clothing/suit/chef/red = 50, | ||
/obj/item/clothing/head/chefhat/red = 50, | ||
/obj/item/storage/belt/chef/apron = 75, | ||
/obj/item/storage/belt/chef/apron/red = 75, | ||
) | ||
. = ..() |
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,65 @@ | ||
/obj/item/clothing/head/caphat/beret_black | ||
name = "чёрный капитанский берет" | ||
desc = "Хорошо быть королём." | ||
icon = 'modular_ss220/clothing/icons/object/hats.dmi' | ||
icon_state = "cap_beret_black" | ||
icon_override = 'modular_ss220/clothing/icons/mob/hats.dmi' | ||
|
||
/obj/item/clothing/head/ratge | ||
name = "ratge head" | ||
desc = "Ну ты и крыса!" | ||
icon = 'modular_ss220/clothing/icons/object/hats.dmi' | ||
icon_state = "ratgehead" | ||
lefthand_file = 'modular_ss220/clothing/icons/inhands/left_hand.dmi' | ||
righthand_file = 'modular_ss220/clothing/icons/inhands/right_hand.dmi' | ||
flags = BLOCKHAIR | ||
flags_inv = HIDEMASK | HIDEEARS | HIDEEYES | HIDEFACE | ||
flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH | ||
sprite_sheets = list( | ||
"Abductor" = 'modular_ss220/clothing/icons/mob/hats.dmi', | ||
"Ancient Skeleton" = 'modular_ss220/clothing/icons/mob/hats.dmi', | ||
"Diona" = 'modular_ss220/clothing/icons/mob/hats.dmi', | ||
"Drask" = 'modular_ss220/clothing/icons/mob/hats.dmi', | ||
"Golem" = 'modular_ss220/clothing/icons/mob/hats.dmi', | ||
"Grey" = 'modular_ss220/clothing/icons/mob/species/grey/hats.dmi', | ||
"Human" = 'modular_ss220/clothing/icons/mob/hats.dmi', | ||
"Kidan" = 'modular_ss220/clothing/icons/mob/species/kidan/hats.dmi', | ||
"Machine" = 'modular_ss220/clothing/icons/mob/hats.dmi', | ||
"Monkey" = 'modular_ss220/clothing/icons/mob/hats.dmi', | ||
"Nian" = 'modular_ss220/clothing/icons/mob/hats.dmi', | ||
"Plasmaman" = 'modular_ss220/clothing/icons/mob/hats.dmi', | ||
"Shadow" = 'modular_ss220/clothing/icons/mob/hats.dmi', | ||
"Skrell" = 'modular_ss220/clothing/icons/mob/hats.dmi', | ||
"Slime People" = 'modular_ss220/clothing/icons/mob/hats.dmi', | ||
"Tajaran" = 'modular_ss220/clothing/icons/mob/species/tajaran/hats.dmi', | ||
"Unathi" = 'modular_ss220/clothing/icons/mob/hats.dmi', | ||
"Vox" = 'modular_ss220/clothing/icons/mob/hats.dmi', | ||
"Vulpkanin" = 'modular_ss220/clothing/icons/mob/species/vulpkanin/hats.dmi', | ||
) | ||
|
||
/obj/item/clothing/head/chefhat/red | ||
name = "chef's red hat" | ||
desc = "Красный поварской колпак, для тех, кто хочет показать что он тут настоящий босс кухни." | ||
icon = 'modular_ss220/clothing/icons/object/hats.dmi' | ||
icon_state = "chef_red" | ||
sprite_sheets = list( | ||
"Abductor" = 'modular_ss220/clothing/icons/mob/hats.dmi', | ||
"Ancient Skeleton" = 'modular_ss220/clothing/icons/mob/hats.dmi', | ||
"Diona" = 'modular_ss220/clothing/icons/mob/hats.dmi', | ||
"Drask" = 'modular_ss220/clothing/icons/mob/hats.dmi', | ||
"Golem" = 'modular_ss220/clothing/icons/mob/hats.dmi', | ||
"Grey" = 'modular_ss220/clothing/icons/mob/species/grey/hats.dmi', | ||
"Human" = 'modular_ss220/clothing/icons/mob/hats.dmi', | ||
"Kidan" = 'modular_ss220/clothing/icons/mob/hats.dmi', | ||
"Machine" = 'modular_ss220/clothing/icons/mob/hats.dmi', | ||
"Monkey" = 'modular_ss220/clothing/icons/mob/species/monkey/hats.dmi', | ||
"Nian" = 'modular_ss220/clothing/icons/mob/hats.dmi', | ||
"Plasmaman" = 'modular_ss220/clothing/icons/mob/hats.dmi', | ||
"Shadow" = 'modular_ss220/clothing/icons/mob/hats.dmi', | ||
"Skrell" = 'modular_ss220/clothing/icons/mob/hats.dmi', | ||
"Slime People" = 'modular_ss220/clothing/icons/mob/hats.dmi', | ||
"Tajaran" = 'modular_ss220/clothing/icons/mob/hats.dmi', | ||
"Unathi" = 'modular_ss220/clothing/icons/mob/hats.dmi', | ||
"Vox" = 'modular_ss220/clothing/icons/mob/species/vox/hats.dmi', | ||
"Vulpkanin" = 'modular_ss220/clothing/icons/mob/hats.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
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
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
Oops, something went wrong.