Skip to content

Commit

Permalink
Перемещение вещей (#1003)
Browse files Browse the repository at this point in the history
## Что этот PR делает

Исправляет местоположение спрайтов, звуков и кода вещей добавленных с
парадайза из модуля clothing в модуль objects и удаляет модуль clothing
## Почему это хорошо для игры

Хорошо для дальнейшей разработки и поддержания билда
## Изображения изменений
## Тестирование
## Changelog

:cl:
code_imp: Сделал что-то полезное (надеюсь?)
/:cl:

---------

Co-authored-by: tgstation-server-ci[bot] <161980869+tgstation-server-ci[bot]@users.noreply.github.com>
msw7007 and tgstation-server-ci[bot] authored Jan 16, 2025
1 parent e14c3b0 commit 30116fb
Showing 64 changed files with 586 additions and 712 deletions.
4 changes: 0 additions & 4 deletions modular_bandastation/clothing/_clothing.dm

This file was deleted.

11 changes: 0 additions & 11 deletions modular_bandastation/clothing/_clothing.dme

This file was deleted.

6 changes: 0 additions & 6 deletions modular_bandastation/clothing/code/accessories.dm

This file was deleted.

25 changes: 0 additions & 25 deletions modular_bandastation/clothing/code/cloaks.dm

This file was deleted.

6 changes: 0 additions & 6 deletions modular_bandastation/clothing/code/gloves.dm

This file was deleted.

32 changes: 0 additions & 32 deletions modular_bandastation/clothing/code/hats.dm

This file was deleted.

38 changes: 0 additions & 38 deletions modular_bandastation/clothing/code/helmet.dm

This file was deleted.

12 changes: 0 additions & 12 deletions modular_bandastation/clothing/code/shoes.dm

This file was deleted.

230 changes: 0 additions & 230 deletions modular_bandastation/clothing/code/suits.dm

This file was deleted.

323 changes: 0 additions & 323 deletions modular_bandastation/clothing/code/under.dm

This file was deleted.

Binary file removed modular_bandastation/clothing/icons/mob/cloaks.dmi
Binary file not shown.
Binary file removed modular_bandastation/clothing/icons/mob/gloves.dmi
Binary file not shown.
Binary file removed modular_bandastation/clothing/icons/mob/hats.dmi
Binary file not shown.
Binary file removed modular_bandastation/clothing/icons/mob/helmet.dmi
Binary file not shown.
Binary file removed modular_bandastation/clothing/icons/object/cloaks.dmi
Binary file not shown.
Binary file removed modular_bandastation/clothing/icons/object/gloves.dmi
Binary file not shown.
Binary file removed modular_bandastation/clothing/icons/object/hats.dmi
Binary file not shown.
Binary file not shown.
2 changes: 0 additions & 2 deletions modular_bandastation/modular_bandastation.dme
Original file line number Diff line number Diff line change
@@ -16,9 +16,7 @@
#include "autohiss/_autohiss.dme"
#include "balance/_balance.dme"
#include "barsigns/_barsigns.dme"
#include "clothing/_clothing.dme"
#include "chat_badges/_chat_badges.dme"
#include "clothing/_clothing.dme"
#include "communication/_communication.dme"
#include "customization/_customization.dme"
#include "cyrillic_fixes/_cyrillic_fixes.dme"
8 changes: 8 additions & 0 deletions modular_bandastation/objects/_objects.dme
Original file line number Diff line number Diff line change
@@ -10,20 +10,27 @@
#include "code/items/material_pouch.dm"
#include "code/items/stamp.dm"
#include "code/items/wallets.dm"
#include "code/items/clothing/accessories/accessories.dm"
#include "code/items/clothing/glasses/glasses.dm"
#include "code/items/clothing/gloves/gloves.dm"
#include "code/items/clothing/head/hat.dm"
#include "code/items/clothing/head/helmet.dm"
#include "code/items/clothing/head/jobs.dm"
#include "code/items/clothing/head/mask.dm"
#include "code/items/clothing/head/soft_caps.dm"
#include "code/items/clothing/mod/modules/monitor_module.dm"
#include "code/items/clothing/mod/types/praetorian/mod_theme.dm"
#include "code/items/clothing/mod/types/praetorian/mod_types.dm"
#include "code/items/clothing/shoes/shoes.dm"
#include "code/items/clothing/spacesuits/hev_suit.dm"
#include "code/items/clothing/spacesuits/plasmaman.dm"
#include "code/items/clothing/suits/armor.dm"
#include "code/items/clothing/suits/cloaks.dm"
#include "code/items/clothing/suits/jackets.dm"
#include "code/items/clothing/suits/jobs.dm"
#include "code/items/clothing/suits/suits.dm"
#include "code/items/clothing/suits/wintercoats.dm"
#include "code/items/clothing/under/under.dm"
#include "code/items/clothing/under/jobs/blueshield.dm"
#include "code/items/clothing/under/jobs/centcom.dm"
#include "code/items/clothing/under/jobs/magistrate.dm"
@@ -32,6 +39,7 @@
#include "code/items/clothing/under/jobs/plasmaman/blueshield.dm"
#include "code/items/consumables/customer_data.dm"
#include "code/items/consumables/drinks.dm"
#include "code/items/devices/clothing_vendors.dm"
#include "code/items/devices/radio.dm"
#include "code/items/implants/death_alarm.dm"
#include "code/items/melee/baton.dm"
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
/obj/item/clothing/suit/apron/chef/red
name = "красный фартук"
icon = 'modular_bandastation/objects/icons/obj/clothing/accessories.dmi'
worn_icon = 'modular_bandastation/objects/icons/mob/clothing/accessories.dmi'
icon_state = "apron_red"
worn_icon_state = "apron_red"
Original file line number Diff line number Diff line change
@@ -28,3 +28,10 @@
. = ..()
if(clothing_flags & FIBERLESS_GLOVES)
.["безволоконная"] = "Не оставляет волокна."

/obj/item/clothing/gloves/fingerless/biker_gloves
name = "biker gloves"
desc = "Обычные черные перчатки с черепом."
icon = 'modular_bandastation/objects/icons/obj/clothing/gloves.dmi'
worn_icon = 'modular_bandastation/objects/icons/mob/clothing/gloves.dmi'
icon_state = "bike_gloves"
33 changes: 33 additions & 0 deletions modular_bandastation/objects/code/items/clothing/head/hat.dm
Original file line number Diff line number Diff line change
@@ -56,3 +56,36 @@
name = "special ops officer's beret"
desc = "Продвинутая версия стандартного офицерского берета. Выдерживает попадание аннигиляторной пушки. Проверять не стоит."
greyscale_colors = "#b72b2f#acacac"

/obj/item/clothing/head/caphat/beret_black
name = "black captain beret"
desc = "Хорошо быть королём."
icon = 'modular_bandastation/objects/icons/obj/clothing/head/hats.dmi'
worn_icon = 'modular_bandastation/objects/icons/mob/clothing/head/cap.dmi'
icon_state = "cap_beret_black"

/obj/item/clothing/head/ratge
name = "ratge head"
desc = "Ну ты и крыса!"
icon = 'modular_bandastation/objects/icons/obj/clothing/head/hats.dmi'
worn_icon = 'modular_bandastation/objects/icons/mob/clothing/head/hats.dmi'
icon_state = "ratgehead"
inhand_icon_state = "ratgehead"
lefthand_file = 'modular_bandastation/objects/icons/mob/inhands/clothing_left_hand.dmi'
righthand_file = 'modular_bandastation/objects/icons/mob/inhands/clothing_right_hand.dmi'
flags_inv = HIDEMASK | HIDEEARS | HIDEEYES | HIDEFACE | HIDEHAIR
flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH

/obj/item/clothing/head/chefhat/red
name = "chef's red hat"
desc = "Красный поварской колпак, для тех, кто хочет показать что он тут настоящий босс кухни."
icon = 'modular_bandastation/objects/icons/obj/clothing/head/hats.dmi'
worn_icon = 'modular_bandastation/objects/icons/mob/clothing/head/cap.dmi'
icon_state = "chef_red"

/obj/item/clothing/head/towel
name = "towel cap"
desc = "Полотенце замотанное в импровизированную шапку. Можно надеть на голову."
icon = 'modular_bandastation/objects/icons/obj/clothing/head/hats.dmi'
worn_icon = 'modular_bandastation/objects/icons/mob/clothing/head/cap.dmi'
icon_state = "towel_head"
38 changes: 38 additions & 0 deletions modular_bandastation/objects/code/items/clothing/head/helmet.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
/obj/item/clothing/head/helmet/biker_helmet
name = "biker helmet"
desc = "Крутой шлем."
icon = 'modular_bandastation/objects/icons/obj/clothing/head/helmet.dmi'
worn_icon = 'modular_bandastation/objects/icons/mob/clothing/head/helmet.dmi'
icon_state = "bike_helmet"
base_icon_state = "bike_helmet"
inhand_icon_state = "bike_helmet"
lefthand_file = 'modular_bandastation/objects/icons/mob/inhands/clothing_left_hand.dmi'
righthand_file = 'modular_bandastation/objects/icons/mob/inhands/clothing_right_hand.dmi'
actions_types = list(/datum/action/item_action/toggle_helmet)
flags_cover = HEADCOVERSEYES|EARS_COVERED
dog_fashion = null
var/on = TRUE

/obj/item/clothing/head/helmet/biker_helmet/replica
desc = "Крутой шлем. На вид хлипкий..."

/obj/item/clothing/head/helmet/biker_helmet/ui_action_click(mob/user, toggle_helmet)
helm_toggle(user)

/obj/item/clothing/head/helmet/biker_helmet/update_icon_state()
icon_state = "[base_icon_state][on ? null : "_up" ]"
if (on)
flags_cover &= ~HEADCOVERSEYES
else
flags_cover |= HEADCOVERSEYES
return ..()

/obj/item/clothing/head/helmet/biker_helmet/proc/helm_toggle(mob/user)
on = !on
update_icon_state()
update_appearance()

/obj/item/clothing/head/helmet/space/hardsuit/security
icon = 'modular_bandastation/objects/icons/obj/clothing/head/helmet.dmi'
worn_icon = 'modular_bandastation/objects/icons/mob/clothing/head/helmet.dmi'
icon_state = "hardsuit0-sec"
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
/obj/item/clothing/mask/breath/red_gas
name = "ПРС-1"
name = "prs-1"
desc = "Стильная дыхательная маска в виде противогаза, не скрывает лицо."
icon = 'modular_bandastation/clothing/icons/object/masks.dmi'
worn_icon = 'modular_bandastation/clothing/icons/mob/masks.dmi'
icon = 'modular_bandastation/objects/icons/obj/clothing/head/masks.dmi'
worn_icon = 'modular_bandastation/objects/icons/mob/clothing/head/masks.dmi'
icon_state = "red_gas"

/obj/item/clothing/mask/breath/breathscarf
name = "шарф с системой дыхания"
name = "breathscarf system"
desc = "Стильный и инновационный шарф, который служит дыхательной маской в экстремальных ситуациях."
icon = 'modular_bandastation/clothing/icons/object/masks.dmi'
worn_icon = 'modular_bandastation/clothing/icons/mob/masks.dmi'
icon = 'modular_bandastation/objects/icons/obj/clothing/head/masks.dmi'
worn_icon = 'modular_bandastation/objects/icons/mob/clothing/head/masks.dmi'
icon_state = "breathscarf"
13 changes: 13 additions & 0 deletions modular_bandastation/objects/code/items/clothing/shoes/shoes.dm
Original file line number Diff line number Diff line change
@@ -10,3 +10,16 @@
name = "fleet officer's jackboots"
desc = "Стандартный вариант тактической обуви, выпускаемой Нанотрейзен."
clothing_traits = list(TRAIT_NO_SLIP_ALL)

/obj/item/clothing/shoes/shark
name = "shark shoes"
desc = "Эти тапочки сделаны из акульей кожи, или нет?"
icon = 'modular_bandastation/objects/icons/obj/clothing/shoes.dmi'
worn_icon = 'modular_bandastation/objects/icons/mob/clothing/shoes.dmi'
icon_state = "shark"
lefthand_file = 'modular_bandastation/objects/icons/mob/inhands/clothing_left_hand.dmi'
righthand_file = 'modular_bandastation/objects/icons/mob/inhands/clothing_right_hand.dmi'

/obj/item/clothing/shoes/shark/light
name = "light shark shoes"
icon_state = "shark_light"
Original file line number Diff line number Diff line change
@@ -4,10 +4,10 @@
/obj/item/clothing/suit/space/hev
name = "\improper hazardous environment suit"
desc = "The Mark IV HEV suit protects the user from a number of hazardous environments and has in build ballistic protection."
icon = 'modular_bandastation/clothing/icons/object/suits.dmi'
worn_icon = 'modular_bandastation/clothing/icons/mob/suits.dmi'
lefthand_file = 'modular_bandastation/clothing/icons/inhands/left_hand.dmi'
righthand_file = 'modular_bandastation/clothing/icons/inhands/right_hand.dmi'
icon = 'modular_bandastation/objects/icons/obj/clothing/suits/suits.dmi'
worn_icon = 'modular_bandastation/objects/icons/mob/clothing/suits/suits.dmi'
lefthand_file = 'modular_bandastation/objects/icons/mob/inhands/clothing_left_hand.dmi'
righthand_file = 'modular_bandastation/objects/icons/mob/inhands/clothing_right_hand.dmi'
icon_state = "hev"
inhand_icon_state = "hev"
resistance_flags = FIRE_PROOF | ACID_PROOF | FREEZE_PROOF
@@ -87,10 +87,10 @@
for(var/voice in funny_signals)
RegisterSignal(M, voice, funny_signals[voice])
owner = M
add_queue('modular_bandastation/clothing/sound/hev/blip.ogg', 2 SECONDS, purge_queue=TRUE)
add_queue('modular_bandastation/clothing/sound/hev/01_hev_logon.ogg', 11 SECONDS)
add_queue('modular_bandastation/clothing/sound/hev/04_vitalsigns_on.ogg', 4 SECONDS)
add_queue('modular_bandastation/clothing/sound/hev/09_safe_day.ogg', 8 SECONDS)
add_queue('modular_bandastation/objects/sounds/hev/blip.ogg', 2 SECONDS, purge_queue=TRUE)
add_queue('modular_bandastation/objects/sounds/hev/01_hev_logon.ogg', 11 SECONDS)
add_queue('modular_bandastation/objects/sounds/hev/04_vitalsigns_on.ogg', 4 SECONDS)
add_queue('modular_bandastation/objects/sounds/hev/09_safe_day.ogg', 8 SECONDS)
else
for(var/voice in funny_signals)
UnregisterSignal(M, voice)
@@ -103,7 +103,7 @@
//Death
/obj/item/clothing/suit/space/hev/proc/handle_death(gibbed)
SIGNAL_HANDLER
add_queue('modular_bandastation/clothing/sound/hev/death.ogg', 5 SECONDS, purge_queue=TRUE)
add_queue('modular_bandastation/objects/sounds/hev/death.ogg', 5 SECONDS, purge_queue=TRUE)

//Mute
/obj/item/clothing/suit/space/hev/proc/handle_speech(datum/source, mob/speech_args)
@@ -114,29 +114,29 @@
"Вы пытаетесь что-то сказать, но костюм сдавливает вам гортань..."
)

