diff --git a/code/__DEFINES/obj_flags.dm b/code/__DEFINES/obj_flags.dm index 9f575de9fbc55..b6da277775666 100644 --- a/code/__DEFINES/obj_flags.dm +++ b/code/__DEFINES/obj_flags.dm @@ -87,6 +87,10 @@ #define HEADINTERNALS (1<<16) /// Prevents masks from getting adjusted from enabling internals #define INTERNALS_ADJUST_EXEMPT (1<<17) +// BANDASTATION ADDITION - START +/// Does not leave fibers behind +#define FIBERLESS_GLOVES (1<<18) +// BANDASTATION ADDITION - END /// Integrity defines for clothing (not flags but close enough) #define CLOTHING_PRISTINE 0 // We have no damage on the clothing diff --git a/code/_globalvars/bitfields.dm b/code/_globalvars/bitfields.dm index 689750ff9ce88..97df688b0d255 100644 --- a/code/_globalvars/bitfields.dm +++ b/code/_globalvars/bitfields.dm @@ -101,6 +101,9 @@ DEFINE_BITFIELD(clothing_flags, list( "VOICEBOX_DISABLED" = VOICEBOX_DISABLED, "VOICEBOX_TOGGLABLE" = VOICEBOX_TOGGLABLE, "INTERNALS_ADJUST_EXEMPT" = INTERNALS_ADJUST_EXEMPT, + // BANDASTATION ADDITION - START + "FIBERLESS_GLOVES" = FIBERLESS_GLOVES, + // BANDASTATION ADDITION - END )) DEFINE_BITFIELD(datum_flags, list( diff --git a/modular_bandastation/jobs/_jobs.dm b/modular_bandastation/jobs/_jobs.dm new file mode 100644 index 0000000000000..83d94ac5d178a --- /dev/null +++ b/modular_bandastation/jobs/_jobs.dm @@ -0,0 +1,4 @@ +/datum/modpack/jobs + name = "Расширение и дополнение работ" + desc = "Добавляет новые работы, расширяет и изменяет имеющиеся." + author = "dj-34" diff --git a/modular_bandastation/jobs/_jobs.dme b/modular_bandastation/jobs/_jobs.dme new file mode 100644 index 0000000000000..b996a037809cb --- /dev/null +++ b/modular_bandastation/jobs/_jobs.dme @@ -0,0 +1,4 @@ +#include "_jobs.dm" + +#include "code/detective/detective.dm" +#include "code/detective/forensics.dm" diff --git a/modular_bandastation/jobs/code/detective/detective.dm b/modular_bandastation/jobs/code/detective/detective.dm new file mode 100644 index 0000000000000..147a17131f7fb --- /dev/null +++ b/modular_bandastation/jobs/code/detective/detective.dm @@ -0,0 +1,3 @@ +// Outfit changes +/datum/outfit/job/detective + gloves = /obj/item/clothing/gloves/color/black/forensics // Override: /obj/item/clothing/gloves/color/black diff --git a/modular_bandastation/jobs/code/detective/forensics.dm b/modular_bandastation/jobs/code/detective/forensics.dm new file mode 100644 index 0000000000000..06203eb3beeef --- /dev/null +++ b/modular_bandastation/jobs/code/detective/forensics.dm @@ -0,0 +1,5 @@ +// Check for fiberless flag to skip adding fibers +/datum/forensics/add_fibers(mob/living/carbon/human/suspect) + if(suspect.gloves?.clothing_flags & FIBERLESS_GLOVES) + return FALSE + . = ..() diff --git a/modular_bandastation/modular_bandastation.dme b/modular_bandastation/modular_bandastation.dme index e4838abe521dd..24d327b88b3ad 100644 --- a/modular_bandastation/modular_bandastation.dme +++ b/modular_bandastation/modular_bandastation.dme @@ -21,6 +21,7 @@ #include "examine_panel/_examine_panel.dme" #include "gunhud/_gunhud.dme" #include "hair/_hair.dme" +#include "jobs/_jobs.dme" #include "keybinding/_keybinding.dme" #include "loadout/_loadout.dme" #include "mapping/_mapping.dme" diff --git a/modular_bandastation/objects/_objects.dme b/modular_bandastation/objects/_objects.dme index dbe342e94037c..46a129d5df0a4 100644 --- a/modular_bandastation/objects/_objects.dme +++ b/modular_bandastation/objects/_objects.dme @@ -1,38 +1,34 @@ #include "_objects.dm" -#include "code/hampters.dm" -#include "code/material_pouch.dm" -#include "code/papershredder.dm" -#include "code/platform.dm" -#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" -#include "code/consumables/customer_data.dm" - #include "code/effects/turf_decal.dm" +#include "code/items/clothing/glasses/glasses.dm" +#include "code/items/clothing/gloves/gloves.dm" +#include "code/items/clothing/head/hat.dm" +#include "code/items/clothing/head/soft_caps.dm" +#include "code/items/clothing/shoes/shoes.dm" +#include "code/items/clothing/suits/armor.dm" +#include "code/items/clothing/suits/cloaks.dm" +#include "code/items/clothing/suits/jacket.dm" +#include "code/items/clothing/suits/wintercoats.dm" +#include "code/items/clothing/under/jobs/centcom.dm" +#include "code/items/clothing/under/jobs/research.dm" +#include "code/items/consumables/customer_data.dm" +#include "code/items/consumables/drinks.dm" +#include "code/items/weapons/melee/centcom/rapier.dm" +#include "code/items/weapons/ranged/energy/awaymission_gun.dm" #include "code/items/banners.dm" +#include "code/items/hampters.dm" +#include "code/items/material_pouch.dm" +#include "code/items/wallets.dm" +#include "code/machinery/vending/vending.dm" +#include "code/machinery/papershredder.dm" #include "code/machinery/photocopier.dm" #include "code/structures/chairs.dm" +#include "code/structures/platform.dm" #include "code/structures/posters.dm" #include "code/structures/statues.dm" -#include "code/vending/vending.dm" - -#include "code/weapons/ranged/awaymission_gun.dm" -#include "code/weapons/melee/centcom/rapier.dm" +#include "code/shuttles.dm" diff --git a/modular_bandastation/objects/code/clothing/gloves/gloves.dm b/modular_bandastation/objects/code/clothing/gloves/gloves.dm deleted file mode 100644 index 9d72ece84c1cf..0000000000000 --- a/modular_bandastation/objects/code/clothing/gloves/gloves.dm +++ /dev/null @@ -1,16 +0,0 @@ -// 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/items/banners.dm b/modular_bandastation/objects/code/items/banners.dm index 528b474211804..53234dc142a18 100644 --- a/modular_bandastation/objects/code/items/banners.dm +++ b/modular_bandastation/objects/code/items/banners.dm @@ -1,8 +1,8 @@ // MARK: Banners /obj/item/banner icon = 'modular_bandastation/objects/icons/obj/items/banner.dmi' - lefthand_file = 'modular_bandastation/objects/icons/inhands/banners_lefthand.dmi' - righthand_file = 'modular_bandastation/objects/icons/inhands/banners_righthand.dmi' + lefthand_file = 'modular_bandastation/objects/icons/mob/inhands/banners_lefthand.dmi' + righthand_file = 'modular_bandastation/objects/icons/mob/inhands/banners_righthand.dmi' /obj/item/banner/atmos name = "atmosia banner" diff --git a/modular_bandastation/objects/code/clothing/eyes/eyes.dm b/modular_bandastation/objects/code/items/clothing/glasses/glasses.dm similarity index 97% rename from modular_bandastation/objects/code/clothing/eyes/eyes.dm rename to modular_bandastation/objects/code/items/clothing/glasses/glasses.dm index 81f1700ddd27c..594c6832c5c97 100644 --- a/modular_bandastation/objects/code/clothing/eyes/eyes.dm +++ b/modular_bandastation/objects/code/items/clothing/glasses/glasses.dm @@ -1,5 +1,3 @@ -// MARK: Eyes // - // CentCom /obj/item/clothing/glasses/hud/security/sunglasses/soo name = "special ops officer's HUDSunglasses" diff --git a/modular_bandastation/objects/code/items/clothing/gloves/gloves.dm b/modular_bandastation/objects/code/items/clothing/gloves/gloves.dm new file mode 100644 index 0000000000000..8ef3e9fd3313b --- /dev/null +++ b/modular_bandastation/objects/code/items/clothing/gloves/gloves.dm @@ -0,0 +1,30 @@ +// 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" + +// Detective (forensics) gloves +/obj/item/clothing/gloves/color/black/forensics + name = "forensics gloves" + desc = "Эти высокотехнологичные перчатки не оставляют никаких следов на предметах, к которым прикасаются. Идеально подходят для того, чтобы оставить место преступления нетронутым... как до, так и после преступления." + icon = 'modular_bandastation/objects/icons/obj/clothing/gloves.dmi' + worn_icon = 'modular_bandastation/objects/icons/mob/clothing/gloves.dmi' + lefthand_file = 'modular_bandastation/objects/icons/mob/inhands/gloves_lefthand.dmi' + righthand_file = 'modular_bandastation/objects/icons/mob/inhands/gloves_righthand.dmi' + icon_state = "forensics" + clothing_flags = FIBERLESS_GLOVES + +/obj/item/clothing/gloves/examine_tags(mob/user) + . = ..() + if(clothing_flags & FIBERLESS_GLOVES) + .["безволоконная"] = "Не оставляет волокна." diff --git a/modular_bandastation/objects/code/clothing/head/hat.dm b/modular_bandastation/objects/code/items/clothing/head/hat.dm similarity index 100% rename from modular_bandastation/objects/code/clothing/head/hat.dm rename to modular_bandastation/objects/code/items/clothing/head/hat.dm diff --git a/modular_bandastation/objects/code/clothing/head/soft_caps.dm b/modular_bandastation/objects/code/items/clothing/head/soft_caps.dm similarity index 98% rename from modular_bandastation/objects/code/clothing/head/soft_caps.dm rename to modular_bandastation/objects/code/items/clothing/head/soft_caps.dm index f059ccdccbf7f..982918dfadf95 100644 --- a/modular_bandastation/objects/code/clothing/head/soft_caps.dm +++ b/modular_bandastation/objects/code/items/clothing/head/soft_caps.dm @@ -1,6 +1,6 @@ /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' + worn_icon = 'modular_bandastation/objects/icons/mob/clothing/head/cap.dmi' name = "roboticist's cap" desc = "Элегантная кепка в черных тонах с малиновым козырьком. Идеально дополняет рабочую форму, добавляя стиль. На бирке указано: 'Flameholdeir Industries'. С этой кепкой вы точно никогда не опоздаете." icon_state = "robocap" diff --git a/modular_bandastation/objects/code/clothing/shoes/shoes.dm b/modular_bandastation/objects/code/items/clothing/shoes/shoes.dm similarity index 100% rename from modular_bandastation/objects/code/clothing/shoes/shoes.dm rename to modular_bandastation/objects/code/items/clothing/shoes/shoes.dm diff --git a/modular_bandastation/objects/code/clothing/suits/armor.dm b/modular_bandastation/objects/code/items/clothing/suits/armor.dm similarity index 100% rename from modular_bandastation/objects/code/clothing/suits/armor.dm rename to modular_bandastation/objects/code/items/clothing/suits/armor.dm diff --git a/modular_bandastation/objects/code/clothing/suits/cloaks.dm b/modular_bandastation/objects/code/items/clothing/suits/cloaks.dm similarity index 93% rename from modular_bandastation/objects/code/clothing/suits/cloaks.dm rename to modular_bandastation/objects/code/items/clothing/suits/cloaks.dm index dcfb5a7611628..91eb1b7b07fd2 100644 --- a/modular_bandastation/objects/code/clothing/suits/cloaks.dm +++ b/modular_bandastation/objects/code/items/clothing/suits/cloaks.dm @@ -5,16 +5,16 @@ 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' + icon = 'modular_bandastation/objects/icons/obj/clothing/neck.dmi' + worn_icon = 'modular_bandastation/objects/icons/mob/clothing/neck.dmi' inhand_icon_state = null body_parts_covered = CHEST|GROIN|ARMS 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 = 'modular_bandastation/objects/icons/obj/clothing/head/hood.dmi' + worn_icon = 'modular_bandastation/objects/icons/mob/clothing/head/hood.dmi' icon_state = "robotics_hood" body_parts_covered = HEAD flags_inv = HIDEHAIR|HIDEEARS diff --git a/modular_bandastation/objects/code/clothing/suits/jacket.dm b/modular_bandastation/objects/code/items/clothing/suits/jacket.dm similarity index 100% rename from modular_bandastation/objects/code/clothing/suits/jacket.dm rename to modular_bandastation/objects/code/items/clothing/suits/jacket.dm diff --git a/modular_bandastation/objects/code/clothing/suits/wintercoats.dm b/modular_bandastation/objects/code/items/clothing/suits/wintercoats.dm similarity index 100% rename from modular_bandastation/objects/code/clothing/suits/wintercoats.dm rename to modular_bandastation/objects/code/items/clothing/suits/wintercoats.dm diff --git a/modular_bandastation/objects/code/clothing/under/jobs/centcom.dm b/modular_bandastation/objects/code/items/clothing/under/jobs/centcom.dm similarity index 100% rename from modular_bandastation/objects/code/clothing/under/jobs/centcom.dm rename to modular_bandastation/objects/code/items/clothing/under/jobs/centcom.dm diff --git a/modular_bandastation/objects/code/clothing/under/jobs/rnd.dm b/modular_bandastation/objects/code/items/clothing/under/jobs/research.dm similarity index 100% rename from modular_bandastation/objects/code/clothing/under/jobs/rnd.dm rename to modular_bandastation/objects/code/items/clothing/under/jobs/research.dm diff --git a/modular_bandastation/objects/code/consumables/customer_data.dm b/modular_bandastation/objects/code/items/consumables/customer_data.dm similarity index 100% rename from modular_bandastation/objects/code/consumables/customer_data.dm rename to modular_bandastation/objects/code/items/consumables/customer_data.dm diff --git a/modular_bandastation/objects/code/consumables/drinks.dm b/modular_bandastation/objects/code/items/consumables/drinks.dm similarity index 93% rename from modular_bandastation/objects/code/consumables/drinks.dm rename to modular_bandastation/objects/code/items/consumables/drinks.dm index d3f9182a958fe..80be016a7630b 100644 --- a/modular_bandastation/objects/code/consumables/drinks.dm +++ b/modular_bandastation/objects/code/items/consumables/drinks.dm @@ -23,7 +23,7 @@ required_drink_type = /datum/reagent/consumable/kvass name = "стакан кваса" desc = "В стакане кристально чистая жидкость насыщенного темно-коричневого цвета, которая кажется почти янтарной при определенном угле освещения." - icon = 'modular_bandastation/objects/icons/drinks.dmi' + icon = 'modular_bandastation/objects/icons/obj/items/drinks.dmi' icon_state = "kvass" /datum/export/large/reagent_dispenser/kvass @@ -33,7 +33,7 @@ /obj/structure/reagent_dispensers/kvasstank name = "бочка кваса" desc = "Ярко-желтая бочка с квасом, которая сразу привлекает внимание своим насыщенным цветом. Она выполнена в классическом стиле, из толстого, прочного металла с гладкой, блестящей поверхностью. Бочка имеет цилиндрическую форму, слегка расширяясь к середине и снова сужаясь к краям." - icon = 'modular_bandastation/objects/icons/chemical_tanks.dmi' + icon = 'modular_bandastation/objects/icons/obj/structures/chemical_tanks.dmi' icon_state = "kvass" reagent_id = /datum/reagent/consumable/kvass openable = TRUE @@ -50,7 +50,7 @@ required_drink_type = /datum/reagent/consumable/ethanol/sambuka name = "Glass of Sambuka" desc = "Flying into space, many thought that they had grasped fate." - icon = 'modular_bandastation/objects/icons/drinks.dmi' + icon = 'modular_bandastation/objects/icons/obj/items/drinks.dmi' icon_state = "sambuka" /datum/reagent/consumable/ethanol/innocent_erp @@ -67,7 +67,7 @@ required_drink_type = /datum/reagent/consumable/ethanol/innocent_erp name = "Innocent ERP" desc = "Remember that big brother sees everything." - icon = 'modular_bandastation/objects/icons/drinks.dmi' + icon = 'modular_bandastation/objects/icons/obj/items/drinks.dmi' icon_state = "innocent_erp" /datum/chemical_reaction/drink/innocent_erp @@ -97,7 +97,7 @@ required_drink_type = /datum/reagent/consumable/ethanol/soundhand name = "Саундхэнд" desc = "Коктейль из нескольких алкогольных напитков с запахом ягод и легким слоем перца на стакане." - icon = 'modular_bandastation/objects/icons/drinks.dmi' + icon = 'modular_bandastation/objects/icons/obj/items/drinks.dmi' icon_state = "soundhand" /datum/chemical_reaction/drink/soundhand @@ -121,7 +121,7 @@ required_drink_type = /datum/reagent/consumable/ethanol/jagermeister name = "Стакан Егермейстра" desc = "Пьяный охотник прилетел из глубокого космоса и, похоже, нашел жертву." - icon = 'modular_bandastation/objects/icons/drinks.dmi' + icon = 'modular_bandastation/objects/icons/obj/items/drinks.dmi' icon_state = "jagermeister" /datum/reagent/consumable/ethanol/bluecuracao @@ -136,7 +136,7 @@ required_drink_type = /datum/reagent/consumable/ethanol/bluecuracao name = "Стакан Блю Кюрасао" desc = "Предохранитель готов, синева уже загорелась." - icon = 'modular_bandastation/objects/icons/drinks.dmi' + icon = 'modular_bandastation/objects/icons/obj/items/drinks.dmi' icon_state = "bluecuracao" /datum/reagent/consumable/ethanol/black_blood @@ -158,7 +158,7 @@ required_drink_type = /datum/reagent/consumable/ethanol/black_blood name = "Черная Кровь" desc = "Нужно пить быстрее, пока оно не начало сворачиваться." - icon = 'modular_bandastation/objects/icons/drinks.dmi' + icon = 'modular_bandastation/objects/icons/obj/items/drinks.dmi' icon_state = "black_blood" /datum/chemical_reaction/drink/black_blood @@ -184,7 +184,7 @@ required_drink_type = /datum/reagent/consumable/ethanol/pegu_club name = "Клуб Пегу" desc = "Это похоже на то, как группа джентльменов колонизирует ваш язык." - icon = 'modular_bandastation/objects/icons/drinks.dmi' + icon = 'modular_bandastation/objects/icons/obj/items/drinks.dmi' icon_state = "pegu_club" /datum/chemical_reaction/drink/pegu_club @@ -209,7 +209,7 @@ required_drink_type = /datum/reagent/consumable/ethanol/amnesia name = "Звездная амнезия" desc = "Это просто бутылка медицинского спирта?" - icon = 'modular_bandastation/objects/icons/drinks.dmi' + icon = 'modular_bandastation/objects/icons/obj/items/drinks.dmi' icon_state = "amnesia" /datum/chemical_reaction/drink/amnesia @@ -233,7 +233,7 @@ required_drink_type = /datum/reagent/consumable/ethanol/silverhand name = "Silverhand" desc = "Wake the heck up, samurai. We have a station to burn." - icon = 'modular_bandastation/objects/icons/drinks.dmi' + icon = 'modular_bandastation/objects/icons/obj/items/drinks.dmi' icon_state = "silverhand" /datum/chemical_reaction/drink/silverhand @@ -259,7 +259,7 @@ required_drink_type = /datum/reagent/consumable/ethanol/oldfashion name = "Old Fashion" desc = "Ходят слухи, что этот коктейль самый старый, но, однако, это совсем другая история." - icon = 'modular_bandastation/objects/icons/drinks.dmi' + icon = 'modular_bandastation/objects/icons/obj/items/drinks.dmi' icon_state = "oldfashion" /datum/chemical_reaction/drink/oldfashion @@ -285,7 +285,7 @@ required_drink_type = /datum/reagent/consumable/ethanol/brandy_crusta name = "Брэнди Круста" desc = "Сахарная корочка может оказаться совсем не сладкой." - icon = 'modular_bandastation/objects/icons/drinks.dmi' + icon = 'modular_bandastation/objects/icons/obj/items/drinks.dmi' icon_state = "brandy_crusta" /datum/chemical_reaction/drink/brandy_crusta @@ -310,7 +310,7 @@ required_drink_type = /datum/reagent/consumable/ethanol/telegol name = "Телеголь" desc = "Многие до сих пор ломают голову над вопросом об этом коктейле. В любом случае, оно все еще существует... Или нет." - icon = 'modular_bandastation/objects/icons/drinks.dmi' + icon = 'modular_bandastation/objects/icons/obj/items/drinks.dmi' icon_state = "telegol" /datum/chemical_reaction/drink/telegol @@ -339,7 +339,7 @@ required_drink_type = /datum/reagent/consumable/ethanol/horse_neck name = "Лошадиная Шея" desc = "Будьте осторожны с вашими подковами." - icon = 'modular_bandastation/objects/icons/drinks.dmi' + icon = 'modular_bandastation/objects/icons/obj/items/drinks.dmi' icon_state = "horse_neck" /datum/chemical_reaction/drink/horse_neck @@ -369,7 +369,7 @@ required_drink_type = /datum/reagent/consumable/ethanol/vampiro name = "Вампиро" desc = "Ничего общего с вампирами не имеет, кроме цвета." - icon = 'modular_bandastation/objects/icons/drinks.dmi' + icon = 'modular_bandastation/objects/icons/obj/items/drinks.dmi' icon_state = "vampiro" /datum/chemical_reaction/drink/vampiro @@ -393,7 +393,7 @@ required_drink_type = /datum/reagent/consumable/ethanol/inabox name = "Коробка" desc = "Это... Просто коробка?" - icon = 'modular_bandastation/objects/icons/drinks.dmi' + icon = 'modular_bandastation/objects/icons/obj/items/drinks.dmi' icon_state = "inabox" /datum/chemical_reaction/drink/inabox @@ -420,7 +420,7 @@ required_drink_type = /datum/reagent/consumable/ethanol/green_fairy name = "Зеленая Фея" desc = "Какой-то ненормальный зеленый цвет." - icon = 'modular_bandastation/objects/icons/drinks.dmi' + icon = 'modular_bandastation/objects/icons/obj/items/drinks.dmi' icon_state = "green_fairy" /datum/chemical_reaction/drink/green_fairy @@ -446,7 +446,7 @@ required_drink_type = /datum/reagent/consumable/ethanol/trans_siberian_express name = "Транс-Сибирский Экспресс" desc = "От Владивостока до белой горячки за один день." - icon = 'modular_bandastation/objects/icons/drinks.dmi' + icon = 'modular_bandastation/objects/icons/obj/items/drinks.dmi' icon_state = "trans_siberian_express" /datum/chemical_reaction/drink/trans_siberian_express @@ -482,7 +482,7 @@ required_drink_type = /datum/reagent/consumable/ethanol/rainbow_sky name = "Радужное Небо" desc = "Напиток, переливающийся всеми цветами радуги с нотками галактики." - icon = 'modular_bandastation/objects/icons/drinks.dmi' + icon = 'modular_bandastation/objects/icons/obj/items/drinks.dmi' icon_state = "rainbow_sky" /datum/chemical_reaction/drink/rainbow_sky diff --git a/modular_bandastation/objects/code/hampters.dm b/modular_bandastation/objects/code/items/hampters.dm similarity index 91% rename from modular_bandastation/objects/code/hampters.dm rename to modular_bandastation/objects/code/items/hampters.dm index 8b7838bc816b9..c6bf4a44d58d6 100644 --- a/modular_bandastation/objects/code/hampters.dm +++ b/modular_bandastation/objects/code/items/hampters.dm @@ -1,12 +1,12 @@ /obj/item/toy/plush/hampter name = "хамптер" desc = "Просто плюшевый хамптер. Самый обычный." - icon = 'modular_bandastation/objects/icons/hampter.dmi' + icon = 'modular_bandastation/objects/icons/obj/items/hampter.dmi' icon_state = "hampter" - lefthand_file = 'modular_bandastation/objects/icons/inhands/hampter_lefthand.dmi' - righthand_file = 'modular_bandastation/objects/icons/inhands/hampter_righthand.dmi' + lefthand_file = 'modular_bandastation/objects/icons/mob/inhands/hampter_lefthand.dmi' + righthand_file = 'modular_bandastation/objects/icons/mob/inhands/hampter_righthand.dmi' inhand_icon_state = "hampter" - worn_icon = 'modular_bandastation/objects/icons/inhead/head.dmi' + worn_icon = 'modular_bandastation/objects/icons/mob/clothing/head/hampter.dmi' worn_icon_state = "hampter" slot_flags = ITEM_SLOT_HEAD w_class = WEIGHT_CLASS_TINY diff --git a/modular_bandastation/objects/code/material_pouch.dm b/modular_bandastation/objects/code/items/material_pouch.dm similarity index 95% rename from modular_bandastation/objects/code/material_pouch.dm rename to modular_bandastation/objects/code/items/material_pouch.dm index e26313b1ac076..015b5e20f2865 100644 --- a/modular_bandastation/objects/code/material_pouch.dm +++ b/modular_bandastation/objects/code/items/material_pouch.dm @@ -1,7 +1,7 @@ /obj/item/storage/bag/material_pouch name = "material pouch" desc = "Сумка для хранения листов материалов." - icon = 'modular_bandastation/objects/icons/material_pouch.dmi' + icon = 'modular_bandastation/objects/icons/obj/items/material_pouch.dmi' icon_state = "materialpouch" w_class = WEIGHT_CLASS_BULKY resistance_flags = FLAMMABLE diff --git a/modular_bandastation/objects/code/wallets.dm b/modular_bandastation/objects/code/items/wallets.dm similarity index 85% rename from modular_bandastation/objects/code/wallets.dm rename to modular_bandastation/objects/code/items/wallets.dm index 54d80bc938ae5..155bceaffb78a 100644 --- a/modular_bandastation/objects/code/wallets.dm +++ b/modular_bandastation/objects/code/items/wallets.dm @@ -1,7 +1,7 @@ /obj/item/storage/wallet/nt name = "leather wallet NT" desc = "Ваш кошелек настолько шикарен, что с ним вы выглядите просто потрясающе." - icon = 'modular_bandastation/objects/icons/wallets.dmi' + icon = 'modular_bandastation/objects/icons/obj/items/wallets.dmi' icon_state = "wallet_NT" worn_icon = 'modular_bandastation/objects/icons/onbody/id.dmi' worn_icon_state = "wallet_NT" @@ -10,7 +10,7 @@ /obj/item/storage/wallet/ussp_1 name = "leather USSP wallet" desc = "Говорят, такие кошельки в СССП носят исключительно для зажигалок." - icon = 'modular_bandastation/objects/icons/wallets.dmi' + icon = 'modular_bandastation/objects/icons/obj/items/wallets.dmi' icon_state = "wallet_USSP_1" worn_icon = 'modular_bandastation/objects/icons/onbody/id.dmi' worn_icon_state = "wallet_USSP_1" @@ -19,7 +19,7 @@ /obj/item/storage/wallet/ussp_2 name = "leather USSP wallet" desc = "Говорят, такие кошельки в СССП носят исключительно для зажигалок." - icon = 'modular_bandastation/objects/icons/wallets.dmi' + icon = 'modular_bandastation/objects/icons/obj/items/wallets.dmi' icon_state = "wallet_USSP_2" worn_icon = 'modular_bandastation/objects/icons/onbody/id.dmi' worn_icon_state = "wallet_USSP_2" @@ -30,7 +30,7 @@ desc = "Кошелек, законодателя моды WYCI,\ украшен золотой пуговицей cшит позолочеными и платиновыми нитями, сверх прочный.\ И сверх модный. И сверх дорогой. И сшит по принципу WYCI." - icon = 'modular_bandastation/objects/icons/wallets.dmi' + icon = 'modular_bandastation/objects/icons/obj/items/wallets.dmi' icon_state = "wallet_wyci" worn_icon = 'modular_bandastation/objects/icons/onbody/id.dmi' worn_icon_state = "wallet_wyci" diff --git a/modular_bandastation/objects/code/weapons/melee/centcom/rapier.dm b/modular_bandastation/objects/code/items/weapons/melee/centcom/rapier.dm similarity index 81% rename from modular_bandastation/objects/code/weapons/melee/centcom/rapier.dm rename to modular_bandastation/objects/code/items/weapons/melee/centcom/rapier.dm index 6496a29b13fcb..a350e40bf21ef 100644 --- a/modular_bandastation/objects/code/weapons/melee/centcom/rapier.dm +++ b/modular_bandastation/objects/code/items/weapons/melee/centcom/rapier.dm @@ -1,11 +1,11 @@ /obj/item/melee/sabre/centcom_sabre name = "fleet officer's rapier" desc = "Элегантное оружие более цивилизованной эпохи. Выполнено в классическом стиле с данью флотским традициям прошлого." - icon = 'modular_bandastation/objects/icons/melee.dmi' + icon = 'modular_bandastation/objects/icons/obj/weapons/sword.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' + lefthand_file = 'modular_bandastation/objects/icons/mob/inhands/melee_lefthand.dmi' + righthand_file = 'modular_bandastation/objects/icons/mob/inhands/melee_righthand.dmi' force = 55 demolition_mod = 1 block_chance = 95 @@ -14,11 +14,11 @@ /obj/item/melee/sabre/centcom_katana name = "fleet officer's katana" desc = "Элегантное оружие более цивилизованной эпохи. Выполнено в азиатском стиле с данью Земным культурам прошлого." - icon = 'modular_bandastation/objects/icons/melee.dmi' + icon = 'modular_bandastation/objects/icons/obj/weapons/sword.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' + lefthand_file = 'modular_bandastation/objects/icons/mob/inhands/melee_lefthand.dmi' + righthand_file = 'modular_bandastation/objects/icons/mob/inhands/melee_righthand.dmi' hitsound = 'sound/items/weapons/bladeslice.ogg' force = 55 demolition_mod = 1 @@ -28,10 +28,10 @@ /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 = 'modular_bandastation/objects/icons/obj/clothing/belts.dmi' + worn_icon = 'modular_bandastation/objects/icons/mob/clothing/belt.dmi' + lefthand_file = 'modular_bandastation/objects/icons/mob/inhands/belt_lefthand.dmi' + righthand_file = 'modular_bandastation/objects/icons/mob/inhands/belt_righthand.dmi' icon_state = "centcom_sheath" worn_icon_state = "centcom_sheath" inhand_icon_state = "centcom_sheath" @@ -78,10 +78,10 @@ /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 = 'modular_bandastation/objects/icons/obj/clothing/belts.dmi' + worn_icon = 'modular_bandastation/objects/icons/mob/clothing/belt.dmi' + lefthand_file = 'modular_bandastation/objects/icons/mob/inhands/belt_lefthand.dmi' + righthand_file = 'modular_bandastation/objects/icons/mob/inhands/belt_righthand.dmi' icon_state = "katana_sheath" worn_icon_state = "katana_sheath" inhand_icon_state = "katana_sheath" diff --git a/modular_bandastation/objects/code/weapons/ranged/awaymission_gun.dm b/modular_bandastation/objects/code/items/weapons/ranged/energy/awaymission_gun.dm similarity index 95% rename from modular_bandastation/objects/code/weapons/ranged/awaymission_gun.dm rename to modular_bandastation/objects/code/items/weapons/ranged/energy/awaymission_gun.dm index 59a1af6a673c4..1b61ceeea91c4 100644 --- a/modular_bandastation/objects/code/weapons/ranged/awaymission_gun.dm +++ b/modular_bandastation/objects/code/items/weapons/ranged/energy/awaymission_gun.dm @@ -1,9 +1,9 @@ /obj/item/gun/energy/laser/awaymission_aeg name = "Exploreverse Mk.I" desc = "Прототип оружия с миниатюрным реактором для исследований в крайне отдаленных секторах." - icon = 'modular_bandastation/objects/icons/guns.dmi' - lefthand_file = 'modular_bandastation/objects/icons/inhands/guns_lefthand.dmi' - righthand_file = 'modular_bandastation/objects/icons/inhands/guns_righthand.dmi' + icon = 'modular_bandastation/objects/icons/obj/weapons/guns/energy.dmi' + lefthand_file = 'modular_bandastation/objects/icons/mob/inhands/guns_lefthand.dmi' + righthand_file = 'modular_bandastation/objects/icons/mob/inhands/guns_righthand.dmi' icon_state = "laser_gate" inhand_icon_state = "laser_gate" pin = /obj/item/firing_pin/explorer diff --git a/modular_bandastation/objects/code/papershredder.dm b/modular_bandastation/objects/code/machinery/papershredder.dm similarity index 95% rename from modular_bandastation/objects/code/papershredder.dm rename to modular_bandastation/objects/code/machinery/papershredder.dm index 568b04fdfc9d6..528604c811187 100644 --- a/modular_bandastation/objects/code/papershredder.dm +++ b/modular_bandastation/objects/code/machinery/papershredder.dm @@ -1,7 +1,7 @@ /obj/machinery/papershredder name = "\improper paper shredder" desc = "For those documents you don't want seen." - icon = 'modular_bandastation/objects/icons/papershredder.dmi' + icon = 'modular_bandastation/objects/icons/obj/machines/papershredder.dmi' icon_state = "papershredder0" density = TRUE anchored = TRUE @@ -85,7 +85,7 @@ /obj/item/shredded_paper name = "shredded paper" - icon = 'modular_bandastation/objects/icons/papershredder.dmi' + icon = 'modular_bandastation/objects/icons/obj/machines/papershredder.dmi' icon_state = "shredp" throwforce = 0 w_class = WEIGHT_CLASS_TINY diff --git a/modular_bandastation/objects/code/vending/vending.dm b/modular_bandastation/objects/code/machinery/vending/vending.dm similarity index 100% rename from modular_bandastation/objects/code/vending/vending.dm rename to modular_bandastation/objects/code/machinery/vending/vending.dm diff --git a/modular_bandastation/objects/code/structures/chairs.dm b/modular_bandastation/objects/code/structures/chairs.dm index 84e36e99c8963..de1722983c349 100644 --- a/modular_bandastation/objects/code/structures/chairs.dm +++ b/modular_bandastation/objects/code/structures/chairs.dm @@ -8,8 +8,8 @@ icon_state = "bar_toppled_dark" inhand_icon_state = "stool_bar_dark" origin_type = /obj/structure/chair/stool/bar/dark - lefthand_file = 'modular_bandastation/objects/icons/inhands/chairs_lefthand.dmi' - righthand_file = 'modular_bandastation/objects/icons/inhands/chairs_righthand.dmi' + lefthand_file = 'modular_bandastation/objects/icons/mob/inhands/chairs_lefthand.dmi' + righthand_file = 'modular_bandastation/objects/icons/mob/inhands/chairs_righthand.dmi' MAPPING_DIRECTIONAL_HELPERS(/obj/item/chair/stool/bar/dark, 0) diff --git a/modular_bandastation/objects/code/platform.dm b/modular_bandastation/objects/code/structures/platform.dm similarity index 98% rename from modular_bandastation/objects/code/platform.dm rename to modular_bandastation/objects/code/structures/platform.dm index c0ff41dfd526a..a447f250a53d8 100644 --- a/modular_bandastation/objects/code/platform.dm +++ b/modular_bandastation/objects/code/structures/platform.dm @@ -2,7 +2,7 @@ /obj/structure/platform name = "platform" desc = "A metal platform." - icon = 'modular_bandastation/objects/icons/platform.dmi' + icon = 'modular_bandastation/objects/icons/obj/structures/platform.dmi' icon_state = "metal" flags_1 = ON_BORDER_1 obj_flags = CAN_BE_HIT | IGNORE_DENSITY diff --git a/modular_bandastation/objects/code/structures/posters.dm b/modular_bandastation/objects/code/structures/posters.dm index 161bdd9bce287..662bbc845a7fe 100644 --- a/modular_bandastation/objects/code/structures/posters.dm +++ b/modular_bandastation/objects/code/structures/posters.dm @@ -2,7 +2,7 @@ /obj/structure/sign/poster/contraband/lady name = "Соблазнительная Красотка" desc = "На плакате изображена крайне сексуальная девушка." - icon = 'modular_bandastation/objects/icons/posters.dmi' + icon = 'modular_bandastation/objects/icons/obj/structures/posters.dmi' icon_state = "contraband1" MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/poster/contraband/lady, 32) @@ -10,7 +10,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/poster/contraband/lady, 32) /obj/structure/sign/poster/contraband/very_robust name = "Робаст" desc = "Вы видите слегка потрёпанный плакат, на котором изображен КРАСНЫЙ туллбокс! На плакате написано \"Опасно, робастное!\", некоторые утверждают, что эта красная краска на плакате сделана из настоящей крови." - icon = 'modular_bandastation/objects/icons/posters.dmi' + icon = 'modular_bandastation/objects/icons/obj/structures/posters.dmi' icon_state = "contraband2" MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/poster/contraband/very_robust, 32) @@ -18,7 +18,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/poster/contraband/very_robust, 3 /obj/structure/sign/poster/contraband/vodka name = "Водка" desc = "Рекламный плакат водки, напитка от настоящих мужчин для настоящих мужчин. Почувствуй себя космическим медведем." - icon = 'modular_bandastation/objects/icons/posters.dmi' + icon = 'modular_bandastation/objects/icons/obj/structures/posters.dmi' icon_state = "contraband3" MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/poster/contraband/vodka, 32) @@ -26,7 +26,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/poster/contraband/vodka, 32) /obj/structure/sign/poster/contraband/wanted name = "Вотер Потассиумович" desc = "На плакате вы видите: лысый, черноглазый мужчина, лет 30, и его разыскивают на просторах всего космоса. Что он сделал, чтобы его так разыскивали..." - icon = 'modular_bandastation/objects/icons/posters.dmi' + icon = 'modular_bandastation/objects/icons/obj/structures/posters.dmi' icon_state = "contraband4" MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/poster/contraband/wanted, 32) @@ -34,7 +34,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/poster/contraband/wanted, 32) /obj/structure/sign/poster/contraband/soulless_figures name = "Бездушные фигуры" desc = "Плакат изображает множество безвольно слоняющихся тёмных фигур. Кажется они смотрят прямо на тебя, жуть..." - icon = 'modular_bandastation/objects/icons/posters.dmi' + icon = 'modular_bandastation/objects/icons/obj/structures/posters.dmi' icon_state = "contraband5" MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/poster/contraband/soulless_figures, 32) @@ -42,7 +42,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/poster/contraband/soulless_figur /obj/structure/sign/poster/contraband/your_fate name = "Твоя судьба" desc = "На плакате изображается дом и ряд одинаковых домов уходящих вдаль, расположенных на кровавом полотне. Ниже можно разглядеть тень искореженной руки.\nНад домами возвышаются существа чертоватого вида, а надпись снизу гласит: \"Твоя судьба?\"" - icon = 'modular_bandastation/objects/icons/posters.dmi' + icon = 'modular_bandastation/objects/icons/obj/structures/posters.dmi' icon_state = "contraband6" MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/poster/contraband/your_fate, 32) @@ -50,7 +50,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/poster/contraband/your_fate, 32) /obj/structure/sign/poster/contraband/watching_eye name = "Всевидящее Око" desc = "На плакате изображен глаз, излучающий свет. Текст на плакате гласит: \"Оно следит за\", \"Тобой\"." - icon = 'modular_bandastation/objects/icons/posters.dmi' + icon = 'modular_bandastation/objects/icons/obj/structures/posters.dmi' icon_state = "contraband7" MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/poster/contraband/watching_eye, 32) @@ -59,7 +59,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/poster/contraband/watching_eye, /obj/structure/sign/poster/official/mars name = "Плакат Марса" desc = "Это плакат, выпущенный компанией Generic Space в рамках серии памятных плакатов, посвящённых чудесам космоса." - icon = 'modular_bandastation/objects/icons/posters.dmi' + icon = 'modular_bandastation/objects/icons/obj/structures/posters.dmi' icon_state = "legit1" MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/poster/official/mars, 32) @@ -67,7 +67,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/poster/official/mars, 32) /obj/structure/sign/poster/official/wild_west name = "Дикое Карго" desc = "Красивое дикое место с собственным шерифом." - icon = 'modular_bandastation/objects/icons/posters.dmi' + icon = 'modular_bandastation/objects/icons/obj/structures/posters.dmi' icon_state = "legit2" MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/poster/official/wild_west, 32) @@ -75,7 +75,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/poster/official/wild_west, 32) /obj/structure/sign/poster/official/razumause name = "Разумышь" desc = "Хей-хей! Что может пойти не так, да?" - icon = 'modular_bandastation/objects/icons/posters.dmi' + icon = 'modular_bandastation/objects/icons/obj/structures/posters.dmi' icon_state = "legit3" MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/poster/official/razumause, 32) @@ -83,7 +83,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/poster/official/razumause, 32) /obj/structure/sign/poster/official/assist_pride name = "Гордость ассистента" desc = "Даже в космосе профессия ассистента востребована. И этот плакат демонстрирует их красоту." - icon = 'modular_bandastation/objects/icons/posters.dmi' + icon = 'modular_bandastation/objects/icons/obj/structures/posters.dmi' icon_state = "legit4" MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/poster/official/assist_pride, 32) diff --git a/modular_bandastation/objects/icons/mob/clothing/belt/belt.dmi b/modular_bandastation/objects/icons/mob/clothing/belt.dmi similarity index 100% rename from modular_bandastation/objects/icons/mob/clothing/belt/belt.dmi rename to modular_bandastation/objects/icons/mob/clothing/belt.dmi diff --git a/modular_bandastation/objects/icons/mob/clothing/gloves.dmi b/modular_bandastation/objects/icons/mob/clothing/gloves.dmi new file mode 100644 index 0000000000000..676e4b5edbe68 Binary files /dev/null and b/modular_bandastation/objects/icons/mob/clothing/gloves.dmi differ diff --git a/modular_bandastation/objects/icons/mob/clothing/head/hats.dmi b/modular_bandastation/objects/icons/mob/clothing/head/cap.dmi similarity index 100% rename from modular_bandastation/objects/icons/mob/clothing/head/hats.dmi rename to modular_bandastation/objects/icons/mob/clothing/head/cap.dmi diff --git a/modular_bandastation/objects/icons/inhead/head.dmi b/modular_bandastation/objects/icons/mob/clothing/head/hampter.dmi similarity index 100% rename from modular_bandastation/objects/icons/inhead/head.dmi rename to modular_bandastation/objects/icons/mob/clothing/head/hampter.dmi diff --git a/modular_bandastation/objects/icons/mob/clothing/head/rnd.dmi b/modular_bandastation/objects/icons/mob/clothing/head/hood.dmi similarity index 100% rename from modular_bandastation/objects/icons/mob/clothing/head/rnd.dmi rename to modular_bandastation/objects/icons/mob/clothing/head/hood.dmi diff --git a/modular_bandastation/objects/icons/mob/clothing/suits/rnd.dmi b/modular_bandastation/objects/icons/mob/clothing/neck.dmi similarity index 100% rename from modular_bandastation/objects/icons/mob/clothing/suits/rnd.dmi rename to modular_bandastation/objects/icons/mob/clothing/neck.dmi diff --git a/modular_bandastation/objects/icons/inhands/banners_lefthand.dmi b/modular_bandastation/objects/icons/mob/inhands/banners_lefthand.dmi similarity index 100% rename from modular_bandastation/objects/icons/inhands/banners_lefthand.dmi rename to modular_bandastation/objects/icons/mob/inhands/banners_lefthand.dmi diff --git a/modular_bandastation/objects/icons/inhands/banners_righthand.dmi b/modular_bandastation/objects/icons/mob/inhands/banners_righthand.dmi similarity index 100% rename from modular_bandastation/objects/icons/inhands/banners_righthand.dmi rename to modular_bandastation/objects/icons/mob/inhands/banners_righthand.dmi diff --git a/modular_bandastation/objects/icons/inhands/belt_lefthand.dmi b/modular_bandastation/objects/icons/mob/inhands/belt_lefthand.dmi similarity index 100% rename from modular_bandastation/objects/icons/inhands/belt_lefthand.dmi rename to modular_bandastation/objects/icons/mob/inhands/belt_lefthand.dmi diff --git a/modular_bandastation/objects/icons/inhands/belt_righthand.dmi b/modular_bandastation/objects/icons/mob/inhands/belt_righthand.dmi similarity index 100% rename from modular_bandastation/objects/icons/inhands/belt_righthand.dmi rename to modular_bandastation/objects/icons/mob/inhands/belt_righthand.dmi diff --git a/modular_bandastation/objects/icons/inhands/chairs_lefthand.dmi b/modular_bandastation/objects/icons/mob/inhands/chairs_lefthand.dmi similarity index 100% rename from modular_bandastation/objects/icons/inhands/chairs_lefthand.dmi rename to modular_bandastation/objects/icons/mob/inhands/chairs_lefthand.dmi diff --git a/modular_bandastation/objects/icons/inhands/chairs_righthand.dmi b/modular_bandastation/objects/icons/mob/inhands/chairs_righthand.dmi similarity index 100% rename from modular_bandastation/objects/icons/inhands/chairs_righthand.dmi rename to modular_bandastation/objects/icons/mob/inhands/chairs_righthand.dmi diff --git a/modular_bandastation/objects/icons/mob/inhands/gloves_lefthand.dmi b/modular_bandastation/objects/icons/mob/inhands/gloves_lefthand.dmi new file mode 100644 index 0000000000000..3d7b2113589e6 Binary files /dev/null and b/modular_bandastation/objects/icons/mob/inhands/gloves_lefthand.dmi differ diff --git a/modular_bandastation/objects/icons/mob/inhands/gloves_righthand.dmi b/modular_bandastation/objects/icons/mob/inhands/gloves_righthand.dmi new file mode 100644 index 0000000000000..684657b51f4c3 Binary files /dev/null and b/modular_bandastation/objects/icons/mob/inhands/gloves_righthand.dmi differ diff --git a/modular_bandastation/objects/icons/inhands/guns_lefthand.dmi b/modular_bandastation/objects/icons/mob/inhands/guns_lefthand.dmi similarity index 100% rename from modular_bandastation/objects/icons/inhands/guns_lefthand.dmi rename to modular_bandastation/objects/icons/mob/inhands/guns_lefthand.dmi diff --git a/modular_bandastation/objects/icons/inhands/guns_righthand.dmi b/modular_bandastation/objects/icons/mob/inhands/guns_righthand.dmi similarity index 100% rename from modular_bandastation/objects/icons/inhands/guns_righthand.dmi rename to modular_bandastation/objects/icons/mob/inhands/guns_righthand.dmi diff --git a/modular_bandastation/objects/icons/inhands/hampter_lefthand.dmi b/modular_bandastation/objects/icons/mob/inhands/hampter_lefthand.dmi similarity index 100% rename from modular_bandastation/objects/icons/inhands/hampter_lefthand.dmi rename to modular_bandastation/objects/icons/mob/inhands/hampter_lefthand.dmi diff --git a/modular_bandastation/objects/icons/inhands/hampter_righthand.dmi b/modular_bandastation/objects/icons/mob/inhands/hampter_righthand.dmi similarity index 100% rename from modular_bandastation/objects/icons/inhands/hampter_righthand.dmi rename to modular_bandastation/objects/icons/mob/inhands/hampter_righthand.dmi diff --git a/modular_bandastation/objects/icons/inhands/melee_lefthand.dmi b/modular_bandastation/objects/icons/mob/inhands/melee_lefthand.dmi similarity index 100% rename from modular_bandastation/objects/icons/inhands/melee_lefthand.dmi rename to modular_bandastation/objects/icons/mob/inhands/melee_lefthand.dmi diff --git a/modular_bandastation/objects/icons/inhands/melee_righthand.dmi b/modular_bandastation/objects/icons/mob/inhands/melee_righthand.dmi similarity index 100% rename from modular_bandastation/objects/icons/inhands/melee_righthand.dmi rename to modular_bandastation/objects/icons/mob/inhands/melee_righthand.dmi diff --git a/modular_bandastation/objects/icons/belt.dmi b/modular_bandastation/objects/icons/obj/clothing/belts.dmi similarity index 100% rename from modular_bandastation/objects/icons/belt.dmi rename to modular_bandastation/objects/icons/obj/clothing/belts.dmi diff --git a/modular_bandastation/objects/icons/obj/clothing/gloves.dmi b/modular_bandastation/objects/icons/obj/clothing/gloves.dmi new file mode 100644 index 0000000000000..34d2040f2d448 Binary files /dev/null and b/modular_bandastation/objects/icons/obj/clothing/gloves.dmi differ diff --git a/modular_bandastation/objects/icons/obj/clothing/head/rnd.dmi b/modular_bandastation/objects/icons/obj/clothing/head/hood.dmi similarity index 100% rename from modular_bandastation/objects/icons/obj/clothing/head/rnd.dmi rename to modular_bandastation/objects/icons/obj/clothing/head/hood.dmi diff --git a/modular_bandastation/objects/icons/obj/clothing/suits/rnd.dmi b/modular_bandastation/objects/icons/obj/clothing/neck.dmi similarity index 100% rename from modular_bandastation/objects/icons/obj/clothing/suits/rnd.dmi rename to modular_bandastation/objects/icons/obj/clothing/neck.dmi diff --git a/modular_bandastation/objects/icons/drinks.dmi b/modular_bandastation/objects/icons/obj/items/drinks.dmi similarity index 100% rename from modular_bandastation/objects/icons/drinks.dmi rename to modular_bandastation/objects/icons/obj/items/drinks.dmi diff --git a/modular_bandastation/objects/icons/hampter.dmi b/modular_bandastation/objects/icons/obj/items/hampter.dmi similarity index 100% rename from modular_bandastation/objects/icons/hampter.dmi rename to modular_bandastation/objects/icons/obj/items/hampter.dmi diff --git a/modular_bandastation/objects/icons/material_pouch.dmi b/modular_bandastation/objects/icons/obj/items/material_pouch.dmi similarity index 100% rename from modular_bandastation/objects/icons/material_pouch.dmi rename to modular_bandastation/objects/icons/obj/items/material_pouch.dmi diff --git a/modular_bandastation/objects/icons/wallets.dmi b/modular_bandastation/objects/icons/obj/items/wallets.dmi similarity index 100% rename from modular_bandastation/objects/icons/wallets.dmi rename to modular_bandastation/objects/icons/obj/items/wallets.dmi diff --git a/modular_bandastation/objects/icons/papershredder.dmi b/modular_bandastation/objects/icons/obj/machines/papershredder.dmi similarity index 100% rename from modular_bandastation/objects/icons/papershredder.dmi rename to modular_bandastation/objects/icons/obj/machines/papershredder.dmi diff --git a/modular_bandastation/objects/icons/chemical_tanks.dmi b/modular_bandastation/objects/icons/obj/structures/chemical_tanks.dmi similarity index 100% rename from modular_bandastation/objects/icons/chemical_tanks.dmi rename to modular_bandastation/objects/icons/obj/structures/chemical_tanks.dmi diff --git a/modular_bandastation/objects/icons/platform.dmi b/modular_bandastation/objects/icons/obj/structures/platform.dmi similarity index 100% rename from modular_bandastation/objects/icons/platform.dmi rename to modular_bandastation/objects/icons/obj/structures/platform.dmi diff --git a/modular_bandastation/objects/icons/posters.dmi b/modular_bandastation/objects/icons/obj/structures/posters.dmi similarity index 100% rename from modular_bandastation/objects/icons/posters.dmi rename to modular_bandastation/objects/icons/obj/structures/posters.dmi diff --git a/modular_bandastation/objects/icons/guns.dmi b/modular_bandastation/objects/icons/obj/weapons/guns/energy.dmi similarity index 100% rename from modular_bandastation/objects/icons/guns.dmi rename to modular_bandastation/objects/icons/obj/weapons/guns/energy.dmi diff --git a/modular_bandastation/objects/icons/melee.dmi b/modular_bandastation/objects/icons/obj/weapons/sword.dmi similarity index 100% rename from modular_bandastation/objects/icons/melee.dmi rename to modular_bandastation/objects/icons/obj/weapons/sword.dmi