diff --git a/modular_ss220/clothing/_clothing.dme b/modular_ss220/clothing/_clothing.dme index 59f498dec7e2..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" @@ -10,3 +11,4 @@ #include "code/garment_bag.dm" #include "code/hev_suit.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..c9d21055d731 --- /dev/null +++ b/modular_ss220/clothing/code/accessories.dm @@ -0,0 +1,33 @@ +/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 = "красный фартук" + desc = "Удобный фартук. Красненький." + 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/hats.dm b/modular_ss220/clothing/code/hats.dm index 59fe8f251ad6..ce2abd1695c0 100644 --- a/modular_ss220/clothing/code/hats.dm +++ b/modular_ss220/clothing/code/hats.dm @@ -1,11 +1,9 @@ -/obj/machinery/economy/vending/autodrobe/Initialize(mapload) - products += list( - /obj/item/clothing/head/ratge = 1, - ) - prices += list( - /obj/item/clothing/head/ratge = 75, - ) - . = ..() +/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" @@ -38,3 +36,29 @@ "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" + 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 3ce011426471..059da692254b 100644 --- a/modular_ss220/clothing/code/helmet.dm +++ b/modular_ss220/clothing/code/helmet.dm @@ -36,10 +36,3 @@ /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' diff --git a/modular_ss220/clothing/code/suits.dm b/modular_ss220/clothing/code/suits.dm index 26bf54de71f6..48f2c41134aa 100644 --- a/modular_ss220/clothing/code/suits.dm +++ b/modular_ss220/clothing/code/suits.dm @@ -175,3 +175,29 @@ 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" + 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 e2cce4eca55d..9a0db522ed3e 100644 --- a/modular_ss220/clothing/code/under.dm +++ b/modular_ss220/clothing/code/under.dm @@ -17,3 +17,30 @@ lefthand_file = 'modular_ss220/clothing/icons/inhands/left_hand.dmi' righthand_file = 'modular_ss220/clothing/icons/inhands/right_hand.dmi' item_color = "katarina_suit" + +/obj/item/clothing/under/rank/civilian/chef/red + name = "chef's red uniform" + 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/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 bc19df607b41..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 index 445d176a9a69..eaf5c1bf3453 100644 Binary files a/modular_ss220/clothing/icons/mob/species/grey/hats.dmi 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/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/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/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 7c949c954c82..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