speech_args[SPEECH_MESSAGE] = "..."

Check warning on line 117 in modular_bandastation/objects/code/items/clothing/spacesuits/hev_suit.dm

GitHub Actions / Run Linters

OD2304: Invalid index operation. datum[] index operations are not valid starting in BYOND 515.1641
to_chat(source, span_warning(pick(cancel_messages)))

//Fire
/obj/item/clothing/suit/space/hev/proc/handle_ignite(mob/living)
SIGNAL_HANDLER
SOUND_BEEP('modular_bandastation/clothing/sound/hev/beep_3.ogg')
add_queue('modular_bandastation/clothing/sound/hev/heat.ogg', 3 SECONDS)
SOUND_BEEP('modular_bandastation/objects/sounds/hev/beep_3.ogg')
add_queue('modular_bandastation/objects/sounds/hev/heat.ogg', 3 SECONDS)

//Shock
/obj/item/clothing/suit/space/hev/proc/handle_shock(mob/living)
SIGNAL_HANDLER
SOUND_BEEP('modular_bandastation/clothing/sound/hev/beep_3.ogg')
add_queue('modular_bandastation/clothing/sound/hev/shok.ogg', 3 SECONDS)
SOUND_BEEP('modular_bandastation/objects/sounds/hev/beep_3.ogg')
add_queue('modular_bandastation/objects/sounds/hev/shok.ogg', 3 SECONDS)

