Skip to content

Commit

Permalink
Chef update
Browse files Browse the repository at this point in the history
  • Loading branch information
AyIong committed Jan 18, 2024
1 parent fcd79b6 commit 9084b84
Show file tree
Hide file tree
Showing 32 changed files with 145 additions and 15 deletions.
2 changes: 2 additions & 0 deletions modular_ss220/clothing/_clothing.dme
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#include "_clothing.dm"

#include "code/accessories.dm"
#include "code/suits.dm"
#include "code/shoes.dm"
#include "code/gloves.dm"
Expand All @@ -10,3 +11,4 @@
#include "code/garment_bag.dm"
#include "code/hev_suit.dm"
#include "code/hats.dm"
#include "code/clothing_vendors.dm"
33 changes: 33 additions & 0 deletions modular_ss220/clothing/code/accessories.dm
Original file line number Diff line number Diff line change
@@ -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"
25 changes: 25 additions & 0 deletions modular_ss220/clothing/code/clothing_vendors.dm
Original file line number Diff line number Diff line change
@@ -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,
)
. = ..()
40 changes: 32 additions & 8 deletions modular_ss220/clothing/code/hats.dm
Original file line number Diff line number Diff line change
@@ -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"
Expand Down Expand Up @@ -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',
)
7 changes: 0 additions & 7 deletions modular_ss220/clothing/code/helmet.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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'
26 changes: 26 additions & 0 deletions modular_ss220/clothing/code/suits.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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',
)
27 changes: 27 additions & 0 deletions modular_ss220/clothing/code/under.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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',
)
Binary file added modular_ss220/clothing/icons/mob/accessories.dmi
Binary file not shown.
Binary file modified modular_ss220/clothing/icons/mob/hats.dmi
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified modular_ss220/clothing/icons/mob/species/grey/hats.dmi
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified modular_ss220/clothing/icons/mob/suits.dmi
Binary file not shown.
Binary file modified modular_ss220/clothing/icons/mob/under.dmi
Binary file not shown.
Binary file added modular_ss220/clothing/icons/mob/uniform.dmi
Binary file not shown.
Binary file added modular_ss220/clothing/icons/object/accessories.dmi
Binary file not shown.
Binary file modified modular_ss220/clothing/icons/object/hats.dmi
Binary file not shown.
Binary file modified modular_ss220/clothing/icons/object/suits.dmi
Binary file not shown.
Binary file modified modular_ss220/clothing/icons/object/under.dmi
Binary file not shown.

0 comments on commit 9084b84

Please sign in to comment.