Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Предметы в лодаут по баунти. #1825

Merged
merged 16 commits into from
Feb 28, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions modular_ss220/clothing/_clothing.dme
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,4 @@
#include "code/shoes.dm"
#include "code/suits.dm"
#include "code/under.dm"
#include "code/neck.dm"
52 changes: 52 additions & 0 deletions modular_ss220/clothing/code/neck.dm
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',
)

26 changes: 26 additions & 0 deletions modular_ss220/clothing/code/shoes.dm
Original file line number Diff line number Diff line change
Expand Up @@ -195,3 +195,29 @@
"Vox" = 'modular_ss220/clothing/icons/mob/species/vox/shoes.dmi',
"Drask" = 'modular_ss220/clothing/icons/mob/species/drask/shoes.dmi',
)

/obj/item/clothing/shoes/jackboots/noisy/long
name = "берцы ветерана"
desc = "Тяжёлые кожаные ботинки с вшитыми стальными пластинами в носке и подошве. Надёжно защищают ноги и идеально подходят, чтобы раздавить чей-то череп. Их владелец явно обладает мощными ногами. На подошвах выбита надпись Rerro."
icon = 'modular_ss220/clothing/icons/object/shoes.dmi'
icon_state = "jackbootstall_s"
sprite_sheets = list(
"Human" = 'modular_ss220/clothing/icons/mob/shoes.dmi',
"Tajaran" = 'modular_ss220/clothing/icons/mob/shoes.dmi',
"Vulpkanin" = 'modular_ss220/clothing/icons/mob/shoes.dmi',
"Kidan" = 'modular_ss220/clothing/icons/mob/shoes.dmi',
"Skrell" = 'modular_ss220/clothing/icons/mob/shoes.dmi',
"Nucleation" = 'modular_ss220/clothing/icons/mob/shoes.dmi',
"Skeleton" = 'modular_ss220/clothing/icons/mob/shoes.dmi',
"Slime People" = 'modular_ss220/clothing/icons/mob/shoes.dmi',
"Unathi" = 'modular_ss220/clothing/icons/mob/shoes.dmi',
"Grey" = 'modular_ss220/clothing/icons/mob/shoes.dmi',
"Abductor" = 'modular_ss220/clothing/icons/mob/shoes.dmi',
"Golem" = 'modular_ss220/clothing/icons/mob/shoes.dmi',
"Machine" = 'modular_ss220/clothing/icons/mob/shoes.dmi',
"Diona" = 'modular_ss220/clothing/icons/mob/shoes.dmi',
"Nian" = 'modular_ss220/clothing/icons/mob/shoes.dmi',
"Shadow" = 'modular_ss220/clothing/icons/mob/shoes.dmi',
"Vox" = 'modular_ss220/clothing/icons/mob/species/vox/shoes.dmi',
"Drask" = 'modular_ss220/clothing/icons/mob/species/drask/shoes.dmi',
)
Binary file added modular_ss220/clothing/icons/mob/neck.dmi
Binary file not shown.
Binary file modified modular_ss220/clothing/icons/mob/shoes.dmi
Binary file not shown.
Binary file not shown.
Binary file modified modular_ss220/clothing/icons/mob/species/drask/shoes.dmi
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified modular_ss220/clothing/icons/mob/species/vox/shoes.dmi
Binary file not shown.
Binary file added modular_ss220/clothing/icons/object/neck.dmi
Binary file not shown.
Binary file modified modular_ss220/clothing/icons/object/shoes.dmi
Binary file not shown.
1 change: 1 addition & 0 deletions modular_ss220/loadout/_loadout.dme
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@
#include "code/shoes.dm"
#include "code/suit.dm"
#include "code/under.dm"
#include "code/neck.dm"
12 changes: 12 additions & 0 deletions modular_ss220/loadout/code/donor.dm
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,18 @@
display_name = "Рок гитара"
path = /obj/item/instrument/soundhand_rock_guitar

/datum/gear/donor/collarspike
display_name = "Шипованный кожаный ошейник"
path = /obj/item/clothing/neck/necklace/collarspike
donator_tier = 2
cost = 2

/datum/gear/donor/jackbootstall
display_name = "Берцы ветерана"
path = /obj/item/clothing/shoes/jackboots/noisy/long
donator_tier = 2
cost = 2

// ID Skins
/datum/gear/donor/id_decal_colored
display_name = "Наклейка на карту (Голографическая)"
Expand Down
4 changes: 4 additions & 0 deletions modular_ss220/loadout/code/neck.dm
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