//Helmet
/obj/item/clothing/head/helmet/hev_helmet
name = "hazardous environment suit helmet"
desc = "The Mark IV HEV suit helmet."
icon = 'modular_bandastation/clothing/icons/object/helmet.dmi'
worn_icon = 'modular_bandastation/clothing/icons/mob/helmet.dmi'
lefthand_file = 'modular_bandastation/clothing/icons/inhands/left_hand.dmi'
righthand_file = 'modular_bandastation/clothing/icons/inhands/right_hand.dmi'
icon = 'modular_bandastation/objects/icons/obj/clothing/head/helmet.dmi'
worn_icon = 'modular_bandastation/objects/icons/mob/clothing/head/helmet.dmi'
lefthand_file = 'modular_bandastation/objects/icons/mob/inhands/clothing_left_hand.dmi'
righthand_file = 'modular_bandastation/objects/icons/mob/inhands/clothing_right_hand.dmi'
icon_state = "hev_helmet0"
inhand_icon_state = "hev_helmet"
armor_type = /datum/armor/armor_heavy
26 changes: 26 additions & 0 deletions modular_bandastation/objects/code/items/clothing/suits/cloaks.dm
Original file line number Diff line number Diff line change
@@ -62,3 +62,29 @@
icon = 'modular_bandastation/objects/icons/obj/clothing/cloaks.dmi'
worn_icon = 'modular_bandastation/objects/icons/mob/clothing/cloaks.dmi'
icon_state = "blueshield_cloak"

