forked from tgstation/tgstation
-
Notifications
You must be signed in to change notification settings - Fork 35
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
Маски, акссесуары, ботинки и перчатки из лодаута пары #453
Open
msw7007
wants to merge
34
commits into
ss220club:master
Choose a base branch
from
msw7007:accessories
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
34 commits
Select commit
Hold shift + click to select a range
4cd326f
Базовая отгрузка, на очереди исправление
msw7007 93f2307
Правки HEV
msw7007 0c4a30a
Починил гребанные худы
msw7007 f8f3d45
Merge branch 'ss220club:master' into suits_instrumets
msw7007 8a2e3be
Правка и внедрение лодаута
msw7007 cef56ff
Правки и внедрения в лодауты
msw7007 3644df7
Правка рук (жаль не моих)
msw7007 d99b5e9
Merge branch 'ss220club:master' into suits_instrumets
msw7007 5deb95e
Фиксы по рантайму
msw7007 dab3357
Чистка по рантайму 2
msw7007 aee4be2
Правка тестов missing_icon и worn_icon
msw7007 46c535f
Попытка разобраться с create_and_destroy, правка ударной установки
msw7007 4aebb9c
Правка чистки ударных
msw7007 63f36a4
Попытка преодолеть ошибки проверок №1
msw7007 1e75629
Приведение кода к единому виду
msw7007 876031c
Попытка преодолеть ошибки проверок №2
msw7007 b532244
Новая чистка кода
msw7007 57d93e4
Переопределение наследования ударной
msw7007 16c776b
Попытки обойти рантайм 3
msw7007 c510be8
Слишком накрутил инициализацию
msw7007 35873e6
Merge branch 'master' into suits_instrumets
msw7007 efc0c57
Попытки пройти проблемы райнтайма
msw7007 b37702a
Merge branch 'master' into suits_instrumets
msw7007 aa12707
Попытка одолеть рантайм 4
msw7007 48f5479
Merge branch 'suits_instrumets' of https://github.com/msw7007/Bandast…
msw7007 301fa60
Расширение лодаута
msw7007 6c5be29
Merge branch 'master' into suits_instrumets
msw7007 57b5349
Правка того, правка сего
msw7007 46b4ecb
Вырезка лишнего для разнесения по другим ПР
msw7007 295e4b7
Аксессуары, маски, перчатки и ботинки
msw7007 6b5f5b5
Чистка от кода других модулей
msw7007 81b5145
Отработка по ревью ч1
msw7007 55e877a
Merge branch 'master' into accessories
msw7007 55916bb
Обновление JSON из гита мастера
msw7007 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
/datum/modpack/clothing | ||
name = "Одежда" | ||
desc = "Всё для модного приговора." | ||
author = "Aylong220, Yata9arasu" |
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,5 @@ | ||
#include "_clothing.dm" | ||
#include "code/accessories.dm" | ||
#include "code/gloves.dm" | ||
#include "code/mask.dm" | ||
#include "code/shoes.dm" |
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,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" |
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,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" |
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,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" |
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,64 @@ | ||
/datum/action/item_action/change_color | ||
name = "Change color" | ||
|
||
/obj/item/clothing/shoes/black/neon | ||
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 not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
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
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Неоновые кроссовки я посмотрю позже. Тут реализация переключения света может быть неактуальной для ТГ.