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.
<!-- Пишите **НИЖЕ** заголовков и **ВЫШЕ** комментариев, иначе что то может пойти не так. --> <!-- Вы можете прочитать Contributing.MD, если хотите узнать больше. --> ## Что этот PR делает Это порт униформы экспедиционного корпуса с Сьерры на парадиз. Добавлены 4 новые формы для исследователей, а также заменена старая форма раундстарт на новую. Новая форма также приехала в вендоматы для исследователей. Старая форма также осталась в вендомате. ## Почему это хорошо для игры Запрос стримера на прайм. ## Изображения изменений <!-- Если вы не меняли карту или спрайты, можете опустить эту секцию. Если хотите, можете вставить видео. --> ## Тестирование Провел все тесты на локалке, все работает. <!-- Как вы тестировали свой PR, если делали это вовсе? --> ## Changelog :cl: add: Добавлена новая униформа для исследователей в вендомат tweak: Поменял раундстарт униформу у исследователей /:cl:
- Loading branch information
1 parent
492fc98
commit 74d0961
Showing
6 changed files
with
72 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
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,16 @@ | ||
// Замена аутфита эксплореров | ||
|
||
/datum/outfit/job/explorer | ||
name = "Explorer" | ||
jobtype = /datum/job/explorer | ||
l_ear = /obj/item/radio/headset/headset_cargo/expedition | ||
head = /obj/item/clothing/head/soft/expedition | ||
uniform = /obj/item/clothing/under/rank/cargo/expedition_prime | ||
gloves = /obj/item/clothing/gloves/color/black | ||
shoes = /obj/item/clothing/shoes/jackboots | ||
belt = /obj/item/storage/belt/utility/expedition | ||
id = /obj/item/card/id/explorer | ||
pda = /obj/item/pda/explorer | ||
backpack = /obj/item/storage/backpack/explorer | ||
satchel = /obj/item/storage/backpack/satchel/explorer | ||
box = /obj/item/storage/box/survival_mining |
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,33 @@ | ||
/* Новая одежда для экспедиции, только для прайма */ | ||
/obj/item/clothing/under/rank/cargo/expedition_prime | ||
name = "navy expedition uniform" | ||
desc = "Экспедиционная форма военного образца с опознавательными знаками Нанотрейзен." | ||
armor = list(MELEE = 5, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 20, ACID = 20) | ||
icon = 'modular_ss220/prime_only/icons/object/under.dmi' | ||
icon_state = "expedition_prime_navy" | ||
item_state = "expedition_prime_navy" | ||
item_color = "expedition_prime_navy" | ||
sprite_sheets = list( | ||
"Human" = 'modular_ss220/prime_only/icons/mob/under.dmi', | ||
) | ||
|
||
/obj/item/clothing/under/rank/cargo/expedition_prime/green | ||
name = "green expedition uniform" | ||
desc = "Зеленая экспедиционная форма с опознавательными знаками Нанотрейзен." | ||
icon_state = "expedition_prime_green" | ||
item_state = "expedition_prime_green" | ||
item_color = "expedition_prime_green" | ||
|
||
/obj/item/clothing/under/rank/cargo/expedition_prime/tan | ||
name = "tan expedition uniform" | ||
desc = "Экспедиционная форма с пустынным камуфляжем и опознавательными знаками Нанотрейзен." | ||
icon_state = "expedition_prime_tan" | ||
item_state = "expedition_prime_tan" | ||
item_color = "expedition_prime_tan" | ||
|
||
/obj/item/clothing/under/rank/cargo/expedition_prime/grey | ||
name = "grey expedition uniform" | ||
desc = "Серая экспедиционная форма с опознавательными знаками Нанотрейзен." | ||
icon_state = "expedition_prime_grey" | ||
item_state = "expedition_prime_grey" | ||
item_color = "expedition_prime_grey" |
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,20 @@ | ||
// Новые список предметов для экспедиционного вендомата только для прайма | ||
|
||
/obj/machinery/economy/vending/exploredrobe/Initialize(mapload) | ||
var/list/new_products = list( | ||
/obj/item/clothing/under/rank/cargo/expedition_prime = 5, | ||
/obj/item/clothing/under/rank/cargo/expedition_prime/green = 5, | ||
/obj/item/clothing/under/rank/cargo/expedition_prime/tan = 5, | ||
/obj/item/clothing/under/rank/cargo/expedition_prime/grey = 5, | ||
) | ||
var/list/new_prices = list( | ||
/obj/item/clothing/under/rank/cargo/expedition_prime = 50, | ||
/obj/item/clothing/under/rank/cargo/expedition_prime/green = 50, | ||
/obj/item/clothing/under/rank/cargo/expedition_prime/tan = 50, | ||
/obj/item/clothing/under/rank/cargo/expedition_prime/grey = 50, | ||
) | ||
new_products |= products | ||
products = new_products | ||
new_prices |= prices | ||
prices = new_prices | ||
. = ..() |
Binary file not shown.
Binary file not shown.