forked from tgstation/tgstation
-
Notifications
You must be signed in to change notification settings - Fork 44
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
Loadout from paradise to tg #877
Open
Pavlovvn
wants to merge
6
commits into
ss220club:master
Choose a base branch
from
Pavlovvn:loadout-to-tg
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.
+134
−1
Open
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
9d727b0
Тестовое добавление всякой хуйни с пары на тг.
Pavlovvn 83c49de
Merge branch 'master' into loadout-to-tg
Pavlovvn 64ba49b
Переименование вещей на английский язык.
Pavlovvn ec55c94
Merge branch 'loadout-to-tg' of https://github.com/Pavlovvn/Bandastat…
Pavlovvn 595c23d
Забыл поменять лоадаут итем/название класса
Pavlovvn 328b47c
Забыл поменять названия
Pavlovvn 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 |
---|---|---|
@@ -1,4 +1,4 @@ | ||
/datum/modpack/loadout | ||
name = "Loadout" | ||
desc = "ДобавлÑет новые вещи в loadout и изменÑет уже ÑущеÑтвующие." | ||
author = "larentoun, Chorden" | ||
author = "larentoun, Chorden, pavlovvn" |
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
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,18 @@ | ||
/datum/loadout_category/gloves | ||
category_name = "Ðóêè" | ||
category_ui_icon = FA_ICON_HANDS | ||
type_to_generate = /datum/loadout_item/gloves | ||
tab_order = /datum/loadout_category/head::tab_order + 1 | ||
|
||
/datum/loadout_item/gloves | ||
abstract_type = /datum/loadout_item/gloves | ||
|
||
/datum/loadout_item/glasses/insert_path_into_outfit(datum/outfit/outfit, mob/living/carbon/human/equipper, visuals_only = FALSE) | ||
if(outfit.gloves) | ||
LAZYADD(outfit.backpack_contents, outfit.gloves) | ||
outfit.gloves = item_path | ||
|
||
/datum/loadout_item/gloves/fingerless | ||
name = "Biker's gloves" | ||
item_path = /obj/item/clothing/gloves/fingerless/biker_gloves | ||
donator_level = 1 |
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,33 @@ | ||
/datum/loadout_category/masks | ||
category_name = "Ëèöî" | ||
category_ui_icon = FA_ICON_MASK | ||
type_to_generate = /datum/loadout_item/masks | ||
tab_order = /datum/loadout_category/head::tab_order + 1 | ||
|
||
/datum/loadout_item/masks | ||
abstract_type = /datum/loadout_item/masks | ||
|
||
/datum/loadout_item/masks/insert_path_into_outfit(datum/outfit/outfit, mob/living/carbon/human/equipper, visuals_only = FALSE) | ||
if(outfit.mask) | ||
LAZYADD(outfit.backpack_contents, outfit.mask) | ||
outfit.mask = item_path | ||
|
||
/datum/loadout_item/masks/pig | ||
name = "Pig mask" | ||
item_path = /obj/item/clothing/mask/animal/pig | ||
|
||
/datum/loadout_item/masks/horsehead | ||
name = "Horse mask" | ||
item_path = /obj/item/clothing/mask/animal/horsehead | ||
|
||
/datum/loadout_item/masks/raven | ||
name = "Raven's mask" | ||
item_path = /obj/item/clothing/mask/animal/small/raven | ||
|
||
/datum/loadout_item/masks/breathscarf | ||
name = "Breathing scarf" | ||
item_path = /obj/item/clothing/mask/breath/breathscarf | ||
|
||
/datum/loadout_item/masks/red_gas | ||
name = "RED-1" | ||
item_path = /obj/item/clothing/mask/breath/red_gas |
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,45 @@ | ||
/datum/loadout_category/suits | ||
category_name = "ÂåðõÃÿÿ îäåæäà " | ||
category_ui_icon = FA_ICON_VEST | ||
type_to_generate = /datum/loadout_item/suits | ||
tab_order = /datum/loadout_category/head::tab_order + 1 | ||
|
||
/datum/loadout_item/suits | ||
abstract_type = /datum/loadout_item/suits | ||
|
||
/datum/loadout_item/suits/insert_path_into_outfit(datum/outfit/outfit, mob/living/carbon/human/equipper, visuals_only = FALSE) | ||
if(outfit.suit) | ||
LAZYADD(outfit.backpack_contents, outfit.suit) | ||
outfit.suit = item_path | ||
|
||
/datum/loadout_item/suits/wintercoat | ||
name = "Winter coat" | ||
item_path = /obj/item/clothing/suit/hooded/wintercoat | ||
|
||
/datum/loadout_item/suits/apron | ||
name = "Apron" | ||
item_path = /obj/item/clothing/suit/apron | ||
|
||
/datum/loadout_item/suits/apron/red | ||
name = "Red apron" | ||
item_path = /obj/item/clothing/suit/apron/chef/red | ||
|
||
/datum/loadout_item/suits/jacket/miljacket | ||
name = "Military jacket" | ||
item_path = /obj/item/clothing/suit/jacket/miljacket | ||
|
||
/datum/loadout_item/suits/jacket/det_jacket/disco | ||
name = "Disco jacket" | ||
item_path = /obj/item/clothing/suit/jacket/det_suit/disco | ||
|
||
/datum/loadout_item/suits/jacket/biker | ||
name = "Biker's jacket" | ||
item_path = /obj/item/clothing/suit/jacket/leather/biker | ||
|
||
/datum/loadout_item/suits/jacket/puffer | ||
name = "Puffer" | ||
item_path = /obj/item/clothing/suit/jacket/puffer | ||
|
||
/datum/loadout_item/suits/jacket/letterman_nt | ||
name = "Nt's letterman jacket" | ||
item_path = /obj/item/clothing/suit/jacket/letterman_nanotrasen |
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/loadout/icons/object/gloves.dmi' | ||
worn_icon = 'modular_bandastation/loadout/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/loadout/icons/object/masks.dmi' | ||
worn_icon = 'modular_bandastation/loadout/icons/mob/masks.dmi' | ||
icon_state = "red_gas" | ||
|
||
/obj/item/clothing/mask/breath/breathscarf | ||
name = "øàðô ñ ñèñòåìîé äûõàíèÿ" | ||
desc = "Ñòèëüíûé è èííîâàöèîííûé øàðô, êîòîðûé ñëóæèò äûõàòåëüíîé ìàñêîé â ýêñòðåìàëüíûõ ñèòóàöèÿõ." | ||
icon = 'modular_bandastation/loadout/icons/object/masks.dmi' | ||
worn_icon = 'modular_bandastation/loadout/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,13 @@ | ||
/obj/item/clothing/suit/apron | ||
name = "ôàðòóê" | ||
icon = 'modular_bandastation/loadout/icons/object/suits.dmi' | ||
worn_icon = 'modular_bandastation/loadout/icons/mob/suits.dmi' | ||
icon_state = "apron" | ||
worn_icon_state = "apron" | ||
|
||
/obj/item/clothing/suit/apron/chef/red | ||
name = "êðàñíûé ôàðòóê" | ||
icon = 'modular_bandastation/loadout/icons/object/suits.dmi' | ||
worn_icon = 'modular_bandastation/loadout/icons/mob/suits.dmi' | ||
icon_state = "apron_red" | ||
worn_icon_state = "apron_red" |
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.
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.
уже существует
/obj/item/clothing/suit/apron
и/obj/item/clothing/suit/apron/overalls
на тг