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

New Robo clothing and wardrobe sprites #456

Merged
merged 10 commits into from
Jul 28, 2024
Merged
Show file tree
Hide file tree
Changes from 7 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
9 changes: 9 additions & 0 deletions modular_bandastation/objects/_objects.dme
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,12 @@

#include "code/material_pouch.dm"
#include "code/structures/posters.dm"

#include "code/clothing/head/hat.dm"
#include "code/clothing/head/soft_caps.dm"
#include "code/job_outfits/roboticist.dm"
#include "code/clothing/suits/cloaks.dm"
#include "code/clothing/suits/jacket.dm"
#include "code/clothing/suits/wintercoats.dm"
#include "code/clothing/under/jobs/rnd.dm"
#include "code/vending/vending.dm"
7 changes: 7 additions & 0 deletions modular_bandastation/objects/code/clothing/head/hat.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
/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"
9 changes: 9 additions & 0 deletions modular_bandastation/objects/code/clothing/head/soft_caps.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
/obj/item/clothing/head/soft/roboticist_cap
icon = 'modular_bandastation/objects/icons/obj/clothing/head/hats.dmi'
worn_icon = 'modular_bandastation/objects/icons/mob/clothing/head/hats.dmi'
name = "roboticist's cap"
desc = "Элегантная кепка в черных тонах с малиновым козырьком. Идеально дополняет рабочую форму, добавляя стиль. На бирке указано: 'Flameholdeir Industries'. С этой кепкой вы точно никогда не опоздаете."
icon_state = "robocap"
soft_type = "robocap"
soft_suffix = null
dog_fashion = null
18 changes: 18 additions & 0 deletions modular_bandastation/objects/code/clothing/suits/cloaks.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
/obj/item/clothing/suit/hooded/roboticist_cloak
name = "roboticist's coat"
desc = "Стильный плащ с принтом головы борга на спине. Идеален для тех, кто хочет выделиться и показать свою любовь к робототехнике. На бирке указано: 'Flameholdeir Industries'. Бережно обращайтесь с боргами, пока они не сделали из вас лампочку!"
icon_state = "robotics_coat"
icon = 'modular_bandastation/objects/icons/obj/clothing/suits/rnd.dmi'
worn_icon = 'modular_bandastation/objects/icons/mob/clothing/suits/rnd.dmi'
inhand_icon_state = null
larentoun marked this conversation as resolved.
Show resolved Hide resolved
body_parts_covered = CHEST|GROIN|LEGS|ARMS
AloeNeverDie marked this conversation as resolved.
Show resolved Hide resolved
hoodtype = /obj/item/clothing/head/hooded/roboticist_cloak

/obj/item/clothing/head/hooded/roboticist_cloak
name = "roboticist's hood"
icon = 'modular_bandastation/objects/icons/obj/clothing/head/rnd.dmi'
worn_icon = 'modular_bandastation/objects/icons/mob/clothing/head/rnd.dmi'
icon_state = "robotics_hood"
body_parts_covered = HEAD
flags_inv = HIDEHAIR|HIDEFACE|HIDEEARS
AloeNeverDie marked this conversation as resolved.
Show resolved Hide resolved

6 changes: 6 additions & 0 deletions modular_bandastation/objects/code/clothing/suits/jacket.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
/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'
11 changes: 11 additions & 0 deletions modular_bandastation/objects/code/clothing/suits/wintercoats.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
/obj/item/clothing/suit/hooded/wintercoat/science/robotics/alt
name = "roboticist's winter coat"
desc = "Пальто, исключительно для разбирающихся в моде. Для крутых и подкрученных перцев. На бирке указано: 'Flameholdeir Industries'. Поможет даже во время самых длинных, холодных и тёмных времен."
icon_state = "coatrobotics"
icon = 'modular_bandastation/objects/icons/obj/clothing/suits/wintercoat.dmi'
worn_icon = 'modular_bandastation/objects/icons/mob/clothing/suits/wintercoat.dmi'
hoodtype = NONE
larentoun marked this conversation as resolved.
Show resolved Hide resolved
inhand_icon_state = null