/obj/item/clothing/neck/cloak/armor/captain/black
name = "black captain cloak"
desc = "Носится верховным лидером станции."
icon = 'modular_bandastation/objects/icons/obj/clothing/cloaks.dmi'
worn_icon = 'modular_bandastation/objects/icons/mob/clothing/cloaks.dmi'
icon_state = "capcloak_black"
worn_icon_state = "capcloak_black"

/obj/item/clothing/neck/cloak/armor/captain/black/Initialize(mapload)
. = ..()
desc = "Носится верховным лидером станции [station_name()]."

/obj/item/clothing/neck/cloak/deathsquad/officer/field/cloak_nt
name = "armored cloak of nanotrassen navy officer"
desc = "Один из вариантов торжественного одеяния сотрудников Верховного Командования Нанотрейзен, подойдет для официальной встречи или важного вылета. Сшита из лёгкой и сверхпрочной ткани."
icon = 'modular_bandastation/objects/icons/obj/clothing/cloaks.dmi'
worn_icon = 'modular_bandastation/objects/icons/mob/clothing/cloaks.dmi'
icon_state = "ntsc_cloak"

/obj/item/clothing/neck/cloak/deathsquad/officer/field/cloak_nt/coat_nt
name = "cloak of field nanotrassen navy officer"
desc = "Парадный плащ нового образца, внедряемый на объектах компании в последнее время. Отличительной чертой является стоячий воротник и резаный подол. Невысокие показатели защиты нивелируются пафосом, источаемым этим плащом."
icon_state = "ntsc_coat"
icon = 'modular_bandastation/objects/icons/obj/clothing/cloaks.dmi'
worn_icon = 'modular_bandastation/objects/icons/mob/clothing/cloaks.dmi'
143 changes: 143 additions & 0 deletions modular_bandastation/objects/code/items/clothing/suits/jackets.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,143 @@
/obj/item/clothing/suit/v_jacket
name = "v jacket"
desc = "Куртка так называемого V."
icon = 'modular_bandastation/objects/icons/obj/clothing/suits/suits.dmi'
worn_icon = 'modular_bandastation/objects/icons/mob/clothing/suits/suits.dmi'
icon_state = "v_jacket"
lefthand_file = 'modular_bandastation/objects/icons/mob/inhands/clothing_left_hand.dmi'
righthand_file = 'modular_bandastation/objects/icons/mob/inhands/clothing_right_hand.dmi'

/obj/item/clothing/suit/takemura_jacket
name = "takemura jacket"
desc = "Куртка так называемого Такэмуры."
icon = 'modular_bandastation/objects/icons/obj/clothing/suits/suits.dmi'
worn_icon = 'modular_bandastation/objects/icons/mob/clothing/suits/suits.dmi'
icon_state = "takemura_jacket"
lefthand_file = 'modular_bandastation/objects/icons/mob/inhands/clothing_left_hand.dmi'
righthand_file = 'modular_bandastation/objects/icons/mob/inhands/clothing_right_hand.dmi'

/obj/item/clothing/suit/katarina_jacket
name = "katarina jacket"
desc = "Куртка так называемой Катарины."
icon = 'modular_bandastation/objects/icons/obj/clothing/suits/suits.dmi'
worn_icon = 'modular_bandastation/objects/icons/mob/clothing/suits/suits.dmi'
icon_state = "katarina_jacket"
lefthand_file = 'modular_bandastation/objects/icons/mob/inhands/clothing_left_hand.dmi'
righthand_file = 'modular_bandastation/objects/icons/mob/inhands/clothing_right_hand.dmi'

/obj/item/clothing/suit/katarina_cyberjacket
name = "katarina cyberjacket"
desc = "Кибер-куртка так называемой Катарины."
icon = 'modular_bandastation/objects/icons/obj/clothing/suits/suits.dmi'
worn_icon = 'modular_bandastation/objects/icons/mob/clothing/suits/suits.dmi'
icon_state = "katarina_cyberjacket"
lefthand_file = 'modular_bandastation/objects/icons/mob/inhands/clothing_left_hand.dmi'
righthand_file = 'modular_bandastation/objects/icons/mob/inhands/clothing_right_hand.dmi'

/obj/item/clothing/suit/hooded/vi_arcane
name = "vi jacket"
desc = "Слегка потрёпанный жакет боевой девчушки Вай."
icon = 'modular_bandastation/objects/icons/obj/clothing/suits/suits.dmi'
worn_icon = 'modular_bandastation/objects/icons/mob/clothing/suits/suits.dmi'
icon_state = "vi_arcane"
lefthand_file = 'modular_bandastation/objects/icons/mob/inhands/clothing_left_hand.dmi'
righthand_file = 'modular_bandastation/objects/icons/mob/inhands/clothing_right_hand.dmi'
hoodtype = /obj/item/clothing/head/hooded/vi_arcane
hood_up_affix = ""
body_parts_covered = CHEST|GROIN|ARMS
cold_protection = CHEST|GROIN|ARMS
min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
allowed = list()

/obj/item/clothing/head/hooded/vi_arcane
name = "vi hood"
desc = "Капюшон, прикреплённый к жакету Вай."
icon = 'modular_bandastation/objects/icons/obj/clothing/head/hood.dmi'
worn_icon = 'modular_bandastation/objects/icons/mob/clothing/head/hood.dmi'
icon_state = "vi_arcane"

