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.

Sign up for GitHub

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

Jump to bottom

Маски, акссесуары, ботинки и перчатки из лодаута пары #453

Open
wants to merge 34 commits into
base: master
Choose a base branch
from
Open

Маски, акссесуары, ботинки и перчатки из лодаута пары #453

Show file tree
Hide file tree
Changes from 33 commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
4cd326f
Базовая отгрузка, на очереди исправление
msw7007 Jul 14, 2024
93f2307
Правки HEV
msw7007 Jul 14, 2024
0c4a30a
Починил гребанные худы
msw7007 Jul 14, 2024
f8f3d45
Merge branch 'ss220club:master' into suits_instrumets
msw7007 Jul 15, 2024
8a2e3be
Правка и внедрение лодаута
msw7007 Jul 15, 2024
cef56ff
Правки и внедрения в лодауты
msw7007 Jul 15, 2024
3644df7
Правка рук (жаль не моих)
msw7007 Jul 15, 2024
d99b5e9
Merge branch 'ss220club:master' into suits_instrumets
msw7007 Jul 15, 2024
5deb95e
Фиксы по рантайму
msw7007 Jul 15, 2024
dab3357
Чистка по рантайму 2
msw7007 Jul 15, 2024
aee4be2
Правка тестов missing_icon и worn_icon
msw7007 Jul 15, 2024
46c535f
Попытка разобраться с create_and_destroy, правка ударной установки
msw7007 Jul 15, 2024
4aebb9c
Правка чистки ударных
msw7007 Jul 15, 2024
63f36a4
Попытка преодолеть ошибки проверок №1
msw7007 Jul 15, 2024
1e75629
Приведение кода к единому виду
msw7007 Jul 15, 2024
876031c
Попытка преодолеть ошибки проверок №2
msw7007 Jul 16, 2024
b532244
Новая чистка кода
msw7007 Jul 16, 2024
57d93e4
Переопределение наследования ударной
msw7007 Jul 16, 2024
16c776b
Попытки обойти рантайм 3
msw7007 Jul 16, 2024
c510be8
Слишком накрутил инициализацию
msw7007 Jul 16, 2024
35873e6
Merge branch 'master' into suits_instrumets
msw7007 Jul 16, 2024
efc0c57
Попытки пройти проблемы райнтайма
msw7007 Jul 16, 2024
b37702a
Merge branch 'master' into suits_instrumets
msw7007 Jul 16, 2024
aa12707
Попытка одолеть рантайм 4
msw7007 Jul 16, 2024
48f5479
Merge branch 'suits_instrumets' of https://github.com/msw7007/Bandast…
msw7007 Jul 16, 2024
301fa60
Расширение лодаута
msw7007 Jul 16, 2024
6c5be29
Merge branch 'master' into suits_instrumets
msw7007 Jul 16, 2024
57b5349
Правка того, правка сего
msw7007 Jul 17, 2024
46b4ecb
Вырезка лишнего для разнесения по другим ПР
msw7007 Jul 23, 2024
295e4b7
Аксессуары, маски, перчатки и ботинки
msw7007 Jul 23, 2024
6b5f5b5
Чистка от кода других модулей
msw7007 Jul 23, 2024
81b5145
Отработка по ревью ч1
msw7007 Jul 25, 2024
55e877a
Merge branch 'master' into accessories
msw7007 Sep 20, 2024
55916bb
Обновление JSON из гита мастера
msw7007 Sep 22, 2024
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
4 changes: 4 additions & 0 deletions modular_bandastation/clothing/_clothing.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
/datum/modpack/clothing
name = "Одежда"
desc = "Всё для модного приговора."
author = "Aylong220, Yata9arasu"
5 changes: 5 additions & 0 deletions modular_bandastation/clothing/_clothing.dme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#include "_clothing.dm"
#include "code/accessories.dm"
#include "code/gloves.dm"
#include "code/mask.dm"
#include "code/shoes.dm"
6 changes: 6 additions & 0 deletions modular_bandastation/clothing/code/accessories.dm
View file
Open in desktop
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/clothing/icons/object/accessories.dmi'
worn_icon = 'modular_bandastation/clothing/icons/mob/accessories.dmi'
icon_state = "apron_red"
worn_icon_state = "apron_red"
6 changes: 6 additions & 0 deletions modular_bandastation/clothing/code/gloves.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
/obj/item/clothing/gloves/fingerless/biker_gloves
name = "байкерские перчатки"
desc = "Обычные черные перчатки с черепом."
icon = 'modular_bandastation/clothing/icons/object/gloves.dmi'
worn_icon = 'modular_bandastation/clothing/icons/mob/gloves.dmi'
icon_state = "bike_gloves"
13 changes: 13 additions & 0 deletions modular_bandastation/clothing/code/mask.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
/obj/item/clothing/mask/breath/red_gas
name = "ПРС-1"
desc = "Стильная дыхательная маска в виде противогаза, не скрывает лицо."
icon = 'modular_bandastation/clothing/icons/object/masks.dmi'
worn_icon = 'modular_bandastation/clothing/icons/mob/masks.dmi'
icon_state = "red_gas"

