Skip to content

Commit

Permalink
Add Vox shoes & gloves to loadout (#1597)
Browse files Browse the repository at this point in the history
<!-- Пишите **НИЖЕ** заголовков и **ВЫШЕ** комментариев, иначе что то
может пойти не так. -->
<!-- Вы можете прочитать Contributing.MD, если хотите узнать больше. -->

## Что этот PR делает

Добавляем сандали и легкие рукавицы воксов в лодаут.
Добавляем воксовые изольки в тулвендор.
Добавил пару бесплатных вендором для щитспавна и маппинга.

<!-- Вкратце опишите изменения, которые вносите. -->
<!-- Опишите **все** изменения, так как противное может сказаться на
рассмотрении этого PR'а! -->
<!-- Если вы исправляете Issue, добавьте "Fixes #xxxx" (где xxxx - номер
Issue) где-нибудь в описании PR'а. Это автоматически закроет Issue после
принятия PR'а. -->

## Почему это хорошо для игры

Больше расовой косметики.

<!-- Опишите, почему, по вашему, следует добавить эти изменения в игру.
-->

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


![image](https://github.com/user-attachments/assets/64f5b905-3283-4768-9b58-fb45ac229ca5)


![image](https://github.com/user-attachments/assets/28748006-d1d2-48a8-bf3f-30094eac52c1)


## Тестирование

Да

<!-- Как вы тестировали свой PR, если делали это вовсе? -->

## Changelog

:cl:
add: В расовый лодаут добавлены воксовые рукавички и сандали.
add: В инженерный вендор в контрабанду добавлены изоляционные рукавицы
воксов - 1 штука.
/:cl:

<!-- Оба :cl:'а должны быть на месте, что-бы чейнджлог работал! Вы
можете написать свой ник справа от первого :cl:, если хотите. Иначе
будет использован ваш ник на ГитХабе. -->
<!-- Вы можете использовать несколько записей с одинаковым префиксом
(Они используются только для иконки в игре) и удалить ненужные. Помните,
что чейнджлог должен быть понятен обычным игроком. -->
<!-- Если чейнджлог не влияет на игроков(например, это рефактор), вы
можете исключить всю секцию. -->

---------

Co-authored-by: Legendaxe <102746941+Legendaxe@users.noreply.github.com>
Co-authored-by: dj-34 <dj-34@bk.ru>
  • Loading branch information
3 people authored Oct 15, 2024
1 parent 4e39ce1 commit ad279ee
Show file tree
Hide file tree
Showing 6 changed files with 69 additions and 34 deletions.
34 changes: 0 additions & 34 deletions modular_ss220/antagonists/code/vox_raider/clothing/vox_clothing.dm
Original file line number Diff line number Diff line change
Expand Up @@ -41,37 +41,3 @@
name = "vox purple jumpsuit"
icon_state = "vox-jumpsuit_purple"
item_color = "vox-jumpsuit_purple"

// ================
// loadout
/datum/gear/racial/vox_jumpsuit
display_name = "vox work jumpsuit"
description = "These loose clothes are optimized for the labors of the lower castes onboard the arkships. Large openings in the top allow for breathability while the pants are durable yet flexible enough to not restrict movement."
path = /obj/item/clothing/under/vox/jumpsuit
slot = SLOT_HUD_JUMPSUIT

/datum/gear/racial/vox_jumpsuit/red
display_name = "vox red jumpsuit"
path = /obj/item/clothing/under/vox/jumpsuit/red

/datum/gear/racial/vox_jumpsuit/teal
display_name = "vox teal jumpsuit"
path = /obj/item/clothing/under/vox/jumpsuit/teal

/datum/gear/racial/vox_jumpsuit/blue
display_name = "vox blue jumpsuit"
path = /obj/item/clothing/under/vox/jumpsuit/blue

/datum/gear/racial/vox_jumpsuit/green
display_name = "vox green jumpsuit"
path = /obj/item/clothing/under/vox/jumpsuit/green

/datum/gear/racial/vox_jumpsuit/yellow
display_name = "vox yellow jumpsuit"
path = /obj/item/clothing/under/vox/jumpsuit/yellow

/datum/gear/racial/vox_jumpsuit/purple
display_name = "vox purple jumpsuit"
path = /obj/item/clothing/under/vox/jumpsuit/purple

// ================
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,15 @@
resistance_flags = NONE
armor = list(MELEE = 30, BULLET = 0, LASER = 10, ENERGY = 10, BOMB = 0, RAD = 0, FIRE = 200, ACID = 50)

/obj/item/clothing/gloves/vox/light
name = "light vox gauntlets"
desc = "Легкие рукавицы причудливой формы с когтями."
strip_delay = 2 SECONDS
cold_protection = 0
min_cold_protection_temperature = NONE
max_heat_protection_temperature = NONE
armor = NONE

/obj/item/clothing/gloves/color/yellow/vox
name = "insulated vox gauntlets"
desc = "Плотные изоляционные рукавицы причудливой формы с когтями."
Expand Down
1 change: 1 addition & 0 deletions modular_ss220/loadout/_loadout.dme
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

#include "code/donor.dm"
#include "code/donor_items.dm"
#include "code/racial.dm"
#include "code/removal.dm"
#include "code/shoes.dm"
#include "code/suit.dm"
Expand Down
42 changes: 42 additions & 0 deletions modular_ss220/loadout/code/racial.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
// MARK: Vox

/datum/gear/racial/vox_sandal
display_name = "Vox sandals"
path = /obj/item/clothing/shoes/roman/vox
slot = SLOT_HUD_SHOES

/datum/gear/racial/vox_gauntlets
display_name = "Vox gauntlets"
path = /obj/item/clothing/gloves/vox/light
slot = SLOT_HUD_GLOVES

/datum/gear/racial/vox_jumpsuit
display_name = "Vox work jumpsuit"
description = "These loose clothes are optimized for the labors of the lower castes onboard the arkships. Large openings in the top allow for breathability while the pants are durable yet flexible enough to not restrict movement."
path = /obj/item/clothing/under/vox/jumpsuit
slot = SLOT_HUD_JUMPSUIT

/datum/gear/racial/vox_jumpsuit/red
display_name = "Vox red jumpsuit"
path = /obj/item/clothing/under/vox/jumpsuit/red

/datum/gear/racial/vox_jumpsuit/teal
display_name = "Vox teal jumpsuit"
path = /obj/item/clothing/under/vox/jumpsuit/teal

/datum/gear/racial/vox_jumpsuit/blue
display_name = "Vox blue jumpsuit"
path = /obj/item/clothing/under/vox/jumpsuit/blue

/datum/gear/racial/vox_jumpsuit/green
display_name = "Vox green jumpsuit"
path = /obj/item/clothing/under/vox/jumpsuit/green

/datum/gear/racial/vox_jumpsuit/yellow
display_name = "Vox yellow jumpsuit"
path = /obj/item/clothing/under/vox/jumpsuit/yellow

/datum/gear/racial/vox_jumpsuit/purple
display_name = "Vox purple jumpsuit"
path = /obj/item/clothing/under/vox/jumpsuit/purple

14 changes: 14 additions & 0 deletions modular_ss220/vending/code/vending.dm
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,9 @@
/obj/item/clothing/under/rainbow_skirt = 100)
. = ..()

/obj/machinery/economy/vending/suitdispenser/free
prices = list()

/obj/machinery/economy/vending/wallmed/emergency_ntmed
name = "\improper Advanced Nanomed"
desc = "Продвинутая экстренная аптечка на все случаи жизни."
Expand All @@ -242,3 +245,14 @@
contraband |= list(/obj/item/clothing/shoes/clown_shoes/moffers = 1)
prices |= list(/obj/item/clothing/shoes/clown_shoes/moffers = 80)
. = ..()

/obj/machinery/economy/vending/shoedispenser/free
prices = list()

/obj/machinery/economy/vending/tool/Initialize(mapload)
contraband |= list(/obj/item/clothing/gloves/color/yellow/vox = 1)
prices |= list(/obj/item/clothing/gloves/color/yellow/vox = 500)
. = ..()

/obj/machinery/economy/vending/tool/free
prices = list()
3 changes: 3 additions & 0 deletions modular_ss220/vending/code/vending_food.dm
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,9 @@
/obj/item/poster/mac_vulpix = 3,
)

/obj/machinery/economy/vending/vulpix/free
prices = list()

// MARK: Nanotrasen Food
/obj/machinery/economy/vending/nt_food
name = "\improper Nanotrasen Food"
Expand Down

0 comments on commit ad279ee

Please sign in to comment.