body_parts_covered = HEAD
cold_protection = HEAD
min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
flags_inv = HIDEEARS | HIDEHAIR
hair_mask = HAIR_MASK_HIDE_WINTERHOOD

/obj/item/clothing/suit/soundhand_white_jacket
name = "soundhand silver jacket"
desc = "Редкая серебристая куртка Саундхэнд. Ограниченная серия."
icon = 'modular_bandastation/objects/icons/obj/clothing/suits/suits.dmi'
worn_icon = 'modular_bandastation/objects/icons/mob/clothing/suits/suits.dmi'
icon_state = "soundhand_white_jacket"
lefthand_file = 'modular_bandastation/objects/icons/mob/inhands/clothing_left_hand.dmi'
righthand_file = 'modular_bandastation/objects/icons/mob/inhands/clothing_right_hand.dmi'
allowed = list()

/obj/item/clothing/suit/soundhand_white_jacket/tag
name = "soundhand tag silver jacket"
desc = "Серебристая куртка с тэгом группы Саундхэнд, которую носят исполнители группы."
icon = 'modular_bandastation/objects/icons/obj/clothing/suits/suits.dmi'
worn_icon = 'modular_bandastation/objects/icons/mob/clothing/suits/suits.dmi'
icon_state = "soundhand_white_jacket_teg"
worn_icon_state = "soundhand_white_jacket"
lefthand_file = 'modular_bandastation/objects/icons/mob/inhands/clothing_left_hand.dmi'
righthand_file = 'modular_bandastation/objects/icons/mob/inhands/clothing_right_hand.dmi'

/obj/item/clothing/suit/soundhand_black_jacket
name = "soundhand fan black jacket"
desc = "Черная куртка группы Саундхэнд, исполненая в духе оригинала, но без логотипа на спине. С любовью для фанатов."
icon = 'modular_bandastation/objects/icons/obj/clothing/suits/suits.dmi'
worn_icon = 'modular_bandastation/objects/icons/mob/clothing/suits/suits.dmi'
icon_state = "soundhand_black_jacket"
lefthand_file = 'modular_bandastation/objects/icons/mob/inhands/clothing_left_hand.dmi'
righthand_file = 'modular_bandastation/objects/icons/mob/inhands/clothing_right_hand.dmi'
allowed = list()

/obj/item/clothing/suit/soundhand_black_jacket/tag
name = "soundhand tag black jacket"
desc = "Черная куртка с тэгом группы Саундхэнд, которую носят исполнители группы."
icon = 'modular_bandastation/objects/icons/obj/clothing/suits/suits.dmi'
worn_icon = 'modular_bandastation/objects/icons/mob/clothing/suits/suits.dmi'
icon_state = "soundhand_black_jacket_teg"
worn_icon_state = "soundhand_black_jacket"
lefthand_file = 'modular_bandastation/objects/icons/mob/inhands/clothing_left_hand.dmi'
righthand_file = 'modular_bandastation/objects/icons/mob/inhands/clothing_right_hand.dmi'

/obj/item/clothing/suit/soundhand_olive_jacket
name = "soundhand fan olive jacket"
desc = "Оливковая куртка гурппы Саундхэнд, исполненая в духе оригинала, но без логотипа на спине. С любовью для фанатов."
icon = 'modular_bandastation/objects/icons/obj/clothing/suits/suits.dmi'
worn_icon = 'modular_bandastation/objects/icons/mob/clothing/suits/suits.dmi'
icon_state = "soundhand_olive_jacket"
lefthand_file = 'modular_bandastation/objects/icons/mob/inhands/clothing_left_hand.dmi'
righthand_file = 'modular_bandastation/objects/icons/mob/inhands/clothing_right_hand.dmi'
allowed = list()

/obj/item/clothing/suit/soundhand_olive_jacket/tag
name = "soundhand tag olive jacket"
desc = "Оливковая куртка с тэгом группы Саундхэнд, которую носят исполнители группы."
icon = 'modular_bandastation/objects/icons/obj/clothing/suits/suits.dmi'
worn_icon = 'modular_bandastation/objects/icons/mob/clothing/suits/suits.dmi'
icon_state = "soundhand_olive_jacket_teg"
worn_icon_state = "soundhand_olive_jacket"
lefthand_file = 'modular_bandastation/objects/icons/mob/inhands/clothing_left_hand.dmi'
righthand_file = 'modular_bandastation/objects/icons/mob/inhands/clothing_right_hand.dmi'

/obj/item/clothing/suit/soundhand_brown_jacket
name = "soundhand fan brown jacket"
desc = "Коричневая куртка Саундхэнд, исполненая в духе оригинала, но без логотипа на спине. С любовью для фанатов."
icon = 'modular_bandastation/objects/icons/obj/clothing/suits/suits.dmi'
worn_icon = 'modular_bandastation/objects/icons/mob/clothing/suits/suits.dmi'
icon_state = "soundhand_brown_jacket"
lefthand_file = 'modular_bandastation/objects/icons/mob/inhands/clothing_left_hand.dmi'
righthand_file = 'modular_bandastation/objects/icons/mob/inhands/clothing_right_hand.dmi'
allowed = list()

