diff --git a/modular_bandastation/aesthetics/_aesthetics.dme b/modular_bandastation/aesthetics/_aesthetics.dme index dee17517e8160..6caebae2f0218 100644 --- a/modular_bandastation/aesthetics/_aesthetics.dme +++ b/modular_bandastation/aesthetics/_aesthetics.dme @@ -11,12 +11,24 @@ // APC #include "apc/code/apc.dm" +// Bedsheet +#include "bedsheet/code/bedsheet.dm" + // Blastdoor #include "blastdoor/code/blastdoor.dm" // Camera #include "cameras/code/cameras.dm" +// Clothing +#include "clothing/centcom/code/head/hat.dm" +#include "clothing/centcom/code/head/winterhood.dm" +#include "clothing/centcom/code/mask/mask.dm" +#include "clothing/centcom/code/suits/armor.dm" +#include "clothing/centcom/code/suits/jacket.dm" +#include "clothing/centcom/code/suits/wintercoats.dm" +#include "clothing/centcom/code/under/centcom.dm" + // Decals #include "decals/code/floor_decals.dm" @@ -53,6 +65,9 @@ // Supply Pods #include "supply_pods/code/supply_pods.dm" +// Vending +#include "vending/code/vending.dm" + // Walls #include "walls/code/walls.dm" @@ -62,3 +77,4 @@ // WinDoors #include "windoors/code/windoors.dm" + diff --git a/modular_bandastation/aesthetics/bedsheet/code/bedsheet.dm b/modular_bandastation/aesthetics/bedsheet/code/bedsheet.dm new file mode 100644 index 0000000000000..b817dd0457fdf --- /dev/null +++ b/modular_bandastation/aesthetics/bedsheet/code/bedsheet.dm @@ -0,0 +1,11 @@ +/obj/item/bedsheet/centcom + icon = 'modular_bandastation/aesthetics/bedsheet/icons/obj/bedsheet.dmi' + worn_icon = 'modular_bandastation/aesthetics/bedsheet/icons/mob/bedsheet.dmi' + lefthand_file = 'modular_bandastation/aesthetics/bedsheet/icons/inhands/bedsheet_lefthand.dmi' + righthand_file = 'modular_bandastation/aesthetics/bedsheet/icons/inhands/bedsheet_righthand.dmi' + +/obj/item/bedsheet/rev + icon = 'modular_bandastation/aesthetics/bedsheet/icons/obj/bedsheet.dmi' + worn_icon = 'modular_bandastation/aesthetics/bedsheet/icons/mob/bedsheet.dmi' + lefthand_file = 'modular_bandastation/aesthetics/bedsheet/icons/inhands/bedsheet_lefthand.dmi' + righthand_file = 'modular_bandastation/aesthetics/bedsheet/icons/inhands/bedsheet_righthand.dmi' diff --git a/modular_bandastation/aesthetics/bedsheet/icons/inhands/bedsheet_lefthand.dmi b/modular_bandastation/aesthetics/bedsheet/icons/inhands/bedsheet_lefthand.dmi new file mode 100644 index 0000000000000..d2ccc1f2cff27 Binary files /dev/null and b/modular_bandastation/aesthetics/bedsheet/icons/inhands/bedsheet_lefthand.dmi differ diff --git a/modular_bandastation/aesthetics/bedsheet/icons/inhands/bedsheet_righthand.dmi b/modular_bandastation/aesthetics/bedsheet/icons/inhands/bedsheet_righthand.dmi new file mode 100644 index 0000000000000..4ccf7170c5178 Binary files /dev/null and b/modular_bandastation/aesthetics/bedsheet/icons/inhands/bedsheet_righthand.dmi differ diff --git a/modular_bandastation/aesthetics/bedsheet/icons/mob/bedsheet.dmi b/modular_bandastation/aesthetics/bedsheet/icons/mob/bedsheet.dmi new file mode 100644 index 0000000000000..9f2b275aaea96 Binary files /dev/null and b/modular_bandastation/aesthetics/bedsheet/icons/mob/bedsheet.dmi differ diff --git a/modular_bandastation/aesthetics/bedsheet/icons/obj/bedsheet.dmi b/modular_bandastation/aesthetics/bedsheet/icons/obj/bedsheet.dmi new file mode 100644 index 0000000000000..923b7de43cb7a Binary files /dev/null and b/modular_bandastation/aesthetics/bedsheet/icons/obj/bedsheet.dmi differ diff --git a/modular_bandastation/aesthetics/clothing/centcom/code/head/hat.dm b/modular_bandastation/aesthetics/clothing/centcom/code/head/hat.dm new file mode 100644 index 0000000000000..3eb9969d0af7c --- /dev/null +++ b/modular_bandastation/aesthetics/clothing/centcom/code/head/hat.dm @@ -0,0 +1,26 @@ +/obj/item/clothing/head/hats/centcom_cap + name = "fleet officer's cap" + desc = "Носится высшими чинами офицерского состава Нанотрейзен. На подкладке едва различимы чьи-то инициалы." + icon = 'modular_bandastation/aesthetics/clothing/centcom/icons/obj/clothing/head/hats.dmi' + worn_icon = 'modular_bandastation/aesthetics/clothing/centcom/icons/mob/clothing/head/hats.dmi' + resistance_flags = INDESTRUCTIBLE | FIRE_PROOF | FREEZE_PROOF | UNACIDABLE | ACID_PROOF + +/obj/item/clothing/head/hats/centhat + name = "fleet officer's hat" + desc = "Управлять судьбами так захватывающе." + icon = 'modular_bandastation/aesthetics/clothing/centcom/icons/obj/clothing/head/hats.dmi' + worn_icon = 'modular_bandastation/aesthetics/clothing/centcom/icons/mob/clothing/head/hats.dmi' + +/obj/item/clothing/head/helmet/space/beret + name = "fleet officer's beret" + desc = "Стандартный берет офицера флота Нанотрейзен. Лёгкий и надежный." + greyscale_colors = "#323253#FFCE5B" + resistance_flags = INDESTRUCTIBLE | FIRE_PROOF | FREEZE_PROOF | UNACIDABLE | ACID_PROOF + flags_cover = HEADCOVERSEYES | PEPPERPROOF + +/obj/item/clothing/head/hats/intern + name = "fleet junior-officer's cap" + desc = "Богомерзкое порождение коитуса кепки и вязанной шапки. Как правило, все носители данного недоразумения или \ + получают наивысшие должности в Компании из-за своей беспринципности, или умирают жесточайшим образом в первую неделю службы." + icon = 'modular_bandastation/aesthetics/clothing/centcom/icons/obj/clothing/head/hats.dmi' + worn_icon = 'modular_bandastation/aesthetics/clothing/centcom/icons/mob/clothing/head/hats.dmi' diff --git a/modular_bandastation/aesthetics/clothing/centcom/code/head/winterhood.dm b/modular_bandastation/aesthetics/clothing/centcom/code/head/winterhood.dm new file mode 100644 index 0000000000000..21e7a8b4542dc --- /dev/null +++ b/modular_bandastation/aesthetics/clothing/centcom/code/head/winterhood.dm @@ -0,0 +1,5 @@ +/obj/item/clothing/head/hooded/winterhood/centcom + name = "winter hood" + desc = "Уютный и теплый капюшон, прикрепленный к зимней куртке." + icon = 'modular_bandastation/aesthetics/clothing/centcom/icons/obj/clothing/head/winterhood.dmi' + worn_icon = 'modular_bandastation/aesthetics/clothing/centcom/icons/mob/clothing/head/winterhood.dmi' diff --git a/modular_bandastation/aesthetics/clothing/centcom/code/mask/mask.dm b/modular_bandastation/aesthetics/clothing/centcom/code/mask/mask.dm new file mode 100644 index 0000000000000..c91019f49b3d6 --- /dev/null +++ b/modular_bandastation/aesthetics/clothing/centcom/code/mask/mask.dm @@ -0,0 +1,7 @@ +/obj/item/clothing/mask/gas/atmos/centcom + name = "fleet officer's gas mask" + desc = "Более незаменимой вещи для офисной крысы и быть не может." + icon = 'modular_bandastation/aesthetics/clothing/centcom/icons/obj/clothing/mask/mask.dmi' + worn_icon = 'modular_bandastation/aesthetics/clothing/centcom/icons/mob/clothing/mask/mask.dmi' + lefthand_file = 'modular_bandastation/aesthetics/clothing/centcom/icons/inhands/clothing/mask_lefthand.dmi' + righthand_file = 'modular_bandastation/aesthetics/clothing/centcom/icons/inhands/clothing/mask_righthand.dmi' diff --git a/modular_bandastation/aesthetics/clothing/centcom/code/suits/armor.dm b/modular_bandastation/aesthetics/clothing/centcom/code/suits/armor.dm new file mode 100644 index 0000000000000..9234415ddda6d --- /dev/null +++ b/modular_bandastation/aesthetics/clothing/centcom/code/suits/armor.dm @@ -0,0 +1,8 @@ +/obj/item/clothing/suit/armor/centcom_formal + name = "fleet officer's coat" + desc = "Стильный китель из гардероба Высшего Командования. Подойдет для торжественной отправки очередного отряда ОБР на смерть." + icon = 'modular_bandastation/aesthetics/clothing/centcom/icons/obj/clothing/suits/armor.dmi' + worn_icon = 'modular_bandastation/aesthetics/clothing/centcom/icons/mob/clothing/suits/armor.dmi' + lefthand_file = 'modular_bandastation/aesthetics/clothing/centcom/icons/inhands/clothing/suits_lefthand.dmi' + righthand_file = 'modular_bandastation/aesthetics/clothing/centcom/icons/inhands/clothing/suits_righthand.dmi' + resistance_flags = INDESTRUCTIBLE | FIRE_PROOF | FREEZE_PROOF | UNACIDABLE | ACID_PROOF diff --git a/modular_bandastation/aesthetics/clothing/centcom/code/suits/jacket.dm b/modular_bandastation/aesthetics/clothing/centcom/code/suits/jacket.dm new file mode 100644 index 0000000000000..cf4813c46c30e --- /dev/null +++ b/modular_bandastation/aesthetics/clothing/centcom/code/suits/jacket.dm @@ -0,0 +1,9 @@ +/obj/item/clothing/suit/space/officer + name = "special ops officer's coat" + desc = "Бронированное и защищающее от воздействий открытого космоса офицерское пальто нового образца, \ + разработанное Департаментом Специальных Операций для своих прямых подопечных на местах." + icon = 'modular_bandastation/aesthetics/clothing/centcom/icons/obj/clothing/suits/jacket.dmi' + worn_icon = 'modular_bandastation/aesthetics/clothing/centcom/icons/mob/clothing/suits/jacket.dmi' + lefthand_file = 'modular_bandastation/aesthetics/clothing/centcom/icons/inhands/clothing/suits_lefthand.dmi' + righthand_file = 'modular_bandastation/aesthetics/clothing/centcom/icons/inhands/clothing/suits_righthand.dmi' + resistance_flags = INDESTRUCTIBLE | FIRE_PROOF | FREEZE_PROOF | UNACIDABLE | ACID_PROOF diff --git a/modular_bandastation/aesthetics/clothing/centcom/code/suits/wintercoats.dm b/modular_bandastation/aesthetics/clothing/centcom/code/suits/wintercoats.dm new file mode 100644 index 0000000000000..580f454d85757 --- /dev/null +++ b/modular_bandastation/aesthetics/clothing/centcom/code/suits/wintercoats.dm @@ -0,0 +1,9 @@ +/obj/item/clothing/suit/hooded/wintercoat/centcom + name = "fleet officer's winter coat" + desc = "Люксовая куртка с позолотой, сшитая в классических цветах компании. Застежка-молния выполнена в виде логотипа компании." + icon = 'modular_bandastation/aesthetics/clothing/centcom/icons/obj/clothing/suits/wintercoat.dmi' + worn_icon = 'modular_bandastation/aesthetics/clothing/centcom/icons/mob/clothing/suits/wintercoat.dmi' + lefthand_file = 'modular_bandastation/aesthetics/clothing/centcom/icons/inhands/clothing/suits_lefthand.dmi' + righthand_file = 'modular_bandastation/aesthetics/clothing/centcom/icons/inhands/clothing/suits_righthand.dmi' + inhand_icon_state = "coatcentcom" + resistance_flags = INDESTRUCTIBLE | FIRE_PROOF | FREEZE_PROOF | UNACIDABLE | ACID_PROOF diff --git a/modular_bandastation/aesthetics/clothing/centcom/code/under/centcom.dm b/modular_bandastation/aesthetics/clothing/centcom/code/under/centcom.dm new file mode 100644 index 0000000000000..089a28612cc44 --- /dev/null +++ b/modular_bandastation/aesthetics/clothing/centcom/code/under/centcom.dm @@ -0,0 +1,47 @@ +/obj/item/clothing/under/rank/centcom + icon = 'modular_bandastation/aesthetics/clothing/centcom/icons/obj/clothing/under/centcom.dmi' + worn_icon = 'modular_bandastation/aesthetics/clothing/centcom/icons/mob/clothing/under/centcom.dmi' + lefthand_file = 'modular_bandastation/aesthetics/clothing/centcom/icons/inhands/clothing/under_lefthand.dmi' + righthand_file = 'modular_bandastation/aesthetics/clothing/centcom/icons/inhands/clothing/under_righthand.dmi' + resistance_flags = INDESTRUCTIBLE | FIRE_PROOF | FREEZE_PROOF | UNACIDABLE | ACID_PROOF + +/obj/item/clothing/under/rank/centcom/commander + name = "fleet high-officer's suit" + desc = "Стандартная флотская униформа с отличительными знаками флагманского офицерского состава флота Нанотрейзен." + +/obj/item/clothing/under/rank/centcom/official + name = "fleet officer's formal suit" + desc = "Вариант офицерской униформы предназаченный для повседневного ношения." + +/obj/item/clothing/under/rank/centcom/intern + name = "fleet junior-officer's suit" + desc = "Стандартная флотская униформа с отличительными знаками младшего офицерского состава флота Нанотрейзен." + +/obj/item/clothing/under/rank/centcom/officer + name = "fleet officer's suit" + desc = "Стандартный флотская униформа с отличительными знаками старшего офицера флота Нанотрейзен." + +/obj/item/clothing/under/rank/centcom/officer/replica + name = "fleet officer's suit replica" + desc = "Дешовая подделка униформы офицера Центрального Командования. На воротнике виднеется логотип Donk Co." + +/obj/item/clothing/under/rank/centcom/officer_skirt + name = "fleet officer's skirt" + desc = "Вариант флотской униформы старшего офицера в виде юбки. Редкая и востребованная." + +/obj/item/clothing/under/rank/centcom/officer_skirt/replica + name = "fleet officer's skirt replica" + desc = "Дешовая подделка юбки офицера Центрального Командования. На воротнике виднеется логотип Donk Co." + +/obj/item/clothing/under/rank/centcom/centcom_skirt + name = "fleet high-officer's skirt" + desc = "Вариант флотской униформы флагманского офицера в виде юбки. Редкая и востребованная." + +/obj/item/clothing/under/rank/centcom/military + name = "SRT commander's suitskirt" + desc = "Униформа, выполненная в темных цветах с опозновательными знаками подразделений СРТ." + +/obj/item/clothing/under/rank/centcom/military/eng + name = "SRT tactical engineering uniform" + desc = "Униформа, выполненная в темных цветах с опозновательными знаками инженерных подразделений СРТ." + inhand_icon_state = "bl_suit" diff --git a/modular_bandastation/aesthetics/clothing/centcom/icons/inhands/clothing/gloves_lefthand.dmi b/modular_bandastation/aesthetics/clothing/centcom/icons/inhands/clothing/gloves_lefthand.dmi new file mode 100644 index 0000000000000..82966155e33e1 Binary files /dev/null and b/modular_bandastation/aesthetics/clothing/centcom/icons/inhands/clothing/gloves_lefthand.dmi differ diff --git a/modular_bandastation/aesthetics/clothing/centcom/icons/inhands/clothing/gloves_righthand.dmi b/modular_bandastation/aesthetics/clothing/centcom/icons/inhands/clothing/gloves_righthand.dmi new file mode 100644 index 0000000000000..6790675169d66 Binary files /dev/null and b/modular_bandastation/aesthetics/clothing/centcom/icons/inhands/clothing/gloves_righthand.dmi differ diff --git a/modular_bandastation/aesthetics/clothing/centcom/icons/inhands/clothing/mask_lefthand.dmi b/modular_bandastation/aesthetics/clothing/centcom/icons/inhands/clothing/mask_lefthand.dmi new file mode 100644 index 0000000000000..e3bc9e9845f06 Binary files /dev/null and b/modular_bandastation/aesthetics/clothing/centcom/icons/inhands/clothing/mask_lefthand.dmi differ diff --git a/modular_bandastation/aesthetics/clothing/centcom/icons/inhands/clothing/mask_righthand.dmi b/modular_bandastation/aesthetics/clothing/centcom/icons/inhands/clothing/mask_righthand.dmi new file mode 100644 index 0000000000000..45587943e238e Binary files /dev/null and b/modular_bandastation/aesthetics/clothing/centcom/icons/inhands/clothing/mask_righthand.dmi differ diff --git a/modular_bandastation/aesthetics/clothing/centcom/icons/inhands/clothing/suits_lefthand.dmi b/modular_bandastation/aesthetics/clothing/centcom/icons/inhands/clothing/suits_lefthand.dmi new file mode 100644 index 0000000000000..6cbf61160dabb Binary files /dev/null and b/modular_bandastation/aesthetics/clothing/centcom/icons/inhands/clothing/suits_lefthand.dmi differ diff --git a/modular_bandastation/aesthetics/clothing/centcom/icons/inhands/clothing/suits_righthand.dmi b/modular_bandastation/aesthetics/clothing/centcom/icons/inhands/clothing/suits_righthand.dmi new file mode 100644 index 0000000000000..7871ea76888ea Binary files /dev/null and b/modular_bandastation/aesthetics/clothing/centcom/icons/inhands/clothing/suits_righthand.dmi differ diff --git a/modular_bandastation/aesthetics/clothing/centcom/icons/inhands/clothing/under_lefthand.dmi b/modular_bandastation/aesthetics/clothing/centcom/icons/inhands/clothing/under_lefthand.dmi new file mode 100644 index 0000000000000..df1a5eed3299f Binary files /dev/null and b/modular_bandastation/aesthetics/clothing/centcom/icons/inhands/clothing/under_lefthand.dmi differ diff --git a/modular_bandastation/aesthetics/clothing/centcom/icons/inhands/clothing/under_righthand.dmi b/modular_bandastation/aesthetics/clothing/centcom/icons/inhands/clothing/under_righthand.dmi new file mode 100644 index 0000000000000..594e662c39fe9 Binary files /dev/null and b/modular_bandastation/aesthetics/clothing/centcom/icons/inhands/clothing/under_righthand.dmi differ diff --git a/modular_bandastation/aesthetics/clothing/centcom/icons/mob/clothing/cloaks/cloaks.dmi b/modular_bandastation/aesthetics/clothing/centcom/icons/mob/clothing/cloaks/cloaks.dmi new file mode 100644 index 0000000000000..9c3d552c2a7fb Binary files /dev/null and b/modular_bandastation/aesthetics/clothing/centcom/icons/mob/clothing/cloaks/cloaks.dmi differ diff --git a/modular_bandastation/aesthetics/clothing/centcom/icons/mob/clothing/gloves/gloves.dmi b/modular_bandastation/aesthetics/clothing/centcom/icons/mob/clothing/gloves/gloves.dmi new file mode 100644 index 0000000000000..6f67ae3de77e0 Binary files /dev/null and b/modular_bandastation/aesthetics/clothing/centcom/icons/mob/clothing/gloves/gloves.dmi differ diff --git a/modular_bandastation/aesthetics/clothing/centcom/icons/mob/clothing/head/hats.dmi b/modular_bandastation/aesthetics/clothing/centcom/icons/mob/clothing/head/hats.dmi new file mode 100644 index 0000000000000..d8ead8d4e9163 Binary files /dev/null and b/modular_bandastation/aesthetics/clothing/centcom/icons/mob/clothing/head/hats.dmi differ diff --git a/modular_bandastation/aesthetics/clothing/centcom/icons/mob/clothing/head/winterhood.dmi b/modular_bandastation/aesthetics/clothing/centcom/icons/mob/clothing/head/winterhood.dmi new file mode 100644 index 0000000000000..a26fd1fdc8d4c Binary files /dev/null and b/modular_bandastation/aesthetics/clothing/centcom/icons/mob/clothing/head/winterhood.dmi differ diff --git a/modular_bandastation/aesthetics/clothing/centcom/icons/mob/clothing/mask/mask.dmi b/modular_bandastation/aesthetics/clothing/centcom/icons/mob/clothing/mask/mask.dmi new file mode 100644 index 0000000000000..a50834d5d6363 Binary files /dev/null and b/modular_bandastation/aesthetics/clothing/centcom/icons/mob/clothing/mask/mask.dmi differ diff --git a/modular_bandastation/aesthetics/clothing/centcom/icons/mob/clothing/suits/armor.dmi b/modular_bandastation/aesthetics/clothing/centcom/icons/mob/clothing/suits/armor.dmi new file mode 100644 index 0000000000000..64d65fbafceba Binary files /dev/null and b/modular_bandastation/aesthetics/clothing/centcom/icons/mob/clothing/suits/armor.dmi differ diff --git a/modular_bandastation/aesthetics/clothing/centcom/icons/mob/clothing/suits/jacket.dmi b/modular_bandastation/aesthetics/clothing/centcom/icons/mob/clothing/suits/jacket.dmi new file mode 100644 index 0000000000000..f3429c0319584 Binary files /dev/null and b/modular_bandastation/aesthetics/clothing/centcom/icons/mob/clothing/suits/jacket.dmi differ diff --git a/modular_bandastation/aesthetics/clothing/centcom/icons/mob/clothing/suits/wintercoat.dmi b/modular_bandastation/aesthetics/clothing/centcom/icons/mob/clothing/suits/wintercoat.dmi new file mode 100644 index 0000000000000..725b300395f4b Binary files /dev/null and b/modular_bandastation/aesthetics/clothing/centcom/icons/mob/clothing/suits/wintercoat.dmi differ diff --git a/modular_bandastation/aesthetics/clothing/centcom/icons/mob/clothing/under/centcom.dmi b/modular_bandastation/aesthetics/clothing/centcom/icons/mob/clothing/under/centcom.dmi new file mode 100644 index 0000000000000..8c4172fbed1c7 Binary files /dev/null and b/modular_bandastation/aesthetics/clothing/centcom/icons/mob/clothing/under/centcom.dmi differ diff --git a/modular_bandastation/aesthetics/clothing/centcom/icons/obj/clothing/cloaks/cloaks.dmi b/modular_bandastation/aesthetics/clothing/centcom/icons/obj/clothing/cloaks/cloaks.dmi new file mode 100644 index 0000000000000..f11a4959e4c58 Binary files /dev/null and b/modular_bandastation/aesthetics/clothing/centcom/icons/obj/clothing/cloaks/cloaks.dmi differ diff --git a/modular_bandastation/aesthetics/clothing/centcom/icons/obj/clothing/gloves/gloves.dmi b/modular_bandastation/aesthetics/clothing/centcom/icons/obj/clothing/gloves/gloves.dmi new file mode 100644 index 0000000000000..241a9adef49c6 Binary files /dev/null and b/modular_bandastation/aesthetics/clothing/centcom/icons/obj/clothing/gloves/gloves.dmi differ diff --git a/modular_bandastation/aesthetics/clothing/centcom/icons/obj/clothing/head/hats.dmi b/modular_bandastation/aesthetics/clothing/centcom/icons/obj/clothing/head/hats.dmi new file mode 100644 index 0000000000000..453bab84211d1 Binary files /dev/null and b/modular_bandastation/aesthetics/clothing/centcom/icons/obj/clothing/head/hats.dmi differ diff --git a/modular_bandastation/aesthetics/clothing/centcom/icons/obj/clothing/head/winterhood.dmi b/modular_bandastation/aesthetics/clothing/centcom/icons/obj/clothing/head/winterhood.dmi new file mode 100644 index 0000000000000..97c96df4e76a0 Binary files /dev/null and b/modular_bandastation/aesthetics/clothing/centcom/icons/obj/clothing/head/winterhood.dmi differ diff --git a/modular_bandastation/aesthetics/clothing/centcom/icons/obj/clothing/mask/mask.dmi b/modular_bandastation/aesthetics/clothing/centcom/icons/obj/clothing/mask/mask.dmi new file mode 100644 index 0000000000000..5b8fddd611f47 Binary files /dev/null and b/modular_bandastation/aesthetics/clothing/centcom/icons/obj/clothing/mask/mask.dmi differ diff --git a/modular_bandastation/aesthetics/clothing/centcom/icons/obj/clothing/suits/armor.dmi b/modular_bandastation/aesthetics/clothing/centcom/icons/obj/clothing/suits/armor.dmi new file mode 100644 index 0000000000000..81d791056e1bb Binary files /dev/null and b/modular_bandastation/aesthetics/clothing/centcom/icons/obj/clothing/suits/armor.dmi differ diff --git a/modular_bandastation/aesthetics/clothing/centcom/icons/obj/clothing/suits/jacket.dmi b/modular_bandastation/aesthetics/clothing/centcom/icons/obj/clothing/suits/jacket.dmi new file mode 100644 index 0000000000000..01f5f309a13fd Binary files /dev/null and b/modular_bandastation/aesthetics/clothing/centcom/icons/obj/clothing/suits/jacket.dmi differ diff --git a/modular_bandastation/aesthetics/clothing/centcom/icons/obj/clothing/suits/wintercoat.dmi b/modular_bandastation/aesthetics/clothing/centcom/icons/obj/clothing/suits/wintercoat.dmi new file mode 100644 index 0000000000000..0ab50c5521887 Binary files /dev/null and b/modular_bandastation/aesthetics/clothing/centcom/icons/obj/clothing/suits/wintercoat.dmi differ diff --git a/modular_bandastation/aesthetics/clothing/centcom/icons/obj/clothing/under/centcom.dmi b/modular_bandastation/aesthetics/clothing/centcom/icons/obj/clothing/under/centcom.dmi new file mode 100644 index 0000000000000..55ee7c4356e48 Binary files /dev/null and b/modular_bandastation/aesthetics/clothing/centcom/icons/obj/clothing/under/centcom.dmi differ diff --git a/modular_bandastation/aesthetics/radio/code/radio.dm b/modular_bandastation/aesthetics/radio/code/radio.dm index e720d20e990b3..ea33c41fe0b5f 100644 --- a/modular_bandastation/aesthetics/radio/code/radio.dm +++ b/modular_bandastation/aesthetics/radio/code/radio.dm @@ -1,2 +1,3 @@ /obj/item/radio/headset - icon = 'modular_bandastation/aesthetics/radio/icons/headsets.dmi' + icon = 'modular_bandastation/aesthetics/radio/icons/obj/headsets.dmi' + worn_icon = 'modular_bandastation/aesthetics/radio/icons/mob/ears.dmi' diff --git a/modular_bandastation/aesthetics/radio/icons/headsets.dmi b/modular_bandastation/aesthetics/radio/icons/headsets.dmi deleted file mode 100644 index db6fbbbf576f2..0000000000000 Binary files a/modular_bandastation/aesthetics/radio/icons/headsets.dmi and /dev/null differ diff --git a/modular_bandastation/aesthetics/radio/icons/mob/ears.dmi b/modular_bandastation/aesthetics/radio/icons/mob/ears.dmi new file mode 100644 index 0000000000000..f10a35a9a42d7 Binary files /dev/null and b/modular_bandastation/aesthetics/radio/icons/mob/ears.dmi differ diff --git a/modular_bandastation/aesthetics/radio/icons/obj/headsets.dmi b/modular_bandastation/aesthetics/radio/icons/obj/headsets.dmi new file mode 100644 index 0000000000000..92222de4a990b Binary files /dev/null and b/modular_bandastation/aesthetics/radio/icons/obj/headsets.dmi differ diff --git a/modular_bandastation/aesthetics/radio/icons/radio.dmi b/modular_bandastation/aesthetics/radio/icons/obj/radio.dmi similarity index 100% rename from modular_bandastation/aesthetics/radio/icons/radio.dmi rename to modular_bandastation/aesthetics/radio/icons/obj/radio.dmi diff --git a/modular_bandastation/aesthetics/vending/code/vending.dm b/modular_bandastation/aesthetics/vending/code/vending.dm new file mode 100644 index 0000000000000..7cc222f1fbd0e --- /dev/null +++ b/modular_bandastation/aesthetics/vending/code/vending.dm @@ -0,0 +1,39 @@ +/obj/machinery/vending/wardrobe/cent_wardrobe + icon = 'modular_bandastation/aesthetics/vending/icons/vending.dmi' + default_price = PAYCHECK_ZERO + products = list( + /obj/item/clothing/glasses/hud/security/sunglasses/centcom_officer = 3, + /obj/item/clothing/head/hats/centcom_cap = 3, + /obj/item/clothing/head/hats/centhat = 3, + /obj/item/clothing/head/beret/cent_intern = 3, + /obj/item/clothing/head/helmet/space/beret = 3, + /obj/item/clothing/under/rank/centcom/admiral = 3, + /obj/item/clothing/under/rank/centcom/commander = 3, + /obj/item/clothing/under/rank/centcom/centcom_skirt = 3, + /obj/item/clothing/under/rank/centcom/formal = 3, + /obj/item/clothing/under/rank/centcom/intern = 3, + /obj/item/clothing/under/rank/centcom/official = 3, + /obj/item/clothing/under/rank/centcom/officer = 3, + /obj/item/clothing/under/rank/centcom/officer_skirt = 3, + /obj/item/clothing/under/rank/centcom/diplomat = 3, + /obj/item/clothing/suit/armor/centcom_formal = 3, + /obj/item/clothing/suit/armor/centcom_formal/field = 3, + /obj/item/clothing/suit/armor/centcom_formal/officer = 3, + /obj/item/clothing/suit/space/officer = 3, + /obj/item/clothing/suit/hooded/wintercoat/centcom = 3, + /obj/item/clothing/neck/cloak/centcom = 3, + /obj/item/clothing/neck/cloak/centcom/admiral = 3, + /obj/item/clothing/neck/cloak/centcom/official = 3, + /obj/item/clothing/neck/cloak/centcom/officer = 3, + /obj/item/clothing/shoes/laceup/centcom = 3, + /obj/item/clothing/shoes/jackboots/centcom = 3, + /obj/item/clothing/gloves/combat/centcom = 3, + /obj/item/clothing/gloves/combat/centcom/diplomat = 3, + /obj/item/storage/belt/centcom_sabre = 3, + /obj/item/storage/belt/centcom_katana = 3, + ) + refill_canister = /obj/item/vending_refill/wardrobe/cent_wardrobe + +/obj/item/vending_refill/wardrobe/cent_wardrobe + machine_name = "CentDrobe" + light_color = COLOR_ASSEMBLY_BLUE diff --git a/modular_bandastation/aesthetics/vending/icons/vending.dmi b/modular_bandastation/aesthetics/vending/icons/vending.dmi new file mode 100644 index 0000000000000..699d01d474e79 Binary files /dev/null and b/modular_bandastation/aesthetics/vending/icons/vending.dmi differ diff --git a/modular_bandastation/objects/_objects.dme b/modular_bandastation/objects/_objects.dme index 35ec56697d85c..dbe342e94037c 100644 --- a/modular_bandastation/objects/_objects.dme +++ b/modular_bandastation/objects/_objects.dme @@ -7,11 +7,16 @@ #include "code/shuttles.dm" #include "code/wallets.dm" +#include "code/clothing/eyes/eyes.dm" +#include "code/clothing/gloves/gloves.dm" #include "code/clothing/head/hat.dm" #include "code/clothing/head/soft_caps.dm" +#include "code/clothing/shoes/shoes.dm" +#include "code/clothing/suits/armor.dm" #include "code/clothing/suits/cloaks.dm" #include "code/clothing/suits/jacket.dm" #include "code/clothing/suits/wintercoats.dm" +#include "code/clothing/under/jobs/centcom.dm" #include "code/clothing/under/jobs/rnd.dm" #include "code/consumables/drinks.dm" @@ -30,3 +35,4 @@ #include "code/vending/vending.dm" #include "code/weapons/ranged/awaymission_gun.dm" +#include "code/weapons/melee/centcom/rapier.dm" diff --git a/modular_bandastation/objects/code/clothing/eyes/eyes.dm b/modular_bandastation/objects/code/clothing/eyes/eyes.dm new file mode 100644 index 0000000000000..81f1700ddd27c --- /dev/null +++ b/modular_bandastation/objects/code/clothing/eyes/eyes.dm @@ -0,0 +1,12 @@ +// MARK: Eyes // + +// CentCom +/obj/item/clothing/glasses/hud/security/sunglasses/soo + name = "special ops officer's HUDSunglasses" + desc = "Продвинутый ИЛС-визор, стилизованный под солнцезащитные очки. Никто не укроется." + vision_flags = SEE_TURFS|SEE_MOBS|SEE_OBJS + +/obj/item/clothing/glasses/hud/security/sunglasses/centcom_officer + name = "fleet officer's HUDSunglasses" + desc = "Продвинутый ИЛС-визор, стилизованный под солнцезащитные очки. Почти никто не укроется." + vision_flags = SEE_MOBS diff --git a/modular_bandastation/objects/code/clothing/gloves/gloves.dm b/modular_bandastation/objects/code/clothing/gloves/gloves.dm new file mode 100644 index 0000000000000..9d72ece84c1cf --- /dev/null +++ b/modular_bandastation/objects/code/clothing/gloves/gloves.dm @@ -0,0 +1,16 @@ +// MARK: Gloves // + +// CentCom +/obj/item/clothing/gloves/combat/centcom + name = "fleet officer's gloves" + desc = "Солидные перчатки офицеров Центрального Командования Нанотрейзен." + icon = 'modular_bandastation/aesthetics/clothing/centcom/icons/obj/clothing/gloves/gloves.dmi' + worn_icon = 'modular_bandastation/aesthetics/clothing/centcom/icons/mob/clothing/gloves/gloves.dmi' + lefthand_file = 'modular_bandastation/aesthetics/clothing/centcom/icons/inhands/clothing/gloves_lefthand.dmi' + righthand_file = 'modular_bandastation/aesthetics/clothing/centcom/icons/inhands/clothing/gloves_righthand.dmi' + icon_state = "centcom" + resistance_flags = INDESTRUCTIBLE | FIRE_PROOF | FREEZE_PROOF | UNACIDABLE | ACID_PROOF + +/obj/item/clothing/gloves/combat/centcom/diplomat + desc = "Изящные и солидные перчатки офицеров Центрального Командования Нанотрейзен." + icon_state = "centcom_diplomat" diff --git a/modular_bandastation/objects/code/clothing/head/hat.dm b/modular_bandastation/objects/code/clothing/head/hat.dm index 6e054b75d3207..c6632294b18a2 100644 --- a/modular_bandastation/objects/code/clothing/head/hat.dm +++ b/modular_bandastation/objects/code/clothing/head/hat.dm @@ -1,3 +1,6 @@ +// MARK: Head // + +// Roboticist /obj/item/clothing/head/cowboy/roboticist name = "roboticist's cowboy hat" desc = "Ковбойская шляпа с малиновой лентой, сочетающая стиль и функциональность. Отличный выбор для тех, кто хочет выделиться на космической станции. На бирке указано: 'Flameholdeir Industries'. Вам точно не хватает револьвера!" @@ -5,3 +8,51 @@ worn_icon = 'modular_bandastation/objects/icons/mob/clothing/head/cowboy.dmi' icon_state = "cowboy_robostics" worn_icon_state = "cowboy_robostics" + +// CentCom +/obj/item/clothing/head/beret/cent_intern + name = "fleet junior-officer's beret" + desc = "Носится младшим офицерским составом." + icon_state = "beret_badge" + greyscale_config = /datum/greyscale_config/beret_badge + greyscale_config_worn = /datum/greyscale_config/beret_badge/worn + greyscale_colors = "#323253#acacac" + armor_type = /datum/armor/cent_intern + dog_fashion = null + flags_1 = NONE + +/datum/armor/cent_intern + melee = 30 + bullet = 25 + laser = 25 + energy = 35 + bomb = 25 + fire = 20 + acid = 50 + wound = 10 + +/obj/item/clothing/head/beret/cent_diplomat + name = "fleet officer's white beret" + desc = "Изящный белый берет. На подкладке вышита надпись: \"НЕ ПОДЛЕЖИТ СТИРКЕ!\"" + icon_state = "beret_badge" + greyscale_config = /datum/greyscale_config/beret_badge + greyscale_config_worn = /datum/greyscale_config/beret_badge/worn + greyscale_colors = "#eeeeee#FFCE5B" + armor_type = /datum/armor/cent_intern + dog_fashion = null + flags_1 = NONE + +/datum/armor/cent_diplomat + melee = 50 + bullet = 40 + laser = 40 + energy = 60 + bomb = 40 + fire = 60 + acid = 60 + wound = 12 + +/obj/item/clothing/head/helmet/space/beret/soo + name = "special ops officer's beret" + desc = "Продвинутая версия стандартного офицерского берета. Выдерживает попадание аннигиляторной пушки. Проверять не стоит." + greyscale_colors = "#b72b2f#acacac" diff --git a/modular_bandastation/objects/code/clothing/shoes/shoes.dm b/modular_bandastation/objects/code/clothing/shoes/shoes.dm new file mode 100644 index 0000000000000..e47cee70566a3 --- /dev/null +++ b/modular_bandastation/objects/code/clothing/shoes/shoes.dm @@ -0,0 +1,12 @@ +// MARK: Shoes // + +// CentCom +/obj/item/clothing/shoes/laceup/centcom + name = "fleet officer's laceup shoes" + desc = "Деловые флотские вездеходы из натуральной кожи. Пик моды." + clothing_traits = list(TRAIT_NO_SLIP_ALL) + +/obj/item/clothing/shoes/jackboots/centcom + name = "fleet officer's jackboots" + desc = "Стандартный вариант тактической обуви, выпускаемой Нанотрейзен." + clothing_traits = list(TRAIT_NO_SLIP_ALL) diff --git a/modular_bandastation/objects/code/clothing/suits/armor.dm b/modular_bandastation/objects/code/clothing/suits/armor.dm new file mode 100644 index 0000000000000..85d3cb61e33d8 --- /dev/null +++ b/modular_bandastation/objects/code/clothing/suits/armor.dm @@ -0,0 +1,13 @@ +// MARK: Armor // + +// CentCom +/obj/item/clothing/suit/armor/centcom_formal/field + name = "field officer's tunic" + desc = "Строгое и надежное армированное пальто для тяжелой работы непосредственно на объектах Компании. Не пропитывается кровью." + icon_state = "centcom_field_officer" + inhand_icon_state = "centcom_field" + +/obj/item/clothing/suit/armor/centcom_formal/officer + name = "fleet officer's greatcoat" + desc = "Удобный мундир для повседневного ношения." + icon_state = "centcom_officer" diff --git a/modular_bandastation/objects/code/clothing/suits/cloaks.dm b/modular_bandastation/objects/code/clothing/suits/cloaks.dm index 69b6461b31804..dcfb5a7611628 100644 --- a/modular_bandastation/objects/code/clothing/suits/cloaks.dm +++ b/modular_bandastation/objects/code/clothing/suits/cloaks.dm @@ -1,3 +1,6 @@ +// MARK: Cloaks // + +// Roboticist /obj/item/clothing/suit/hooded/roboticist_cloak name = "roboticist's coat" desc = "Стильный плащ с принтом головы борга на спине. Идеален для тех, кто хочет выделиться и показать свою любовь к робототехнике. На бирке указано: 'Flameholdeir Industries'. Бережно обращайтесь с боргами, пока они не сделали из вас лампочку!" @@ -16,3 +19,39 @@ body_parts_covered = HEAD flags_inv = HIDEHAIR|HIDEEARS +// CentCom +/obj/item/clothing/neck/cloak/centcom + name = "fleet officer's armor cloak" + desc = "Свободная накидка из дюраткани, укрепленной пластитановой нитью. Сочетает в себе два основных качества \ + офицерского убранства - пафос и защиту. Старые плащи этой линейки зачастую дарятся капитанам объектов Компании." + icon = 'modular_bandastation/aesthetics/clothing/centcom/icons/obj/clothing/cloaks/cloaks.dmi' + worn_icon = 'modular_bandastation/aesthetics/clothing/centcom/icons/mob/clothing/cloaks/cloaks.dmi' + icon_state = "centcom" + armor_type = /datum/armor/armor_centcom_cloak + resistance_flags = INDESTRUCTIBLE | FIRE_PROOF | FREEZE_PROOF | UNACIDABLE | ACID_PROOF + +/datum/armor/armor_centcom_cloak + melee = 80 + bullet = 80 + laser = 80 + energy = 60 + wound = 30 + +/obj/item/clothing/neck/cloak/centcom/officer + name = "fleet officer's official cloak" + desc = "Свободная накидка из дюраткани, укрепленной пластитановой нитью. Сочетает в себе два основных качества \ + офицерского убранства - пафос и защиту. Эта шитая золотом линейка плащей подходит для официальных встреч." + icon_state = "centcom_officer" + +/obj/item/clothing/neck/cloak/centcom/official + name = "fleet officer's parade cloak" + desc = "Свободная накидка из дюраткани, укрепленной пластитановой нитью. Лёгкое и изящное на первый взгляд, \ + это одеяние покрывает своего владельца надежной защитой. Подобные плащи не входят в какую-либо линейку и шьются исключительно на заказ под определенного офицера." + icon_state = "centcom_official" + +/obj/item/clothing/neck/cloak/centcom/admiral + name = "fleet officer's luxurious cloak" + desc = "Свободная накидка из дюраткани, укрепленной пластитановой нитью. Сочетает в себе два основных качества \ + офицерского убранства - пафос и защиту. Линейка этих дорогих плащей встречается у крайне состоятельных членов старшего офицерского состава." + icon_state = "centcom_admiral" + diff --git a/modular_bandastation/objects/code/clothing/suits/jacket.dm b/modular_bandastation/objects/code/clothing/suits/jacket.dm index bdf49af42f51d..e6d4a50e67982 100644 --- a/modular_bandastation/objects/code/clothing/suits/jacket.dm +++ b/modular_bandastation/objects/code/clothing/suits/jacket.dm @@ -1,6 +1,19 @@ +// MARK: Jacket // + +// Roboticist /obj/item/clothing/suit/toggle/jacket/roboticist name = "roboticist's jacket" desc = "Универсальная куртка из прочного материала, идеально подходит для работы с механическими деталями. Красные полосы на плечах добавляют стильный акцент. Теперь вы не только защищены, но и модны. На бирке указано: 'Flameholdeir Industries'. Будьте стильным, как Адский Бродяга!" icon_state = "robotics_jacket" icon = 'modular_bandastation/objects/icons/obj/clothing/suits/jacket.dmi' worn_icon = 'modular_bandastation/objects/icons/mob/clothing/suits/jacket.dmi' + +// CentCom +/obj/item/clothing/suit/space/officer/browntrench + name = "special ops officer's old coat" + desc = "Бронированное и защищающее от воздействий открытого космоса офицерское пальто старого образца. \ + На данный момент снято с производства и заменено более новыми моделями на всех объектах Компании. \ + Тем не менее, из-за своего классического стиля и повышенных защитных качеств, остается любимым \ + предметом гардероба у офицеров \"старой\" закалки." + icon_state = "brtrenchcoat" + inhand_icon_state = "brtrenchcoat" diff --git a/modular_bandastation/objects/code/clothing/under/jobs/centcom.dm b/modular_bandastation/objects/code/clothing/under/jobs/centcom.dm new file mode 100644 index 0000000000000..fef49cf124c22 --- /dev/null +++ b/modular_bandastation/objects/code/clothing/under/jobs/centcom.dm @@ -0,0 +1,23 @@ +// MARK: Under // + +// CentCom +/obj/item/clothing/under/rank/centcom/admiral + name = "fleet officer's luxurious suit" + desc = "Вариант дорогой офицерской униформы, который редко встретишь за пределами Центральных Миров." + icon_state = "centcom_admiral" + inhand_icon_state = "centcom_admiral" + can_adjust = FALSE + +/obj/item/clothing/under/rank/centcom/formal + name = "fleet officer's official suit" + desc = "Вариант офицерской униформы предназаченный для деловых встреч и официальных вылетов." + icon_state = "centcom_formal" + inhand_icon_state = "centcom_formal" + can_adjust = FALSE + +/obj/item/clothing/under/rank/centcom/diplomat + name = "fleet officer's white suit" + desc = "Будучи лицом Компании на важных переговорах вы ОБЯЗАНЫ блистать." + icon_state = "centcom_diplomat" + inhand_icon_state = "centcom_diplomat" + can_adjust = FALSE diff --git a/modular_bandastation/objects/code/weapons/melee/centcom/rapier.dm b/modular_bandastation/objects/code/weapons/melee/centcom/rapier.dm new file mode 100644 index 0000000000000..6496a29b13fcb --- /dev/null +++ b/modular_bandastation/objects/code/weapons/melee/centcom/rapier.dm @@ -0,0 +1,126 @@ +/obj/item/melee/sabre/centcom_sabre + name = "fleet officer's rapier" + desc = "Элегантное оружие более цивилизованной эпохи. Выполнено в классическом стиле с данью флотским традициям прошлого." + icon = 'modular_bandastation/objects/icons/melee.dmi' + icon_state = "centcom_sabre" + inhand_icon_state = "centcom_sabre" + lefthand_file = 'modular_bandastation/objects/icons/inhands/melee_lefthand.dmi' + righthand_file = 'modular_bandastation/objects/icons/inhands/melee_righthand.dmi' + force = 55 + demolition_mod = 1 + block_chance = 95 + armour_penetration = 100 + +/obj/item/melee/sabre/centcom_katana + name = "fleet officer's katana" + desc = "Элегантное оружие более цивилизованной эпохи. Выполнено в азиатском стиле с данью Земным культурам прошлого." + icon = 'modular_bandastation/objects/icons/melee.dmi' + icon_state = "centcom_katana" + inhand_icon_state = "centcom_katana" + lefthand_file = 'modular_bandastation/objects/icons/inhands/melee_lefthand.dmi' + righthand_file = 'modular_bandastation/objects/icons/inhands/melee_righthand.dmi' + hitsound = 'sound/items/weapons/bladeslice.ogg' + force = 55 + demolition_mod = 1 + block_chance = 95 + armour_penetration = 100 + +/obj/item/storage/belt/centcom_sabre + name = "fleet officer's rapier sheath" + desc = "Богато украшенные ножны, предназначенные для хранения офицерской рапиры." + icon = 'modular_bandastation/objects/icons/belt.dmi' + worn_icon = 'modular_bandastation/objects/icons/mob/clothing/belt/belt.dmi' + lefthand_file = 'modular_bandastation/objects/icons/inhands/belt_lefthand.dmi' + righthand_file = 'modular_bandastation/objects/icons/inhands/belt_righthand.dmi' + icon_state = "centcom_sheath" + worn_icon_state = "centcom_sheath" + inhand_icon_state = "centcom_sheath" + +/obj/item/storage/belt/centcom_sabre/Initialize(mapload) + . = ..() + AddElement(/datum/element/update_icon_updates_onmob) + + atom_storage.max_slots = 1 + atom_storage.do_rustle = FALSE + atom_storage.max_specific_storage = WEIGHT_CLASS_BULKY + atom_storage.set_holdable(/obj/item/melee/sabre/centcom_sabre) + atom_storage.click_alt_open = FALSE + +/obj/item/storage/belt/centcom_sabre/examine(mob/user) + . = ..() + if(length(contents)) + . += span_notice("Alt-click it to quickly draw the blade.") + +/obj/item/storage/belt/centcom_sabre/click_alt(mob/user) + if(length(contents)) + var/obj/item/I = contents[1] + user.visible_message(span_notice("[user] takes [I] out of [src]."), span_notice("You take [I] out of [src].")) + user.put_in_hands(I) + update_appearance() + else + balloon_alert(user, "it's empty!") + return CLICK_ACTION_SUCCESS + +/obj/item/storage/belt/centcom_sabre/update_icon_state() + icon_state = initial(inhand_icon_state) + inhand_icon_state = initial(inhand_icon_state) + worn_icon_state = initial(worn_icon_state) + if(contents.len) + icon_state += "-sabre" + inhand_icon_state += "-sabre" + worn_icon_state += "-sabre" + return ..() + +/obj/item/storage/belt/centcom_sabre/PopulateContents() + new /obj/item/melee/sabre/centcom_sabre(src) + update_appearance() + +/obj/item/storage/belt/centcom_katana + name = "fleet officer's katana sheath" + desc = "Богато украшенные деревянные ножны, предназначенные для хранения офицерской катаны." + icon = 'modular_bandastation/objects/icons/belt.dmi' + worn_icon = 'modular_bandastation/objects/icons/mob/clothing/belt/belt.dmi' + lefthand_file = 'modular_bandastation/objects/icons/inhands/belt_lefthand.dmi' + righthand_file = 'modular_bandastation/objects/icons/inhands/belt_righthand.dmi' + icon_state = "katana_sheath" + worn_icon_state = "katana_sheath" + inhand_icon_state = "katana_sheath" + +/obj/item/storage/belt/centcom_katana/Initialize(mapload) + . = ..() + AddElement(/datum/element/update_icon_updates_onmob) + + atom_storage.max_slots = 1 + atom_storage.do_rustle = FALSE + atom_storage.max_specific_storage = WEIGHT_CLASS_BULKY + atom_storage.set_holdable(/obj/item/melee/sabre/centcom_katana) + atom_storage.click_alt_open = FALSE + +/obj/item/storage/belt/centcom_katana/examine(mob/user) + . = ..() + if(length(contents)) + . += span_notice("Alt-click it to quickly draw the blade.") + +/obj/item/storage/belt/centcom_katana/click_alt(mob/user) + if(length(contents)) + var/obj/item/I = contents[1] + user.visible_message(span_notice("[user] takes [I] out of [src]."), span_notice("You take [I] out of [src].")) + user.put_in_hands(I) + update_appearance() + else + balloon_alert(user, "it's empty!") + return CLICK_ACTION_SUCCESS + +/obj/item/storage/belt/centcom_katana/update_icon_state() + icon_state = initial(inhand_icon_state) + inhand_icon_state = initial(inhand_icon_state) + worn_icon_state = initial(worn_icon_state) + if(contents.len) + icon_state += "-sabre" + inhand_icon_state += "-sabre" + worn_icon_state += "-sabre" + return ..() + +/obj/item/storage/belt/centcom_katana/PopulateContents() + new /obj/item/melee/sabre/centcom_katana(src) + update_appearance() diff --git a/modular_bandastation/objects/icons/belt.dmi b/modular_bandastation/objects/icons/belt.dmi new file mode 100644 index 0000000000000..dba49278e358f Binary files /dev/null and b/modular_bandastation/objects/icons/belt.dmi differ diff --git a/modular_bandastation/objects/icons/inhands/belt_lefthand.dmi b/modular_bandastation/objects/icons/inhands/belt_lefthand.dmi new file mode 100644 index 0000000000000..a1bf0ddad8e7a Binary files /dev/null and b/modular_bandastation/objects/icons/inhands/belt_lefthand.dmi differ diff --git a/modular_bandastation/objects/icons/inhands/belt_righthand.dmi b/modular_bandastation/objects/icons/inhands/belt_righthand.dmi new file mode 100644 index 0000000000000..e703cb9e18fab Binary files /dev/null and b/modular_bandastation/objects/icons/inhands/belt_righthand.dmi differ diff --git a/modular_bandastation/objects/icons/inhands/melee_lefthand.dmi b/modular_bandastation/objects/icons/inhands/melee_lefthand.dmi new file mode 100644 index 0000000000000..f66ff346d9185 Binary files /dev/null and b/modular_bandastation/objects/icons/inhands/melee_lefthand.dmi differ diff --git a/modular_bandastation/objects/icons/inhands/melee_righthand.dmi b/modular_bandastation/objects/icons/inhands/melee_righthand.dmi new file mode 100644 index 0000000000000..82f37d26fd530 Binary files /dev/null and b/modular_bandastation/objects/icons/inhands/melee_righthand.dmi differ diff --git a/modular_bandastation/objects/icons/melee.dmi b/modular_bandastation/objects/icons/melee.dmi new file mode 100644 index 0000000000000..b940eb74a5f28 Binary files /dev/null and b/modular_bandastation/objects/icons/melee.dmi differ diff --git a/modular_bandastation/objects/icons/mob/clothing/belt/belt.dmi b/modular_bandastation/objects/icons/mob/clothing/belt/belt.dmi new file mode 100644 index 0000000000000..7cdcf95445462 Binary files /dev/null and b/modular_bandastation/objects/icons/mob/clothing/belt/belt.dmi differ diff --git a/modular_bandastation/outfits/_outfits.dme b/modular_bandastation/outfits/_outfits.dme index 72ade94844289..c9f70abb4a3d4 100644 --- a/modular_bandastation/outfits/_outfits.dme +++ b/modular_bandastation/outfits/_outfits.dme @@ -1,3 +1,4 @@ #include "_outfits.dm" +#include "code/centcom.dm" #include "code/syndicate.dm" diff --git a/modular_bandastation/outfits/code/centcom.dm b/modular_bandastation/outfits/code/centcom.dm new file mode 100644 index 0000000000000..2d1f108302130 --- /dev/null +++ b/modular_bandastation/outfits/code/centcom.dm @@ -0,0 +1,146 @@ +// MARK: Nanotrasen CentCom // + +// Old Fashion CentCom Commander +/datum/outfit/centcom/spec_ops/old + name = "Old Fashion Special Ops Officer" + + id = /obj/item/card/id/advanced/centcom + id_trim = /datum/id_trim/centcom/specops_officer + uniform = /obj/item/clothing/under/rank/centcom/commander + suit = /obj/item/clothing/suit/space/officer/browntrench + back = /obj/item/storage/backpack/satchel/leather + backpack_contents = list( + /obj/item/storage/box/survival/centcom, + /obj/item/ammo_box/a357 = 3, + /obj/item/storage/fancy/cigarettes/cigars + ) + belt = /obj/item/gun/ballistic/revolver/mateba + ears = /obj/item/radio/headset/headset_cent/commander + glasses = /obj/item/clothing/glasses/hud/security/sunglasses/soo + gloves = /obj/item/clothing/gloves/combat + head = /obj/item/clothing/head/helmet/space/beret/soo + mask = /obj/item/cigarette/cigar/havana + shoes = /obj/item/clothing/shoes/jackboots/centcom + r_pocket = /obj/item/lighter + l_pocket = /obj/item/reagent_containers/hypospray/combat/nanites + +// CentCom Junior-Officer +/datum/outfit/centcom/centcom_intern + name = "CentCom Junior Officer" + + id_trim = /datum/id_trim/centcom/intern + +/datum/outfit/centcom/centcom_intern/unarmed + name = "CentCom Junior Officer (Unarmed)" + +/datum/outfit/centcom/centcom_intern/leader + name = "CentCom Junior Officer Chief" + + suit = /obj/item/clothing/suit/armor/vest + suit_store = /obj/item/gun/ballistic/rifle/boltaction + belt = /obj/item/melee/baton/security/loaded + head = /obj/item/clothing/head/beret/cent_intern + l_hand = /obj/item/megaphone + +/datum/outfit/centcom/centcom_intern/leader/unarmed + name = "CentCom Junior Officer Chief (Unarmed)" + +/datum/id_trim/centcom/intern + access = list(ACCESS_CENT_GENERAL, ACCESS_CENT_LIVING, ACCESS_WEAPONS) + assignment = "CentCom Junior Officer" + big_pointer = FALSE + +/datum/id_trim/centcom/intern/head + assignment = "CentCom Junior Officer Chief" + +// CentCom Navy Officer +/datum/outfit/centcom/commander + name = "CentCom Navy Officer" + + id = /obj/item/card/id/advanced/centcom + id_trim = /datum/id_trim/centcom/commander + uniform = /obj/item/clothing/under/rank/centcom/official + suit = /obj/item/clothing/suit/armor/centcom_formal + back = /obj/item/storage/backpack/satchel/leather + backpack_contents = list( + /obj/item/storage/box/survival/centcom, + /obj/item/stamp/centcom, + ) + belt = /obj/item/gun/energy/pulse/pistol/m1911 + ears = /obj/item/radio/headset/headset_cent/commander + glasses = /obj/item/clothing/glasses/hud/security/sunglasses/centcom_officer + gloves = /obj/item/clothing/gloves/combat/centcom + head = /obj/item/clothing/head/helmet/space/beret + mask = /obj/item/cigarette/cigar/cohiba + shoes = /obj/item/clothing/shoes/laceup + r_pocket = /obj/item/lighter + l_pocket = /obj/item/reagent_containers/hypospray/combat/nanites + +/datum/id_trim/centcom/commander + assignment = "CentCom Navy Officer" + +// CentCom Field Officer +/datum/outfit/centcom/commander/field + name = "CentCom Field Officer" + + id = /obj/item/card/id/advanced/centcom + id_trim = /datum/id_trim/centcom/commander/field + uniform = /obj/item/clothing/under/rank/centcom/official + suit = /obj/item/clothing/suit/armor/centcom_formal/field + back = /obj/item/storage/backpack/satchel/leather + belt = /obj/item/storage/belt/centcom_sabre + ears = /obj/item/radio/headset/headset_cent/commander + glasses = /obj/item/clothing/glasses/hud/security/sunglasses/centcom_officer + gloves = /obj/item/clothing/gloves/combat/centcom + head = /obj/item/clothing/head/helmet/space/beret + mask = /obj/item/cigarette/cigar/cohiba + shoes = /obj/item/clothing/shoes/jackboots/centcom + r_pocket = /obj/item/lighter + +/datum/id_trim/centcom/commander/field + assignment = "CentCom Field Officer" + +// CentCom Diplomat +/datum/outfit/centcom/diplomat + name = "Nanotrasen Diplomat" + + id = /obj/item/card/id/advanced/centcom + id_trim = /datum/id_trim/centcom/diplomat + uniform = /obj/item/clothing/under/rank/centcom/diplomat + back = /obj/item/storage/backpack/satchel/leather + backpack_contents = list( + /obj/item/storage/box/survival/centcom, + /obj/item/stack/spacecash/c10000, + /obj/item/pen/fourcolor, + /obj/item/stamp/centcom, + /obj/item/stamp/denied, + /obj/item/stamp/granted, + /obj/item/folder/blue, + /obj/item/folder/red, + /obj/item/storage/lockbox/medal + ) + ears = /obj/item/radio/headset/headset_cent/commander + glasses = /obj/item/clothing/glasses/sunglasses + gloves = /obj/item/clothing/gloves/combat/centcom/diplomat + head = /obj/item/clothing/head/beret/cent_diplomat + mask = /obj/item/cigarette/cigar/cohiba + shoes = /obj/item/clothing/shoes/laceup/centcom + r_pocket = /obj/item/lighter + l_hand = /obj/item/storage/briefcase + +/datum/outfit/centcom/diplomat/post_equip(mob/living/carbon/human/H, visuals_only = FALSE) + if(visuals_only) + return + + var/obj/item/card/id/W = H.wear_id + W.registered_name = H.real_name + W.update_label() + W.update_icon() + ..() + +/datum/id_trim/centcom/diplomat + assignment = "Nanotrasen Diplomat" + +/datum/id_trim/centcom/diplomat/New() + . = ..() + access = list(ACCESS_CENT_GENERAL, ACCESS_CENT_SPECOPS, ACCESS_CENT_LIVING) | (SSid_access.get_region_access_list(list(REGION_ALL_STATION)) - ACCESS_CHANGE_IDS)