/obj/item/clothing/mask/breath/breathscarf
name = "шарф с системой дыхания"
desc = "Стильный и инновационный шарф, который служит дыхательной маской в экстремальных ситуациях."
icon = 'modular_bandastation/clothing/icons/object/masks.dmi'
worn_icon = 'modular_bandastation/clothing/icons/mob/masks.dmi'
icon_state = "breathscarf"
64 changes: 64 additions & 0 deletions modular_bandastation/clothing/code/shoes.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
/datum/action/item_action/change_color
name = "Change color"

/obj/item/clothing/shoes/black/neon
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Неоновые кроссовки я посмотрю позже. Тут реализация переключения света может быть неактуальной для ТГ.

name = "неоновые кросовки"
desc = "Пара чёрных кросовок с светодиодными вставками."
icon = 'modular_bandastation/clothing/icons/object/shoes.dmi'
worn_icon = 'modular_bandastation/clothing/icons/mob/shoes.dmi'
icon_state = "neon"
lefthand_file = 'modular_bandastation/clothing/icons/inhands/left_hand.dmi'
righthand_file = 'modular_bandastation/clothing/icons/inhands/right_hand.dmi'
actions_types = list(/datum/action/item_action/toggle_light, /datum/action/item_action/change_color)
color = null
var/glow_active = FALSE
var/brightness_on = 2

/obj/item/clothing/shoes/black/neon/attack_self(mob/living/user)
var/choice = tgui_input_list(user, "Что вы хотите сделать?", "Неоновые кросовки", list("Переключить подсветку", "Сменить цвет"))
switch(choice)
if("Переключить подсветку")
turn_glow()
if("Сменить цвет")
change_color()

/obj/item/clothing/shoes/black/neon/update_icon_state()
. = ..()

/obj/item/clothing/shoes/black/neon/proc/turn_glow()
if(!glow_active)
set_light(brightness_on)
var/mutable_appearance/neon_overlay = mutable_appearance('modular_bandastation/clothing/icons/mob/shoes.dmi',"neon_overlay")
neon_overlay.color = color
add_overlay(neon_overlay)
glow_active = TRUE
else
set_light(0)
cut_overlays()
glow_active = FALSE
update_icon_state()

/obj/item/clothing/shoes/black/neon/proc/change_color(mob/living/user as mob)
var/temp = input(usr, "Пожалуйста, выберите цвет.", "Цвет кросовок") as color
color = temp
light_color = temp
update_icon_state()

/obj/item/clothing/shoes/black/neon/ui_action_click(mob/user, actiontype)
if(istype(actiontype, /datum/action/item_action/change_color))
change_color()
else if(istype(actiontype, /datum/action/item_action/toggle_light))
turn_glow()

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