/obj/item/clothing/suit/soundhand_brown_jacket/tag
name = "soundhand tag brown jacket"
desc = "Коричневая куртка с тэгом группы Саундхэнд, которую носят исполнители группы."
icon = 'modular_bandastation/objects/icons/obj/clothing/suits/suits.dmi'
worn_icon = 'modular_bandastation/objects/icons/mob/clothing/suits/suits.dmi'
icon_state = "soundhand_brown_jacket_teg"
worn_icon_state = "soundhand_brown_jacket"
lefthand_file = 'modular_bandastation/objects/icons/mob/inhands/clothing_left_hand.dmi'
righthand_file = 'modular_bandastation/objects/icons/mob/inhands/clothing_right_hand.dmi'
82 changes: 82 additions & 0 deletions modular_bandastation/objects/code/items/clothing/suits/suits.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
/obj/item/clothing/suit/hooded/shark_costume
name = "shark costume"
desc = "Костюм из 'синтетической' кожи акулы, пахнет."
icon = 'modular_bandastation/objects/icons/obj/clothing/suits/suits.dmi'
worn_icon = 'modular_bandastation/objects/icons/mob/clothing/suits/suits.dmi'
icon_state = "shark_casual"
lefthand_file = 'modular_bandastation/objects/icons/mob/inhands/clothing_left_hand.dmi'
righthand_file = 'modular_bandastation/objects/icons/mob/inhands/clothing_right_hand.dmi'
body_parts_covered = CHEST|GROIN|ARMS
cold_protection = CHEST|GROIN|ARMS
hood_up_affix = ""
min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
allowed = list(/obj/item/tank/internals/emergency_oxygen)
hoodtype = /obj/item/clothing/head/hooded/shark_hood_par

/obj/item/clothing/head/hooded/shark_hood_par
name = "shark hood"
desc = "Капюшон, прикрепленный к костюму акулы."
icon = 'modular_bandastation/objects/icons/obj/clothing/head/hood.dmi'
worn_icon = 'modular_bandastation/objects/icons/mob/clothing/head/hood.dmi'
icon_state = "shark_casual"

body_parts_covered = HEAD
cold_protection = HEAD
min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
flags_inv = HIDEEARS | HIDEHAIR

/obj/item/clothing/suit/hooded/shark_costume/light
name = "light shark costume"
icon_state = "shark_casual_light"
icon = 'modular_bandastation/objects/icons/obj/clothing/head/hood.dmi'
worn_icon = 'modular_bandastation/objects/icons/mob/clothing/head/hood.dmi'
hoodtype = /obj/item/clothing/head/hooded/shark_hood/light_par

/obj/item/clothing/head/hooded/shark_hood/light_par
name = "light shark hood"
icon_state = "shark_casual_light"
icon = 'modular_bandastation/objects/icons/obj/clothing/head/hood.dmi'
worn_icon = 'modular_bandastation/objects/icons/mob/clothing/head/hood.dmi'

/obj/item/clothing/suit/space/deathsquad/officer/syndie
name = "syndicate officer jacket"
desc = "Длинная куртка из высокопрочного волокна."
icon = 'modular_bandastation/objects/icons/obj/clothing/suits/suits.dmi'
worn_icon = 'modular_bandastation/objects/icons/mob/clothing/suits/suits.dmi'
icon_state = "jacket_syndie"

/obj/item/clothing/suit/space/deathsquad/officer/field
name = "field fleet officer's jacket"
desc = "Парадный плащ, разработанный в качестве массового варианта формы Верховного Главнокомандующего. У этой униформы нет тех же защитных свойств, что и у оригинала, но она все ещё является довольно удобным и стильным предметом гардероба."
icon = 'modular_bandastation/objects/icons/obj/clothing/suits/suits.dmi'
worn_icon = 'modular_bandastation/objects/icons/mob/clothing/suits/suits.dmi'
icon_state = "ntsc_uniform"

/datum/supply_pack/misc/soundhand_fan
name = "Soundhand Fan Crate"
desc = "Содержит фанатские куртки группы Саундхэнд"
cost = CARGO_CRATE_VALUE * 30
special = TRUE
access_view = ACCESS_SERVICE
contains = list(
/obj/item/clothing/suit/soundhand_black_jacket,
/obj/item/clothing/suit/soundhand_black_jacket,
/obj/item/clothing/suit/soundhand_olive_jacket,
/obj/item/clothing/suit/soundhand_olive_jacket,
/obj/item/clothing/suit/soundhand_brown_jacket,
/obj/item/clothing/suit/soundhand_brown_jacket,
/obj/item/clothing/suit/soundhand_white_jacket)
crate_name = "soundhand Fan crate"

/obj/item/clothing/suit/chef/red
name = "chef's red apron"
desc = "Хорошо скроенный поварской китель."
icon = 'modular_bandastation/objects/icons/obj/clothing/suits/suits.dmi'
worn_icon = 'modular_bandastation/objects/icons/mob/clothing/suits/suits.dmi'
icon_state = "chef_red"

/* Space Battle */
/obj/item/clothing/suit/space/hardsuit/security
icon = 'modular_bandastation/objects/icons/obj/clothing/suits/suits.dmi'
worn_icon = 'modular_bandastation/objects/icons/mob/clothing/suits/suits.dmi'
icon_state = "hardsuit-sec-old"
207 changes: 207 additions & 0 deletions modular_bandastation/objects/code/items/clothing/under/under.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,207 @@
/obj/item/clothing/under/costume/katarina_cybersuit
name = "catarine's cybersuit"
desc = "Кибер-костюм так называемой Катарины."
icon = 'modular_bandastation/objects/icons/obj/clothing/under/under.dmi'
worn_icon = 'modular_bandastation/objects/icons/mob/clothing/under/under.dmi'
icon_state = "katarina_cybersuit"
inhand_icon_state = "katarina_cybersuit"
lefthand_file = 'modular_bandastation/objects/icons/mob/inhands/clothing_left_hand.dmi'
righthand_file = 'modular_bandastation/objects/icons/mob/inhands/clothing_right_hand.dmi'

/obj/item/clothing/under/costume/katarina_suit
name = "catarine's suit"
desc = "Костюм так называемой Катарины."
icon = 'modular_bandastation/objects/icons/obj/clothing/under/under.dmi'
worn_icon = 'modular_bandastation/objects/icons/mob/clothing/under/under.dmi'
icon_state = "katarina_suit"
inhand_icon_state = "katarina_suit"
lefthand_file = 'modular_bandastation/objects/icons/mob/inhands/clothing_left_hand.dmi'
righthand_file = 'modular_bandastation/objects/icons/mob/inhands/clothing_right_hand.dmi'

