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

Loadout from paradise to tg #877

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 4 commits
Commits
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
2 changes: 1 addition & 1 deletion modular_bandastation/loadout/_loadout.dm
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"
5 changes: 5 additions & 0 deletions modular_bandastation/loadout/_loadout.dme
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,8 @@
#include "code/loadout_preference.dm"
#include "code/categories/accessories.dm"
#include "code/categories/pocket.dm"
#include "code/categories/suits.dm"
#include "code/categories/gloves.dm"
#include "code/items/gloves.dm"
#include "code/items/suits.dm"
#include "code/items/masks.dm"
18 changes: 18 additions & 0 deletions modular_bandastation/loadout/code/categories/gloves.dm
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
33 changes: 33 additions & 0 deletions modular_bandastation/loadout/code/categories/masks.dm
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/glasses/insert_path_into_outfit(datum/outfit/outfit, mob/living/carbon/human/equipper, visuals_only = FALSE)
Pavlovvn marked this conversation as resolved.
Show resolved Hide resolved
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
45 changes: 45 additions & 0 deletions modular_bandastation/loadout/code/categories/suits.dm
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/glasses/insert_path_into_outfit(datum/outfit/outfit, mob/living/carbon/human/equipper, visuals_only = FALSE)
Pavlovvn marked this conversation as resolved.
Show resolved Hide resolved
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
6 changes: 6 additions & 0 deletions modular_bandastation/loadout/code/items/gloves.dm
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"
13 changes: 13 additions & 0 deletions modular_bandastation/loadout/code/items/masks.dm
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"
13 changes: 13 additions & 0 deletions modular_bandastation/loadout/code/items/suits.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
/obj/item/clothing/suit/apron

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 на тг

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 added modular_bandastation/loadout/icons/mob/gloves.dmi
Binary file not shown.
Binary file added modular_bandastation/loadout/icons/mob/masks.dmi
Binary file not shown.
Binary file added modular_bandastation/loadout/icons/mob/suits.dmi
Binary file not shown.
Binary file added modular_bandastation/loadout/icons/object/gloves.dmi
Binary file not shown.
Binary file added modular_bandastation/loadout/icons/object/masks.dmi
Binary file not shown.
Binary file added modular_bandastation/loadout/icons/object/suits.dmi
Binary file not shown.
Loading