Skip to content

Commit

Permalink
Add: CentCom clothes, vendomate, outfits and melee weapon (#842)
Browse files Browse the repository at this point in the history
## About The Pull Request

Меняем цвет одежды Центрального Командования с отстойного зеленого на
крутой темно-синий.
Цветовая палитра выбрана, согласована и одобрена Муниверсом.
Меняем чёрную классику и отвергаем традиционные зеленые цвета, ищем свой
путь (слава богу что не коричневый).

Добавлены несколько дополнительных вариантов униформы, верхней одежды,
головных уборов и перчаток. Добавлены офицерская рапира и катана
(однозначно ни откуда не позаимствованная). Добавлены офицерские плащи.
На картинках все новое выделено зеленым цветом.

Слегка изменены базовые аутфиты ЦКшных ролей. В будущем могут еще
меняться.

Цвета вендомата с одеждой офицеров ЦК и наушники так же поменялись.

Плазмаменов забыть спросили (их на ЦК и не будет).

## Why It's Good For The Game

Зеленый цвет нравится только больным ублюдкам, а таковых у нас не
водится.
<img width="106" alt="dreamseeker_QCnULgSXJh"
src="https://github.com/user-attachments/assets/ce713b08-7f07-4a36-9f6f-132037d0c5c5">

![dreamseeker_OJlK5Pfhie](https://github.com/user-attachments/assets/569facad-b122-416b-886a-9c0803dbafbf)


## Changelog
:cl:
add: 1984 ЦК на ТГ всегда было темно-синим 1984
/:cl:
  • Loading branch information
konushi authored Dec 10, 2024
1 parent 11f10e0 commit 9974e2f
Show file tree
Hide file tree
Showing 65 changed files with 637 additions and 1 deletion.
16 changes: 16 additions & 0 deletions modular_bandastation/aesthetics/_aesthetics.dme
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down Expand Up @@ -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"

Expand All @@ -62,3 +77,4 @@

// WinDoors
#include "windoors/code/windoors.dm"

11 changes: 11 additions & 0 deletions modular_bandastation/aesthetics/bedsheet/code/bedsheet.dm
Original file line number Diff line number Diff line change
@@ -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'
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
26 changes: 26 additions & 0 deletions modular_bandastation/aesthetics/clothing/centcom/code/head/hat.dm
Original file line number Diff line number Diff line change
@@ -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'
Original file line number Diff line number Diff line change
@@ -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'
Original file line number Diff line number Diff line change
@@ -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'
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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"
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.
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.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
3 changes: 2 additions & 1 deletion modular_bandastation/aesthetics/radio/code/radio.dm
Original file line number Diff line number Diff line change
@@ -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'
Binary file not shown.
Binary file not shown.
Binary file not shown.
39 changes: 39 additions & 0 deletions modular_bandastation/aesthetics/vending/code/vending.dm
Original file line number Diff line number Diff line change
@@ -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
Binary file not shown.
6 changes: 6 additions & 0 deletions modular_bandastation/objects/_objects.dme
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -30,3 +35,4 @@
#include "code/vending/vending.dm"

#include "code/weapons/ranged/awaymission_gun.dm"
#include "code/weapons/melee/centcom/rapier.dm"
12 changes: 12 additions & 0 deletions modular_bandastation/objects/code/clothing/eyes/eyes.dm
Original file line number Diff line number Diff line change
@@ -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
16 changes: 16 additions & 0 deletions modular_bandastation/objects/code/clothing/gloves/gloves.dm
Original file line number Diff line number Diff line change
@@ -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"
51 changes: 51 additions & 0 deletions modular_bandastation/objects/code/clothing/head/hat.dm
Original file line number Diff line number Diff line change
@@ -1,7 +1,58 @@
// MARK: Head //

// Roboticist
/obj/item/clothing/head/cowboy/roboticist
name = "roboticist's cowboy hat"
desc = "Ковбойская шляпа с малиновой лентой, сочетающая стиль и функциональность. Отличный выбор для тех, кто хочет выделиться на космической станции. На бирке указано: 'Flameholdeir Industries'. Вам точно не хватает револьвера!"
icon = 'modular_bandastation/objects/icons/obj/clothing/head/cowboy.dmi'
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"
12 changes: 12 additions & 0 deletions modular_bandastation/objects/code/clothing/shoes/shoes.dm
Original file line number Diff line number Diff line change
@@ -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)
13 changes: 13 additions & 0 deletions modular_bandastation/objects/code/clothing/suits/armor.dm
Original file line number Diff line number Diff line change
@@ -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"
Loading

0 comments on commit 9974e2f

Please sign in to comment.