/obj/item/clothing/under/rank/civilian/chef/red
name = "chef's red uniform"
desc = "Униформа повара с пуговицами на одну сторону."
icon = 'modular_bandastation/objects/icons/obj/clothing/under/under.dmi'
worn_icon = 'modular_bandastation/objects/icons/mob/clothing/under/under.dmi'
icon_state = "chef_red"

/obj/item/clothing/under/yellowgreen_skirt
name = "yellow-green skirt"
desc = "Выделитесь одной из множеств новых юбок от NT Couture. Жёлто-зеленый экземпляр."
icon = 'modular_bandastation/objects/icons/obj/clothing/under/under.dmi'
worn_icon = 'modular_bandastation/objects/icons/mob/clothing/under/under.dmi'
icon_state = "yellowgreen_skirt"

/obj/item/clothing/under/aqua_skirt
name = "aqua skirt"
desc = "Выделитесь одной из множеств новых юбок от NT Couture. Морской экземпляр. Любите длинные названия?"
icon = 'modular_bandastation/objects/icons/obj/clothing/under/under.dmi'
worn_icon = 'modular_bandastation/objects/icons/mob/clothing/under/under.dmi'
icon_state = "aqua_skirt"

/obj/item/clothing/under/black_skirt
name = "black skirt"
desc = "Выделитесь одной из множеств новых юбок от NT Couture. Чёрный экземпляр."
icon = 'modular_bandastation/objects/icons/obj/clothing/under/under.dmi'
worn_icon = 'modular_bandastation/objects/icons/mob/clothing/under/under.dmi'
icon_state = "black_skirt"

/obj/item/clothing/under/blue_skirt
name = "blue skirt"
desc = "Выделитесь одной из множеств новых юбок от NT Couture. Синий экземпляр."
icon = 'modular_bandastation/objects/icons/obj/clothing/under/under.dmi'
worn_icon = 'modular_bandastation/objects/icons/mob/clothing/under/under.dmi'
icon_state = "blue_skirt"

/obj/item/clothing/under/brown_skirt
name = "brown skirt"
desc = "Выделитесь одной из множеств новых юбок от NT Couture. Коричневый экземпляр."
icon = 'modular_bandastation/objects/icons/obj/clothing/under/under.dmi'
worn_icon = 'modular_bandastation/objects/icons/mob/clothing/under/under.dmi'
icon_state = "brown_skirt"

/obj/item/clothing/under/darkblue_skirt
name = "dark-blue skirt"
desc = "Выделитесь одной из множеств новых юбок от NT Couture. Тёмно-синий экземпляр."
icon = 'modular_bandastation/objects/icons/obj/clothing/under/under.dmi'
worn_icon = 'modular_bandastation/objects/icons/mob/clothing/under/under.dmi'
icon_state = "darkblue_skirt"

/obj/item/clothing/under/darkred_skirt
name = "dark-red skirt"
desc = "Выделитесь одной из множеств новых юбок от NT Couture. Тёмно-красный экземпляр."
icon = 'modular_bandastation/objects/icons/obj/clothing/under/under.dmi'
worn_icon = 'modular_bandastation/objects/icons/mob/clothing/under/under.dmi'
icon_state = "darkred_skirt"

/obj/item/clothing/under/green_skirt
name = "green skirt"
desc = "Выделитесь одной из множеств новых юбок от NT Couture. Зелёный экземпляр."
icon = 'modular_bandastation/objects/icons/obj/clothing/under/under.dmi'
worn_icon = 'modular_bandastation/objects/icons/mob/clothing/under/under.dmi'
icon_state = "green_skirt"

/obj/item/clothing/under/grey_skirt
name = "grey skirt"
desc = "Выделитесь одной из множеств новых юбок от NT Couture. Серый экземпляр. Не забудьте противогаз."
icon = 'modular_bandastation/objects/icons/obj/clothing/under/under.dmi'
worn_icon = 'modular_bandastation/objects/icons/mob/clothing/under/under.dmi'
icon_state = "grey_skirt"

/obj/item/clothing/under/lightblue_skirt
name = "light-blue skirt"
desc = "Выделитесь одной из множеств новых юбок от NT Couture. Голубой экземпляр."
icon = 'modular_bandastation/objects/icons/obj/clothing/under/under.dmi'
worn_icon = 'modular_bandastation/objects/icons/mob/clothing/under/under.dmi'
icon_state = "lightblue_skirt"

/obj/item/clothing/under/lightbrown_skirt
name = "light-brown skirt"
desc = "Выделитесь одной из множеств новых юбок от NT Couture. Светло-коричневый экземпляр."
icon = 'modular_bandastation/objects/icons/obj/clothing/under/under.dmi'
worn_icon = 'modular_bandastation/objects/icons/mob/clothing/under/under.dmi'
icon_state = "lightbrown_skirt"

/obj/item/clothing/under/lightgreen_skirt
name = "light-green skirt"
desc = "Выделитесь одной из множеств новых юбок от NT Couture. Салатовый экземпляр."
icon = 'modular_bandastation/objects/icons/obj/clothing/under/under.dmi'
worn_icon = 'modular_bandastation/objects/icons/mob/clothing/under/under.dmi'
icon_state = "lightgreen_skirt"

/obj/item/clothing/under/lightpurple_skirt
name = "light-purple skirt"
desc = "Выделитесь одной из множеств новых юбок от NT Couture. Сиреневый экземпляр."
icon = 'modular_bandastation/objects/icons/obj/clothing/under/under.dmi'
worn_icon = 'modular_bandastation/objects/icons/mob/clothing/under/under.dmi'
icon_state = "lightpurple_skirt"

/obj/item/clothing/under/lightred_skirt
name = "light-red skirt"
desc = "Выделитесь одной из множеств новых юбок от NT Couture. Пунцовый экземпляр."
icon = 'modular_bandastation/objects/icons/obj/clothing/under/under.dmi'
worn_icon = 'modular_bandastation/objects/icons/mob/clothing/under/under.dmi'
icon_state = "lightred_skirt"