/obj/item/clothing/shoes/shark/light
name = "светло-голубые акульи тапочки"
icon_state = "shark_light"
Binary file added modular_bandastation/clothing/icons/inhands/left_hand.dmi
View file
Open in desktop
Binary file not shown.
Binary file added modular_bandastation/clothing/icons/inhands/right_hand.dmi
View file
Open in desktop
Binary file not shown.
Binary file added modular_bandastation/clothing/icons/mob/accessories.dmi
View file
Open in desktop
Binary file not shown.
Binary file added modular_bandastation/clothing/icons/mob/gloves.dmi
View file
Open in desktop
Binary file not shown.
Binary file added modular_bandastation/clothing/icons/mob/masks.dmi
View file
Open in desktop
Binary file not shown.
Binary file added modular_bandastation/clothing/icons/mob/shoes.dmi
View file
Open in desktop
Binary file not shown.
Binary file added modular_bandastation/clothing/icons/object/accessories.dmi
View file
Open in desktop
Binary file not shown.
Binary file added modular_bandastation/clothing/icons/object/gloves.dmi
View file
Open in desktop
Binary file not shown.
Binary file added modular_bandastation/clothing/icons/object/masks.dmi
View file
Open in desktop
Binary file not shown.
Binary file added modular_bandastation/clothing/icons/object/shoes.dmi
View file
Open in desktop
Binary file not shown.
1 change: 1 addition & 0 deletions modular_bandastation/modular_bandastation.dme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
#include "autohiss/_autohiss.dme"
#include "balance/_balance.dme"
#include "barsigns/_barsigns.dme"
#include "clothing/_clothing.dme"
#include "communication/_communication.dme"
//#include "crawl_speed/_crawl_speed.dme" // Fixing floored melee brawl, or first steps to remove RP speed
#include "cyrillic_fixes/_cyrillic_fixes.dme"
Expand Down
145 changes: 72 additions & 73 deletions strings/italian_replacement_ru.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,78 +1,77 @@
{

"italian": {
msw7007 marked this conversation as resolved.
Show resolved Hide resolved
"ассистент": "головорез",
"ассистентская": "притон головорезов",
"ассистентской": "притоне головорезов",
"ребенок": [
"ребячино",
"маленькая сосисочка"
],
"плохой": "молто мале",
"плохо": "молто мале",
"пока": [
"чао",
"арривидерчи"
],
"прощай": [
"чао",
"арривидерчи"
],
"капитан": "капитано",
"сыр": [
"пармезан",
"горгондзол"
],
"повар": "кучинаре",
"папа": "паппа",
"отец": "паппа",
"враги": "немичи",
"враг": "немиго",
"друзья": "амичи",
"друг": "амиго",
"хорошо": "молто бене",
"хороший": "молто бене",
"хай": [
"чао",
"бонжорно"
],
"привет": [
"чао",
"бонжорно"
],
"здравствуйте": [
"чао",
"бонжорно"
],
"здравствуй": [
"чао",
"бонжорно"
],
"сделай": "сделай да",
"мясо": [
"пепперони",
"ветчина да"
],
"мама": "мамма",
"оперативник": "грек",
"оперативники": "греки",
"сбшники": "полицаи",
"сбшник": "полицай",
"сб": "полиция",
"спагетти": "СПАГЕТТ",
"острый": "да острый",
"остро": "да остро",
"спасибо": "грасиас",
"предатель": "мафиози",
"трейтор": "мафиози",
"тритор": "мафиози",
"кто же": "кто же",
"кто": "кто же",
"чей же": "чей же",
"чей": "чей же",
"italian": {
"ассистент": "головорез",
"ассистентская": "притон головорезов",
"ассистентской": "притоне головорезов",
"ребенок": [
"ребячино",
"маленькая сосисочка"
],
"плохой": "молто мале",
"плохо": "молто мале",
"пока": [
"чао",
"арривидерчи"
],
"прощай": [
"чао",
"арривидерчи"
],
"капитан": "капитано",
"сыр": [
"пармезан",
"горгондзол"
],
"повар": "кучинаре",
"папа": "паппа",
"отец": "паппа",
"враги": "немичи",
"враг": "немиго",
"друзья": "амичи",
"друг": "амиго",
"хорошо": "молто бене",
"хороший": "молто бене",
"хай": [
"чао",
"бонжорно"
],
"привет": [
"чао",
"бонжорно"
],
"здравствуйте": [
"чао",
"бонжорно"
],
"здравствуй": [
"чао",
"бонжорно"
],
"сделай": "сделай да",
"мясо": [
"пепперони",
"ветчина да"
],
"мама": "мамма",
"оперативник": "грек",
"оперативники": "греки",
"сбшники": "полицаи",
"сбшник": "полицай",
"сб": "полиция",
"спагетти": "СПАГЕТТ",
"острый": "да острый",
"остро": "да остро",
"спасибо": "грасиас",
"предатель": "мафиози",
"трейтор": "мафиози",
"тритор": "мафиози",
"кто же": "кто же",
"кто": "кто же",
"чей же": "чей же",
"чей": "чей же",
"почему так": "почему же так",
"почему": "почему же так"
}

"почему": "почему же так"
}

}
Loading