diff --git a/modular_ss220/clothing/_clothing.dme b/modular_ss220/clothing/_clothing.dme index 59210474bced..f6e5e9312efe 100644 --- a/modular_ss220/clothing/_clothing.dme +++ b/modular_ss220/clothing/_clothing.dme @@ -1,5 +1,6 @@ #include "_clothing.dm" +#include "code/accessories.dm" #include "code/suits.dm" #include "code/shoes.dm" #include "code/gloves.dm" @@ -9,4 +10,5 @@ #include "code/cloaks.dm" #include "code/garment_bag.dm" #include "code/hev_suit.dm" -#include "code/wallets.dm" +#include "code/hats.dm" +#include "code/clothing_vendors.dm" diff --git a/modular_ss220/clothing/code/accessories.dm b/modular_ss220/clothing/code/accessories.dm new file mode 100644 index 000000000000..a83286628fab --- /dev/null +++ b/modular_ss220/clothing/code/accessories.dm @@ -0,0 +1,32 @@ +/obj/item/storage/belt/chef/apron + name = "фартук" + desc = "Фартук с широкими карманами. Такому обзавидуется любой мясник." + icon = 'modular_ss220/clothing/icons/object/accessories.dmi' + icon_state = "apron" + item_state = "apron" + sprite_sheets = list( + "Abductor" = 'modular_ss220/clothing/icons/mob/accessories.dmi', + "Ancient Skeleton" = 'modular_ss220/clothing/icons/mob/accessories.dmi', + "Diona" = 'modular_ss220/clothing/icons/mob/accessories.dmi', + "Drask" = 'modular_ss220/clothing/icons/mob/species/drask/accessories.dmi', + "Golem" = 'modular_ss220/clothing/icons/mob/accessories.dmi', + "Grey" = 'modular_ss220/clothing/icons/mob/species/grey/accessories.dmi', + "Human" = 'modular_ss220/clothing/icons/mob/accessories.dmi', + "Kidan" = 'modular_ss220/clothing/icons/mob/accessories.dmi', + "Machine" = 'modular_ss220/clothing/icons/mob/accessories.dmi', + "Monkey" = 'modular_ss220/clothing/icons/mob/species/monkey/accessories.dmi', + "Nian" = 'modular_ss220/clothing/icons/mob/accessories.dmi', + "Plasmaman" = 'modular_ss220/clothing/icons/mob/accessories.dmi', + "Shadow" = 'modular_ss220/clothing/icons/mob/accessories.dmi', + "Skrell" = 'modular_ss220/clothing/icons/mob/accessories.dmi', + "Slime People" = 'modular_ss220/clothing/icons/mob/accessories.dmi', + "Tajaran" = 'modular_ss220/clothing/icons/mob/accessories.dmi', + "Unathi" = 'modular_ss220/clothing/icons/mob/accessories.dmi', + "Vox" = 'modular_ss220/clothing/icons/mob/species/vox/accessories.dmi', + "Vulpkanin" = 'modular_ss220/clothing/icons/mob/accessories.dmi', + ) + +/obj/item/storage/belt/chef/apron/red + name = "красный фартук" + icon_state = "apron_red" + item_state = "apron_red" diff --git a/modular_ss220/clothing/code/clothing_vendors.dm b/modular_ss220/clothing/code/clothing_vendors.dm new file mode 100644 index 000000000000..f81c968c0b00 --- /dev/null +++ b/modular_ss220/clothing/code/clothing_vendors.dm @@ -0,0 +1,25 @@ +/obj/machinery/economy/vending/autodrobe/Initialize(mapload) + products += list( + /obj/item/clothing/head/ratge = 1, + ) + prices += list( + /obj/item/clothing/head/ratge = 75, + ) + . = ..() + +/obj/machinery/economy/vending/chefdrobe/Initialize(mapload) + products += list( + /obj/item/clothing/under/rank/civilian/chef/red = 2, + /obj/item/clothing/suit/chef/red = 2, + /obj/item/clothing/head/chefhat/red = 2, + /obj/item/storage/belt/chef/apron = 1, + /obj/item/storage/belt/chef/apron/red = 1, + ) + prices += list( + /obj/item/clothing/under/rank/civilian/chef/red = 50, + /obj/item/clothing/suit/chef/red = 50, + /obj/item/clothing/head/chefhat/red = 50, + /obj/item/storage/belt/chef/apron = 75, + /obj/item/storage/belt/chef/apron/red = 75, + ) + . = ..() diff --git a/modular_ss220/clothing/code/gloves.dm b/modular_ss220/clothing/code/gloves.dm index 888291353e30..8aba91917253 100644 --- a/modular_ss220/clothing/code/gloves.dm +++ b/modular_ss220/clothing/code/gloves.dm @@ -4,4 +4,3 @@ icon = 'modular_ss220/clothing/icons/object/gloves.dmi' icon_state = "bike_gloves" icon_override = 'modular_ss220/clothing/icons/mob/hands.dmi' - item_state = "bike_gloves" diff --git a/modular_ss220/clothing/code/hats.dm b/modular_ss220/clothing/code/hats.dm new file mode 100644 index 000000000000..4b8d0e0b08f0 --- /dev/null +++ b/modular_ss220/clothing/code/hats.dm @@ -0,0 +1,65 @@ +/obj/item/clothing/head/caphat/beret_black + name = "чёрный капитанский берет" + desc = "Хорошо быть королём." + icon = 'modular_ss220/clothing/icons/object/hats.dmi' + icon_state = "cap_beret_black" + icon_override = 'modular_ss220/clothing/icons/mob/hats.dmi' + +/obj/item/clothing/head/ratge + name = "ratge head" + desc = "Ну ты и крыса!" + icon = 'modular_ss220/clothing/icons/object/hats.dmi' + icon_state = "ratgehead" + lefthand_file = 'modular_ss220/clothing/icons/inhands/left_hand.dmi' + righthand_file = 'modular_ss220/clothing/icons/inhands/right_hand.dmi' + flags = BLOCKHAIR + flags_inv = HIDEMASK | HIDEEARS | HIDEEYES | HIDEFACE + flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH + sprite_sheets = list( + "Abductor" = 'modular_ss220/clothing/icons/mob/hats.dmi', + "Ancient Skeleton" = 'modular_ss220/clothing/icons/mob/hats.dmi', + "Diona" = 'modular_ss220/clothing/icons/mob/hats.dmi', + "Drask" = 'modular_ss220/clothing/icons/mob/hats.dmi', + "Golem" = 'modular_ss220/clothing/icons/mob/hats.dmi', + "Grey" = 'modular_ss220/clothing/icons/mob/species/grey/hats.dmi', + "Human" = 'modular_ss220/clothing/icons/mob/hats.dmi', + "Kidan" = 'modular_ss220/clothing/icons/mob/species/kidan/hats.dmi', + "Machine" = 'modular_ss220/clothing/icons/mob/hats.dmi', + "Monkey" = 'modular_ss220/clothing/icons/mob/hats.dmi', + "Nian" = 'modular_ss220/clothing/icons/mob/hats.dmi', + "Plasmaman" = 'modular_ss220/clothing/icons/mob/hats.dmi', + "Shadow" = 'modular_ss220/clothing/icons/mob/hats.dmi', + "Skrell" = 'modular_ss220/clothing/icons/mob/hats.dmi', + "Slime People" = 'modular_ss220/clothing/icons/mob/hats.dmi', + "Tajaran" = 'modular_ss220/clothing/icons/mob/species/tajaran/hats.dmi', + "Unathi" = 'modular_ss220/clothing/icons/mob/hats.dmi', + "Vox" = 'modular_ss220/clothing/icons/mob/hats.dmi', + "Vulpkanin" = 'modular_ss220/clothing/icons/mob/species/vulpkanin/hats.dmi', + ) + +/obj/item/clothing/head/chefhat/red + name = "chef's red hat" + desc = "Красный поварской колпак, для тех, кто хочет показать что он тут настоящий босс кухни." + icon = 'modular_ss220/clothing/icons/object/hats.dmi' + icon_state = "chef_red" + sprite_sheets = list( + "Abductor" = 'modular_ss220/clothing/icons/mob/hats.dmi', + "Ancient Skeleton" = 'modular_ss220/clothing/icons/mob/hats.dmi', + "Diona" = 'modular_ss220/clothing/icons/mob/hats.dmi', + "Drask" = 'modular_ss220/clothing/icons/mob/hats.dmi', + "Golem" = 'modular_ss220/clothing/icons/mob/hats.dmi', + "Grey" = 'modular_ss220/clothing/icons/mob/species/grey/hats.dmi', + "Human" = 'modular_ss220/clothing/icons/mob/hats.dmi', + "Kidan" = 'modular_ss220/clothing/icons/mob/hats.dmi', + "Machine" = 'modular_ss220/clothing/icons/mob/hats.dmi', + "Monkey" = 'modular_ss220/clothing/icons/mob/species/monkey/hats.dmi', + "Nian" = 'modular_ss220/clothing/icons/mob/hats.dmi', + "Plasmaman" = 'modular_ss220/clothing/icons/mob/hats.dmi', + "Shadow" = 'modular_ss220/clothing/icons/mob/hats.dmi', + "Skrell" = 'modular_ss220/clothing/icons/mob/hats.dmi', + "Slime People" = 'modular_ss220/clothing/icons/mob/hats.dmi', + "Tajaran" = 'modular_ss220/clothing/icons/mob/hats.dmi', + "Unathi" = 'modular_ss220/clothing/icons/mob/hats.dmi', + "Vox" = 'modular_ss220/clothing/icons/mob/species/vox/hats.dmi', + "Vulpkanin" = 'modular_ss220/clothing/icons/mob/hats.dmi', + ) diff --git a/modular_ss220/clothing/code/helmet.dm b/modular_ss220/clothing/code/helmet.dm index d1ec5e848e05..059da692254b 100644 --- a/modular_ss220/clothing/code/helmet.dm +++ b/modular_ss220/clothing/code/helmet.dm @@ -3,8 +3,6 @@ desc = "Крутой шлем." icon = 'modular_ss220/clothing/icons/object/hats.dmi' icon_state = "bike_helmet" - icon_override = 'modular_ss220/clothing/icons/mob/hats.dmi' - item_state = "bike_helmet" lefthand_file = 'modular_ss220/clothing/icons/inhands/left_hand.dmi' righthand_file = 'modular_ss220/clothing/icons/inhands/right_hand.dmi' toggle_message = "Вы опустили защитное стекло" @@ -14,22 +12,27 @@ toggle_sound = 'sound/weapons/tap.ogg' dog_fashion = null sprite_sheets = list( - "Drask" = 'modular_ss220/clothing/icons/mob/species/drask/helmet.dmi', - "Skrell" = 'modular_ss220/clothing/icons/mob/species/skrell/helmet.dmi', - "Tajaran" = 'modular_ss220/clothing/icons/mob/species/tajaran/helmet.dmi', - "Unathi" = 'modular_ss220/clothing/icons/mob/species/unathi/helmet.dmi', - "Vox" = 'modular_ss220/clothing/icons/mob/species/vox/helmet.dmi', - "Vulpkanin" = 'modular_ss220/clothing/icons/mob/species/vulpkanin/helmet.dmi', + "Abductor" = 'modular_ss220/clothing/icons/mob/hats.dmi', + "Ancient Skeleton" = 'modular_ss220/clothing/icons/mob/hats.dmi', + "Diona" = 'modular_ss220/clothing/icons/mob/hats.dmi', + "Drask" = 'modular_ss220/clothing/icons/mob/species/drask/helmet.dmi', + "Golem" = 'modular_ss220/clothing/icons/mob/hats.dmi', + "Grey" = 'modular_ss220/clothing/icons/mob/hats.dmi', + "Human" = 'modular_ss220/clothing/icons/mob/hats.dmi', + "Kidan" = 'modular_ss220/clothing/icons/mob/hats.dmi', + "Machine" = 'modular_ss220/clothing/icons/mob/hats.dmi', + "Monkey" = 'modular_ss220/clothing/icons/mob/hats.dmi', + "Nian" = 'modular_ss220/clothing/icons/mob/hats.dmi', + "Plasmaman" = 'modular_ss220/clothing/icons/mob/hats.dmi', + "Shadow" = 'modular_ss220/clothing/icons/mob/hats.dmi', + "Skrell" = 'modular_ss220/clothing/icons/mob/species/skrell/helmet.dmi', + "Slime People" = 'modular_ss220/clothing/icons/mob/hats.dmi', + "Tajaran" = 'modular_ss220/clothing/icons/mob/species/tajaran/helmet.dmi', + "Unathi" = 'modular_ss220/clothing/icons/mob/species/unathi/helmet.dmi', + "Vox" = 'modular_ss220/clothing/icons/mob/species/vox/helmet.dmi', + "Vulpkanin" = 'modular_ss220/clothing/icons/mob/species/vulpkanin/helmet.dmi', ) /obj/item/clothing/head/helmet/bike_helmet/replica desc = "Крутой шлем. На вид хлипкий..." armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "rad" = 0, "fire" = 0, "acid" = 0) - -/obj/item/clothing/head/caphat/beret_black - name = "чёрный капитанский берет" - desc = "Хорошо быть королём." - icon = 'modular_ss220/clothing/icons/object/hats.dmi' - icon_state = "cap_beret_black" - icon_override = 'modular_ss220/clothing/icons/mob/hats.dmi' - item_state = "cap_beret_black" diff --git a/modular_ss220/clothing/code/hev_suit.dm b/modular_ss220/clothing/code/hev_suit.dm index c92cae7db2dd..00452b5e2d99 100644 --- a/modular_ss220/clothing/code/hev_suit.dm +++ b/modular_ss220/clothing/code/hev_suit.dm @@ -8,7 +8,6 @@ icon = 'modular_ss220/clothing/icons/object/suits.dmi' icon_state = "hev" icon_override = 'modular_ss220/clothing/icons/mob/suits.dmi' - item_state = "hev" lefthand_file = 'modular_ss220/clothing/icons/inhands/left_hand.dmi' righthand_file = 'modular_ss220/clothing/icons/inhands/right_hand.dmi' resistance_flags = FIRE_PROOF | ACID_PROOF | FREEZE_PROOF | STOPSPRESSUREDMAGE diff --git a/modular_ss220/clothing/code/mask.dm b/modular_ss220/clothing/code/mask.dm index bb564a5bc64b..16f632d60b54 100644 --- a/modular_ss220/clothing/code/mask.dm +++ b/modular_ss220/clothing/code/mask.dm @@ -60,7 +60,6 @@ icon = 'modular_ss220/clothing/icons/object/masks.dmi' icon_state = "red_gas" icon_override = 'modular_ss220/clothing/icons/mob/mask.dmi' - item_state = "red_gas" /obj/item/clothing/mask/breath/breathscarf name = "шарф с системой дыхания" @@ -68,4 +67,3 @@ icon = 'modular_ss220/clothing/icons/object/masks.dmi' icon_override = 'modular_ss220/clothing/icons/mob/mask.dmi' icon_state = "breathscarf" - item_state = "breathscarf" diff --git a/modular_ss220/clothing/code/shoes.dm b/modular_ss220/clothing/code/shoes.dm index 8d9f149b11d0..8bcb47b543f0 100644 --- a/modular_ss220/clothing/code/shoes.dm +++ b/modular_ss220/clothing/code/shoes.dm @@ -7,7 +7,6 @@ icon = 'modular_ss220/clothing/icons/object/shoes.dmi' icon_state = "neon" icon_override = 'modular_ss220/clothing/icons/mob/shoes.dmi' - item_color = "neon" lefthand_file = 'modular_ss220/clothing/icons/inhands/left_hand.dmi' righthand_file = 'modular_ss220/clothing/icons/inhands/right_hand.dmi' actions_types = list(/datum/action/item_action/toggle_light, /datum/action/item_action/change_color) @@ -58,11 +57,9 @@ icon = 'modular_ss220/clothing/icons/object/shoes.dmi' icon_state = "shark" icon_override = 'modular_ss220/clothing/icons/mob/shoes.dmi' - item_state = "shark" lefthand_file = 'modular_ss220/clothing/icons/inhands/left_hand.dmi' righthand_file = 'modular_ss220/clothing/icons/inhands/right_hand.dmi' /obj/item/clothing/shoes/shark/light name = "светло-голубые акульи тапочки" icon_state = "shark_light" - item_state = "shark_light" diff --git a/modular_ss220/clothing/code/suits.dm b/modular_ss220/clothing/code/suits.dm index 9f9f64c469fd..96a8aa00541b 100644 --- a/modular_ss220/clothing/code/suits.dm +++ b/modular_ss220/clothing/code/suits.dm @@ -4,7 +4,6 @@ icon = 'modular_ss220/clothing/icons/object/suits.dmi' icon_state = "v_jacket" icon_override = 'modular_ss220/clothing/icons/mob/suits.dmi' - item_state = "v_jacket" lefthand_file = 'modular_ss220/clothing/icons/inhands/left_hand.dmi' righthand_file = 'modular_ss220/clothing/icons/inhands/right_hand.dmi' flags_inv = HIDEJUMPSUIT @@ -15,7 +14,6 @@ icon = 'modular_ss220/clothing/icons/object/suits.dmi' icon_state = "takemura_jacket" icon_override = 'modular_ss220/clothing/icons/mob/suits.dmi' - item_state = "takemura_jacket" lefthand_file = 'modular_ss220/clothing/icons/inhands/left_hand.dmi' righthand_file = 'modular_ss220/clothing/icons/inhands/right_hand.dmi' flags_inv = HIDEJUMPSUIT @@ -26,7 +24,6 @@ icon = 'modular_ss220/clothing/icons/object/suits.dmi' icon_state = "katarina_jacket" icon_override = 'modular_ss220/clothing/icons/mob/suits.dmi' - item_state = "katarina_jacket" lefthand_file = 'modular_ss220/clothing/icons/inhands/left_hand.dmi' righthand_file = 'modular_ss220/clothing/icons/inhands/right_hand.dmi' flags_inv = HIDEJUMPSUIT @@ -37,7 +34,6 @@ icon = 'modular_ss220/clothing/icons/object/suits.dmi' icon_state = "katarina_cyberjacket" icon_override = 'modular_ss220/clothing/icons/mob/suits.dmi' - item_state = "katarina_cyberjacket" lefthand_file = 'modular_ss220/clothing/icons/inhands/left_hand.dmi' righthand_file = 'modular_ss220/clothing/icons/inhands/right_hand.dmi' flags_inv = HIDEJUMPSUIT @@ -48,7 +44,6 @@ icon = 'modular_ss220/clothing/icons/object/suits.dmi' icon_state = "shark_casual" icon_override = 'modular_ss220/clothing/icons/mob/suits.dmi' - item_state = "shark_casual" lefthand_file = 'modular_ss220/clothing/icons/inhands/left_hand.dmi' righthand_file = 'modular_ss220/clothing/icons/inhands/right_hand.dmi' body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS @@ -63,7 +58,6 @@ icon = 'modular_ss220/clothing/icons/object/hats.dmi' icon_state = "shark_casual" icon_override = 'modular_ss220/clothing/icons/mob/hats.dmi' - item_state = "shark_casual" body_parts_covered = HEAD cold_protection = HEAD min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT @@ -73,13 +67,11 @@ /obj/item/clothing/suit/hooded/shark_costume/light name = "светло-голубой костюм акулы" icon_state = "shark_casual_light" - item_state = "shark_casual_light" hoodtype = /obj/item/clothing/head/hooded/shark_hood/light /obj/item/clothing/head/hooded/shark_hood/light name = "светло-голубой акулий капюшон" icon_state = "shark_casual_light" - item_state = "shark_casual_light" /obj/item/clothing/suit/space/deathsquad/officer/syndie name = "куртка офицера синдиката" @@ -87,7 +79,6 @@ icon = 'modular_ss220/clothing/icons/object/suits.dmi' icon_state = "jacket_syndie" icon_override = 'modular_ss220/clothing/icons/mob/suits.dmi' - item_state = "jacket_syndie" /obj/item/clothing/suit/space/deathsquad/officer/field name = "полевая форма офицера флота Нанотрейзен" @@ -95,7 +86,6 @@ icon = 'modular_ss220/clothing/icons/object/suits.dmi' icon_state = "ntsc_uniform" icon_override = 'modular_ss220/clothing/icons/mob/suits.dmi' - item_state = "ntsc_uniform" /obj/item/clothing/suit/hooded/vi_arcane name = "куртка Вай" @@ -103,7 +93,6 @@ icon = 'modular_ss220/clothing/icons/object/suits.dmi' icon_state = "vi_arcane" icon_override = 'modular_ss220/clothing/icons/mob/suits.dmi' - item_state = "vi_arcane" lefthand_file = 'modular_ss220/clothing/icons/inhands/left_hand.dmi' righthand_file = 'modular_ss220/clothing/icons/inhands/right_hand.dmi' flags_inv = HIDEJUMPSUIT @@ -115,7 +104,6 @@ icon = 'modular_ss220/clothing/icons/object/hats.dmi' icon_state = "vi_arcane" icon_override = 'modular_ss220/clothing/icons/mob/hats.dmi' - item_state = "vi_arcane" body_parts_covered = HEAD cold_protection = HEAD min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT @@ -125,13 +113,11 @@ /obj/item/clothing/suit/hooded/vi_arcane name = "жакет Вай" icon_state = "vi_arcane" - item_state = "vi_arcane" hoodtype = /obj/item/clothing/head/hooded/vi_arcane /obj/item/clothing/head/hooded/vi_arcane name = "капюшон Вай" icon_state = "vi_arcane" - item_state = "vi_arcane" /obj/item/clothing/suit/soundhand_black_jacket name = "черная куртка группы Саундхэнд." @@ -139,7 +125,6 @@ icon = 'modular_ss220/clothing/icons/object/suits.dmi' icon_state = "soundhand_black_jacket" icon_override = 'modular_ss220/clothing/icons/mob/suits.dmi' - item_state = "soundhand_black_jacket" lefthand_file = 'modular_ss220/clothing/icons/inhands/left_hand.dmi' righthand_file = 'modular_ss220/clothing/icons/inhands/right_hand.dmi' @@ -159,7 +144,6 @@ icon = 'modular_ss220/clothing/icons/object/suits.dmi' icon_state = "soundhand_olive_jacket" icon_override = 'modular_ss220/clothing/icons/mob/suits.dmi' - item_state = "soundhand_olive_jacket" lefthand_file = 'modular_ss220/clothing/icons/inhands/left_hand.dmi' righthand_file = 'modular_ss220/clothing/icons/inhands/right_hand.dmi' @@ -179,7 +163,6 @@ icon = 'modular_ss220/clothing/icons/object/suits.dmi' icon_state = "soundhand_brown_jacket" icon_override = 'modular_ss220/clothing/icons/mob/suits.dmi' - item_state = "soundhand_brown_jacket" lefthand_file = 'modular_ss220/clothing/icons/inhands/left_hand.dmi' righthand_file = 'modular_ss220/clothing/icons/inhands/right_hand.dmi' @@ -192,3 +175,30 @@ item_state = "soundhand_brown_jacket" lefthand_file = 'modular_ss220/clothing/icons/inhands/left_hand.dmi' righthand_file = 'modular_ss220/clothing/icons/inhands/right_hand.dmi' + +/obj/item/clothing/suit/chef/red + name = "chef's red apron" + desc = "Хорошо скроенный поварской китель." + icon = 'modular_ss220/clothing/icons/object/suits.dmi' + icon_state = "chef_red" + sprite_sheets = list( + "Abductor" = 'modular_ss220/clothing/icons/mob/suits.dmi', + "Ancient Skeleton" = 'modular_ss220/clothing/icons/mob/suits.dmi', + "Diona" = 'modular_ss220/clothing/icons/mob/suits.dmi', + "Drask" = 'modular_ss220/clothing/icons/mob/species/drask/suits.dmi', + "Golem" = 'modular_ss220/clothing/icons/mob/suits.dmi', + "Grey" = 'modular_ss220/clothing/icons/mob/species/grey/suits.dmi', + "Human" = 'modular_ss220/clothing/icons/mob/suits.dmi', + "Kidan" = 'modular_ss220/clothing/icons/mob/suits.dmi', + "Machine" = 'modular_ss220/clothing/icons/mob/suits.dmi', + "Monkey" = 'modular_ss220/clothing/icons/mob/species/monkey/suits.dmi', + "Nian" = 'modular_ss220/clothing/icons/mob/suits.dmi', + "Plasmaman" = 'modular_ss220/clothing/icons/mob/suits.dmi', + "Shadow" = 'modular_ss220/clothing/icons/mob/suits.dmi', + "Skrell" = 'modular_ss220/clothing/icons/mob/suits.dmi', + "Slime People" = 'modular_ss220/clothing/icons/mob/suits.dmi', + "Tajaran" = 'modular_ss220/clothing/icons/mob/suits.dmi', + "Unathi" = 'modular_ss220/clothing/icons/mob/suits.dmi', + "Vox" = 'modular_ss220/clothing/icons/mob/species/vox/suits.dmi', + "Vulpkanin" = 'modular_ss220/clothing/icons/mob/suits.dmi', + ) diff --git a/modular_ss220/clothing/code/under.dm b/modular_ss220/clothing/code/under.dm index 7f7c0e873af4..20ed6e8edfe7 100644 --- a/modular_ss220/clothing/code/under.dm +++ b/modular_ss220/clothing/code/under.dm @@ -4,11 +4,9 @@ icon = 'modular_ss220/clothing/icons/object/under.dmi' icon_state = "katarina_cybersuit" icon_override = 'modular_ss220/clothing/icons/mob/under.dmi' - item_state = "katarina_cybersuit" lefthand_file = 'modular_ss220/clothing/icons/inhands/left_hand.dmi' righthand_file = 'modular_ss220/clothing/icons/inhands/right_hand.dmi' item_color = "katarina_cybersuit" - sprite_sheets = null /obj/item/clothing/under/costume/katarina_suit name = "костюм Катарины" @@ -16,8 +14,34 @@ icon = 'modular_ss220/clothing/icons/object/under.dmi' icon_state = "katarina_suit" icon_override = 'modular_ss220/clothing/icons/mob/under.dmi' - item_state = "katarina_suit" lefthand_file = 'modular_ss220/clothing/icons/inhands/left_hand.dmi' righthand_file = 'modular_ss220/clothing/icons/inhands/right_hand.dmi' item_color = "katarina_suit" - sprite_sheets = null + +/obj/item/clothing/under/rank/civilian/chef/red + name = "chef's red uniform" + desc = "Униформа повара с пуговицами на одну сторону." + icon = 'modular_ss220/clothing/icons/object/under.dmi' + icon_state = "chef_red" + item_color = "chef_red" + sprite_sheets = list( + "Abductor" = 'modular_ss220/clothing/icons/mob/under.dmi', + "Ancient Skeleton" = 'modular_ss220/clothing/icons/mob/under.dmi', + "Diona" = 'modular_ss220/clothing/icons/mob/under.dmi', + "Drask" = 'modular_ss220/clothing/icons/mob/species/drask/under.dmi', + "Golem" = 'modular_ss220/clothing/icons/mob/under.dmi', + "Grey" = 'modular_ss220/clothing/icons/mob/species/grey/under.dmi', + "Human" = 'modular_ss220/clothing/icons/mob/under.dmi', + "Kidan" = 'modular_ss220/clothing/icons/mob/under.dmi', + "Machine" = 'modular_ss220/clothing/icons/mob/under.dmi', + "Monkey" = 'modular_ss220/clothing/icons/mob/species/monkey/under.dmi', + "Nian" = 'modular_ss220/clothing/icons/mob/under.dmi', + "Plasmaman" = 'modular_ss220/clothing/icons/mob/under.dmi', + "Shadow" = 'modular_ss220/clothing/icons/mob/under.dmi', + "Skrell" = 'modular_ss220/clothing/icons/mob/under.dmi', + "Slime People" = 'modular_ss220/clothing/icons/mob/under.dmi', + "Tajaran" = 'modular_ss220/clothing/icons/mob/under.dmi', + "Unathi" = 'modular_ss220/clothing/icons/mob/species/unathi/under.dmi', + "Vox" = 'modular_ss220/clothing/icons/mob/species/vox/under.dmi', + "Vulpkanin" = 'modular_ss220/clothing/icons/mob/under.dmi', + ) diff --git a/modular_ss220/clothing/icons/inhands/left_hand.dmi b/modular_ss220/clothing/icons/inhands/left_hand.dmi index 0a1062ec8118..3fc304464b9f 100644 Binary files a/modular_ss220/clothing/icons/inhands/left_hand.dmi and b/modular_ss220/clothing/icons/inhands/left_hand.dmi differ diff --git a/modular_ss220/clothing/icons/inhands/right_hand.dmi b/modular_ss220/clothing/icons/inhands/right_hand.dmi index c6b080d0cc1a..b417ad7fa654 100644 Binary files a/modular_ss220/clothing/icons/inhands/right_hand.dmi and b/modular_ss220/clothing/icons/inhands/right_hand.dmi differ diff --git a/modular_ss220/clothing/icons/mob/accessories.dmi b/modular_ss220/clothing/icons/mob/accessories.dmi new file mode 100644 index 000000000000..1012e226c4bc Binary files /dev/null and b/modular_ss220/clothing/icons/mob/accessories.dmi differ diff --git a/modular_ss220/clothing/icons/mob/hats.dmi b/modular_ss220/clothing/icons/mob/hats.dmi index f9c824db12cd..af65b471a6d1 100644 Binary files a/modular_ss220/clothing/icons/mob/hats.dmi and b/modular_ss220/clothing/icons/mob/hats.dmi differ diff --git a/modular_ss220/clothing/icons/mob/species/drask/accessories.dmi b/modular_ss220/clothing/icons/mob/species/drask/accessories.dmi new file mode 100644 index 000000000000..a63a43c32f8d Binary files /dev/null and b/modular_ss220/clothing/icons/mob/species/drask/accessories.dmi differ diff --git a/modular_ss220/clothing/icons/mob/species/drask/suits.dmi b/modular_ss220/clothing/icons/mob/species/drask/suits.dmi new file mode 100644 index 000000000000..f7f00717c40e Binary files /dev/null and b/modular_ss220/clothing/icons/mob/species/drask/suits.dmi differ diff --git a/modular_ss220/clothing/icons/mob/species/drask/under.dmi b/modular_ss220/clothing/icons/mob/species/drask/under.dmi new file mode 100644 index 000000000000..bde64d3ff57e Binary files /dev/null and b/modular_ss220/clothing/icons/mob/species/drask/under.dmi differ diff --git a/modular_ss220/clothing/icons/mob/species/grey/accessories.dmi b/modular_ss220/clothing/icons/mob/species/grey/accessories.dmi new file mode 100644 index 000000000000..561fdf7b490b Binary files /dev/null and b/modular_ss220/clothing/icons/mob/species/grey/accessories.dmi differ diff --git a/modular_ss220/clothing/icons/mob/species/grey/hats.dmi b/modular_ss220/clothing/icons/mob/species/grey/hats.dmi new file mode 100644 index 000000000000..eaf5c1bf3453 Binary files /dev/null and b/modular_ss220/clothing/icons/mob/species/grey/hats.dmi differ diff --git a/modular_ss220/clothing/icons/mob/species/grey/suits.dmi b/modular_ss220/clothing/icons/mob/species/grey/suits.dmi new file mode 100644 index 000000000000..182aaeb23311 Binary files /dev/null and b/modular_ss220/clothing/icons/mob/species/grey/suits.dmi differ diff --git a/modular_ss220/clothing/icons/mob/species/grey/under.dmi b/modular_ss220/clothing/icons/mob/species/grey/under.dmi new file mode 100644 index 000000000000..129cb0567edf Binary files /dev/null and b/modular_ss220/clothing/icons/mob/species/grey/under.dmi differ diff --git a/modular_ss220/clothing/icons/mob/species/kidan/hats.dmi b/modular_ss220/clothing/icons/mob/species/kidan/hats.dmi new file mode 100644 index 000000000000..f9b77a5eadbf Binary files /dev/null and b/modular_ss220/clothing/icons/mob/species/kidan/hats.dmi differ diff --git a/modular_ss220/clothing/icons/mob/species/monkey/accessories.dmi b/modular_ss220/clothing/icons/mob/species/monkey/accessories.dmi new file mode 100644 index 000000000000..e289479fda3d Binary files /dev/null and b/modular_ss220/clothing/icons/mob/species/monkey/accessories.dmi differ diff --git a/modular_ss220/clothing/icons/mob/species/monkey/hats.dmi b/modular_ss220/clothing/icons/mob/species/monkey/hats.dmi new file mode 100644 index 000000000000..f7989c846400 Binary files /dev/null and b/modular_ss220/clothing/icons/mob/species/monkey/hats.dmi differ diff --git a/modular_ss220/clothing/icons/mob/species/monkey/suits.dmi b/modular_ss220/clothing/icons/mob/species/monkey/suits.dmi new file mode 100644 index 000000000000..f9db7033b0ef Binary files /dev/null and b/modular_ss220/clothing/icons/mob/species/monkey/suits.dmi differ diff --git a/modular_ss220/clothing/icons/mob/species/monkey/under.dmi b/modular_ss220/clothing/icons/mob/species/monkey/under.dmi new file mode 100644 index 000000000000..3191cd5c113c Binary files /dev/null and b/modular_ss220/clothing/icons/mob/species/monkey/under.dmi differ diff --git a/modular_ss220/clothing/icons/mob/species/tajaran/hats.dmi b/modular_ss220/clothing/icons/mob/species/tajaran/hats.dmi new file mode 100644 index 000000000000..576737256ca5 Binary files /dev/null and b/modular_ss220/clothing/icons/mob/species/tajaran/hats.dmi differ diff --git a/modular_ss220/clothing/icons/mob/species/unathi/under.dmi b/modular_ss220/clothing/icons/mob/species/unathi/under.dmi new file mode 100644 index 000000000000..091feeb3e8c9 Binary files /dev/null and b/modular_ss220/clothing/icons/mob/species/unathi/under.dmi differ diff --git a/modular_ss220/clothing/icons/mob/species/vox/accessories.dmi b/modular_ss220/clothing/icons/mob/species/vox/accessories.dmi new file mode 100644 index 000000000000..a4bba0332086 Binary files /dev/null and b/modular_ss220/clothing/icons/mob/species/vox/accessories.dmi differ diff --git a/modular_ss220/clothing/icons/mob/species/vox/hats.dmi b/modular_ss220/clothing/icons/mob/species/vox/hats.dmi new file mode 100644 index 000000000000..1e171afef405 Binary files /dev/null and b/modular_ss220/clothing/icons/mob/species/vox/hats.dmi differ diff --git a/modular_ss220/clothing/icons/mob/species/vox/suits.dmi b/modular_ss220/clothing/icons/mob/species/vox/suits.dmi new file mode 100644 index 000000000000..b977790aebac Binary files /dev/null and b/modular_ss220/clothing/icons/mob/species/vox/suits.dmi differ diff --git a/modular_ss220/clothing/icons/mob/species/vox/under.dmi b/modular_ss220/clothing/icons/mob/species/vox/under.dmi new file mode 100644 index 000000000000..ad47252dcbaa Binary files /dev/null and b/modular_ss220/clothing/icons/mob/species/vox/under.dmi differ diff --git a/modular_ss220/clothing/icons/mob/species/vulpkanin/hats.dmi b/modular_ss220/clothing/icons/mob/species/vulpkanin/hats.dmi new file mode 100644 index 000000000000..17f0315187f7 Binary files /dev/null and b/modular_ss220/clothing/icons/mob/species/vulpkanin/hats.dmi differ diff --git a/modular_ss220/clothing/icons/mob/suits.dmi b/modular_ss220/clothing/icons/mob/suits.dmi index e69337a4535a..08a7f64faa2b 100644 Binary files a/modular_ss220/clothing/icons/mob/suits.dmi and b/modular_ss220/clothing/icons/mob/suits.dmi differ diff --git a/modular_ss220/clothing/icons/mob/under.dmi b/modular_ss220/clothing/icons/mob/under.dmi index e0d1cf7eea33..532766d2b874 100644 Binary files a/modular_ss220/clothing/icons/mob/under.dmi and b/modular_ss220/clothing/icons/mob/under.dmi differ diff --git a/modular_ss220/clothing/icons/mob/uniform.dmi b/modular_ss220/clothing/icons/mob/uniform.dmi new file mode 100644 index 000000000000..e665a9badbdf Binary files /dev/null and b/modular_ss220/clothing/icons/mob/uniform.dmi differ diff --git a/modular_ss220/clothing/icons/object/accessories.dmi b/modular_ss220/clothing/icons/object/accessories.dmi new file mode 100644 index 000000000000..d8f4f4e75384 Binary files /dev/null and b/modular_ss220/clothing/icons/object/accessories.dmi differ diff --git a/modular_ss220/clothing/icons/object/hats.dmi b/modular_ss220/clothing/icons/object/hats.dmi index b2f6d06233f5..3c39401b54d8 100644 Binary files a/modular_ss220/clothing/icons/object/hats.dmi and b/modular_ss220/clothing/icons/object/hats.dmi differ diff --git a/modular_ss220/clothing/icons/object/suits.dmi b/modular_ss220/clothing/icons/object/suits.dmi index 923dfef355cc..32812e2aa275 100644 Binary files a/modular_ss220/clothing/icons/object/suits.dmi and b/modular_ss220/clothing/icons/object/suits.dmi differ diff --git a/modular_ss220/clothing/icons/object/under.dmi b/modular_ss220/clothing/icons/object/under.dmi index 2e7c7891ac51..64374b8901a7 100644 Binary files a/modular_ss220/clothing/icons/object/under.dmi and b/modular_ss220/clothing/icons/object/under.dmi differ diff --git a/modular_ss220/jobs/_jobs.dme b/modular_ss220/jobs/_jobs.dme index 7a0fc3422801..be88381776c7 100644 --- a/modular_ss220/jobs/_jobs.dme +++ b/modular_ss220/jobs/_jobs.dme @@ -16,6 +16,7 @@ #include "code/job/medical_jobs.dm" #include "code/job/science_jobs.dm" #include "code/job/security_jobs.dm" +#include "code/job/service_jobs.dm" #include "code/objects/job_objects.dm" #include "code/objects/engineering_job_objects.dm" #include "code/objects/medical_job_objects.dm" diff --git a/modular_ss220/jobs/code/job/service_jobs.dm b/modular_ss220/jobs/code/job/service_jobs.dm new file mode 100644 index 000000000000..12638397f853 --- /dev/null +++ b/modular_ss220/jobs/code/job/service_jobs.dm @@ -0,0 +1,9 @@ +/datum/outfit/job/chef/pre_equip(mob/living/carbon/human/H, visualsOnly) + . = ..() + if(H.mind && H.mind.role_alt_title) + switch(H.mind.role_alt_title) + if("Culinary Artist") + head = /obj/item/clothing/head/chefhat/red + uniform = /obj/item/clothing/under/rank/civilian/chef/red + suit = /obj/item/clothing/suit/chef/red + belt = /obj/item/storage/belt/chef/apron/red diff --git a/modular_ss220/objects/_objects.dme b/modular_ss220/objects/_objects.dme index f3b44f04ec3a..697afd755731 100644 --- a/modular_ss220/objects/_objects.dme +++ b/modular_ss220/objects/_objects.dme @@ -19,3 +19,4 @@ #include "code/key.dm" #include "code/musician.dm" #include "code/flag.dm" +#include "code/wallets.dm" diff --git a/modular_ss220/clothing/code/wallets.dm b/modular_ss220/objects/code/wallets.dm similarity index 85% rename from modular_ss220/clothing/code/wallets.dm rename to modular_ss220/objects/code/wallets.dm index 446912d266f0..746b4864497e 100644 --- a/modular_ss220/clothing/code/wallets.dm +++ b/modular_ss220/objects/code/wallets.dm @@ -4,14 +4,14 @@ /obj/item/storage/wallet/wallet_NT name = "leather wallet NT" desc = "Ваш кошелек настолько шикарен, что с ним вы выглядите просто потрясающе." - icon = 'modular_ss220/clothing/icons/object/wallets.dmi' + icon = 'modular_ss220/objects/icons/wallets.dmi' icon_state = "wallet_NT" photo_overlay = "photo_NT" /obj/item/storage/wallet/wallet_USSP_1 name = "leather wallet USSP" desc = "Говорят, такие кошельки в СССП носят исключительно для зажигалок." - icon = 'modular_ss220/clothing/icons/object/wallets.dmi' + icon = 'modular_ss220/objects/icons/wallets.dmi' icon_state = "wallet_USSP_1" photo_overlay = "photo_USSP" storage_slots = 5 @@ -25,6 +25,6 @@ /obj/item/storage/wallet/wallet_USSP_2 name = "leather wallet USSP" desc = "Говорят, такие кошельки в СССП носят исключительно для зажигалок." - icon = 'modular_ss220/clothing/icons/object/wallets.dmi' + icon = 'modular_ss220/objects/icons/wallets.dmi' icon_state = "wallet_USSP_2" photo_overlay = "photo_USSP" diff --git a/modular_ss220/clothing/icons/object/wallets.dmi b/modular_ss220/objects/icons/wallets.dmi similarity index 100% rename from modular_ss220/clothing/icons/object/wallets.dmi rename to modular_ss220/objects/icons/wallets.dmi