/obj/item/clothing/under/orange_skirt
name = "orange skirt"
desc = "Выделитесь одной из множеств новых юбок от NT Couture. Оранжевый экземпляр."
icon = 'modular_bandastation/objects/icons/obj/clothing/under/under.dmi'
worn_icon = 'modular_bandastation/objects/icons/mob/clothing/under/under.dmi'
icon_state = "orange_skirt"

/obj/item/clothing/under/pink_skirt
name = "pink skirt"
desc = "Выделитесь одной из множеств новых юбок от NT Couture. Розовый экземпляр. Очень нежный."
icon = 'modular_bandastation/objects/icons/obj/clothing/under/under.dmi'
worn_icon = 'modular_bandastation/objects/icons/mob/clothing/under/under.dmi'
icon_state = "pink_skirt"

/obj/item/clothing/under/prisoner_skirt
name = "prisoner skirt"
desc = "Выделитесь одной из множеств новых юбок от NT Couture. Тюремный экземпляр. Для самых милых и робких."
icon = 'modular_bandastation/objects/icons/obj/clothing/under/under.dmi'
worn_icon = 'modular_bandastation/objects/icons/mob/clothing/under/under.dmi'
icon_state = "prisoner_skirt"

/obj/item/clothing/under/purple_skirt
name = "purple skirt"
desc = "Выделитесь одной из множеств новых юбок от NT Couture. Фиолетовый экземпляр."
icon = 'modular_bandastation/objects/icons/obj/clothing/under/under.dmi'
worn_icon = 'modular_bandastation/objects/icons/mob/clothing/under/under.dmi'
icon_state = "purple_skirt"

/obj/item/clothing/under/rainbow_skirt
name = "raindow skirt"
desc = "Выделитесь одной из множеств новых юбок от NT Couture. Разноцветный экземпляр. Для неопределившихся."
icon = 'modular_bandastation/objects/icons/obj/clothing/under/under.dmi'
worn_icon = 'modular_bandastation/objects/icons/mob/clothing/under/under.dmi'
icon_state = "rainbow_skirt"

/obj/item/clothing/under/red_skirt
name = "red skirt"
desc = "Выделитесь одной из множеств новых юбок от NT Couture. Красный экземпляр. Работая по обе стороны, не забывайте про любовь."
icon = 'modular_bandastation/objects/icons/obj/clothing/under/under.dmi'
worn_icon = 'modular_bandastation/objects/icons/mob/clothing/under/under.dmi'
icon_state = "red_skirt"

/obj/item/clothing/under/white_skirt
name = "whitre skirt"
desc = "Выделитесь одной из множеств новых юбок от NT Couture. Белый экземпляр. Возможно, отбеливатель был лишним."
icon = 'modular_bandastation/objects/icons/obj/clothing/under/under.dmi'
worn_icon = 'modular_bandastation/objects/icons/mob/clothing/under/under.dmi'
icon_state = "white_skirt"

/obj/item/clothing/under/yellow_skirt
name = "yellow skirt"
desc = "Выделитесь одной из множеств новых юбок от NT Couture. Жёлтый экземпляр."
icon = 'modular_bandastation/objects/icons/obj/clothing/under/under.dmi'
worn_icon = 'modular_bandastation/objects/icons/mob/clothing/under/under.dmi'
icon_state = "yellow_skirt"

/obj/item/clothing/under/towel
icon = 'modular_bandastation/objects/icons/obj/clothing/under/under.dmi'
worn_icon = 'modular_bandastation/objects/icons/mob/clothing/under/under.dmi'
lefthand_file = 'modular_bandastation/objects/icons/mob/inhands/clothing_left_hand.dmi'
righthand_file = 'modular_bandastation/objects/icons/mob/inhands/clothing_right_hand.dmi'
has_sensor = 0

/obj/item/clothing/under/towel/long
name = "towel"
desc = "Полотенце, сотканное из синтетической ткани. Можно обмотать вокруг тела."
icon_state = "towel_long"

/obj/item/clothing/under/towel/long/alt
name = "terry towel"
desc = "Полотенце, сотканное из синтетической ткани, на взгляд шершавое. Можно обмотать вокруг тела."
icon_state = "towel_long_alt"

/obj/item/clothing/under/towel/short
name = "short towel"
desc = "Полотенце, сотканное из синтетической ткани, но маленькое. Можно обмотать вокруг тела."
icon_state = "towel_short"

/obj/item/clothing/under/towel/short/alt
name = "short terry towel"
desc = "Полотенце, сотканное из синтетической ткани, на взгляд шершавое и маленькое. Можно обмотать вокруг тела."
icon_state = "towel_short_alt"
Binary file modified modular_bandastation/objects/icons/mob/clothing/cloaks.dmi
Binary file not shown.
Binary file modified modular_bandastation/objects/icons/mob/clothing/gloves.dmi
Binary file not shown.
Binary file modified modular_bandastation/objects/icons/mob/clothing/head/cap.dmi
Binary file not shown.
Binary file modified modular_bandastation/objects/icons/mob/clothing/head/hats.dmi
Binary file not shown.
Binary file not shown.
Binary file modified modular_bandastation/objects/icons/mob/clothing/head/hood.dmi
Binary file not shown.
Binary file not shown.
Binary file modified modular_bandastation/objects/icons/obj/clothing/cloaks.dmi
Binary file not shown.
Binary file modified modular_bandastation/objects/icons/obj/clothing/gloves.dmi
Binary file not shown.
Binary file modified modular_bandastation/objects/icons/obj/clothing/head/hats.dmi
Binary file not shown.
Binary file not shown.
Binary file modified modular_bandastation/objects/icons/obj/clothing/head/hood.dmi
Binary file not shown.

0 comments on commit 30116fb

Please sign in to comment.