/obj/item/clothing/suit/hooded/wintercoat/science/robotics/alt/click_alt(mob/user)
return NONE // Restrict user to zip and unzip coat
AloeNeverDie marked this conversation as resolved.
Show resolved Hide resolved
35 changes: 35 additions & 0 deletions modular_bandastation/objects/code/clothing/under/jobs/rnd.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
/obj/item/clothing/under/rank/rnd/roboticist/alt
name = "standart roboticist jumpsuit"
desc = "Стандартный комбинезон робототехника нового образца. Ничего выдающегося, кроме качественного материала. На бирке указано: 'Flameholdeir Industries'. Эстетика в простоте - будьте как Сенатор!"
icon_state = "robotics"
AloeNeverDie marked this conversation as resolved.
Show resolved Hide resolved
icon = 'modular_bandastation/objects/icons/obj/clothing/under/rnd.dmi'
worn_icon = 'modular_bandastation/objects/icons/mob/clothing/under/rnd.dmi'

/obj/item/clothing/under/rank/rnd/roboticist/alt/red
name = "red roboticist's jumpsuit"
desc = "Прочный рабочий комбинезон из высококачественных материалов, обеспечивающий защиту и комфорт. Красный свитер из кашемира, мягкий на ощупь. Да, мы тоже думаем, что золотые заклёпки - это огонь. На бирке указано: 'Flameholdeir Industries'. Теперь вы готовы починить всех боргов, как парень с монтировкой, который спасает мир!"
icon_state = "robotics_red"
can_adjust = FALSE

/obj/item/clothing/under/rank/rnd/roboticist/alt/hoodie
name = "roboticist's hoodie"
desc = "Худи и джоггеры, идущие как единый комбинезон, пояс сделанный из крашенной кожи и золотой пряжки. Выполнены из мягкого и прочного материала, обеспечивая комфорт и свободу движений. Теперь даже борги будут завидовать вашему стилю. На бирке указано: 'Flameholdeir Industries'. В этом костюме вы можете прыгать по крышам, как паркурист-доставщик!"
icon_state = "robotics_hoodie"
body_parts_covered = CHEST|GROIN|ARMS
can_adjust = FALSE

/obj/item/clothing/under/rank/rnd/roboticist/alt/skirt
name = "standart roboticist's jumpskirt"
desc = "Стандартный комбинезон робототехника нового образца с юбкой. Ничего выдающегося, кроме качественного материала. На бирке указано: 'Flameholdeir Industries'. Эстетика в простоте - а кстати, а где моя катана?"
icon_state = "robotics_skirt"
body_parts_covered = CHEST|GROIN|ARMS
dying_key = DYE_REGISTRY_JUMPSKIRT
female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY
supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON

/obj/item/clothing/under/rank/rnd/roboticist/alt/skirt/red
name = "red roboticist's jumpskirt"
desc = "Прочный рабочий комбинезон из высококачественных материалов, обеспечивающий защиту и комфорт. Красный свитер из кашемира, мягкий на ощупь. Да, мы тоже думаем, что золотые заклёпки - это огонь. На бирке указано: 'Flameholdeir Industries'. Вы сможете заменять протезы рук ВЕЧНОСТЬ и со стилем!"
icon_state = "robotics_skirt_red"
female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY
can_adjust = FALSE
2 changes: 2 additions & 0 deletions modular_bandastation/objects/code/job_outfits/roboticist.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
/datum/outfit/job/roboticist
AloeNeverDie marked this conversation as resolved.
Show resolved Hide resolved
uniform = /obj/item/clothing/under/rank/rnd/roboticist/alt
22 changes: 22 additions & 0 deletions modular_bandastation/objects/code/vending/vending.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
/obj/machinery/vending/wardrobe/robo_wardrobe
icon = 'modular_bandastation/objects/icons/obj/machines/vending.dmi'
icon_state = "robodrobe"
light_mask = null

/obj/machinery/vending/wardrobe/robo_wardrobe/build_inventories(start_empty)
var/list/new_products = list(
/obj/item/clothing/head/beret = 2,
/obj/item/clothing/head/cowboy/roboticist = 2,
/obj/item/clothing/head/soft/roboticist_cap = 2,
/obj/item/clothing/suit/hooded/roboticist_cloak = 2,
/obj/item/clothing/suit/toggle/jacket/roboticist = 2,
/obj/item/clothing/suit/hooded/wintercoat/science/robotics/alt = 2,
/obj/item/clothing/under/rank/rnd/roboticist/alt = 2,
/obj/item/clothing/under/rank/rnd/roboticist/alt/red = 2,
/obj/item/clothing/under/rank/rnd/roboticist/alt/hoodie = 2,
/obj/item/clothing/under/rank/rnd/roboticist/alt/skirt = 2,
/obj/item/clothing/under/rank/rnd/roboticist/alt/skirt/red = 2,
)
new_products |= products
products = new_products
AloeNeverDie marked this conversation as resolved.
Show resolved Hide resolved
. = ..()
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.
Loading