-
Notifications
You must be signed in to change notification settings - Fork 131
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add: Paramedic and CMO uniform #1637
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change | ||||
---|---|---|---|---|---|---|
|
@@ -43,3 +43,188 @@ | |||||
icon_state = "surgcap_green" | ||||||
item_color = "surgcap_green" | ||||||
sprite_sheets = null | ||||||
|
||||||
/obj/item/clothing/suit/mantle/cmo | ||||||
name = "Мантия СМО" | ||||||
desc = "Статусная мантия СМО." | ||||||
icon = 'modular_ss220/jobs/icons/clothing/suits.dmi' | ||||||
icon_state = "cmomantle" | ||||||
icon_override = 'modular_ss220/jobs/icons/clothing/mob/suits.dmi' | ||||||
flags_inv = HIDEJUMPSUIT | ||||||
|
||||||
/obj/item/clothing/under/rank/medical/paramedic/suit | ||||||
name = "Форма парамедика" | ||||||
desc = "Форма парамедика, смотрится стильно и просто." | ||||||
icon = 'modular_ss220/jobs/icons/clothing/uniforms.dmi' | ||||||
icon_state = "paramed2" | ||||||
item_color = "paramed2" | ||||||
icon_override = 'modular_ss220/jobs/icons/clothing/mob/uniform.dmi' | ||||||
sprite_sheets = list( | ||||||
"Abductor" = 'modular_ss220/jobs/icons/clothing/mob/uniform.dmi', | ||||||
Comment on lines
+47
to
+63
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. это всё в modular_ss220/clothing |
||||||
"Ancient Skeleton" = 'modular_ss220/jobs/icons/clothing/mob/uniform.dmi', | ||||||
"Diona" = 'modular_ss220/jobs/icons/clothing/mob/uniform.dmi', | ||||||
"Drask" = 'modular_ss220/jobs/icons/clothing/mob/species/drask/uniform.dmi', | ||||||
"Golem" = 'modular_ss220/jobs/icons/clothing/mob/uniform.dmi', | ||||||
"Grey" = 'modular_ss220/jobs/icons/clothing/mob/species/grey/uniform.dmi', | ||||||
"Human" = 'modular_ss220/jobs/icons/clothing/mob/uniform.dmi', | ||||||
"Kidan" = 'modular_ss220/jobs/icons/clothing/mob/uniform.dmi', | ||||||
"Machine" = 'modular_ss220/jobs/icons/clothing/mob/uniform.dmi', | ||||||
"Monkey" = 'modular_ss220/jobs/icons/clothing/mob/uniform.dmi', | ||||||
"Nian" = 'modular_ss220/jobs/icons/clothing/mob/uniform.dmi', | ||||||
"Plasmaman" = 'modular_ss220/jobs/icons/clothing/mob/uniform.dmi', | ||||||
"Shadow" = 'modular_ss220/jobs/icons/clothing/mob/uniform.dmi', | ||||||
"Skrell" = 'modular_ss220/jobs/icons/clothing/mob/uniform.dmi', | ||||||
"Slime People" = 'modular_ss220/jobs/icons/clothing/mob/uniform.dmi', | ||||||
"Tajaran" = 'modular_ss220/jobs/icons/clothing/mob/uniform.dmi', | ||||||
"Unathi" = 'modular_ss220/jobs/icons/clothing/mob/species/unathi/uniform.dmi', | ||||||
"Vox" = 'modular_ss220/jobs/icons/clothing/mob/species/vox/uniform.dmi', | ||||||
"Vulpkanin" = 'modular_ss220/jobs/icons/clothing/mob/uniform.dmi', | ||||||
"Nucleation" = 'modular_ss220/jobs/icons/clothing/mob/uniform.dmi', | ||||||
) | ||||||
|
||||||
/obj/item/clothing/under/rank/medical/chief_medical_officer/skirt2 | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. А у нас есть skirt1? |
||||||
name = "Парадная униформа СМО" | ||||||
desc = "Форма СМО для торжественных мероприятий." | ||||||
icon = 'modular_ss220/jobs/icons/clothing/uniforms.dmi' | ||||||
icon_state = "cmo2_skirt" | ||||||
item_color = "cmo2_skirt" | ||||||
icon_override = 'modular_ss220/jobs/icons/clothing/mob/uniform.dmi' | ||||||
sprite_sheets = list( | ||||||
"Abductor" = 'modular_ss220/jobs/icons/clothing/mob/uniform.dmi', | ||||||
"Ancient Skeleton" = 'modular_ss220/jobs/icons/clothing/mob/uniform.dmi', | ||||||
"Diona" = 'modular_ss220/jobs/icons/clothing/mob/uniform.dmi', | ||||||
"Drask" = 'modular_ss220/jobs/icons/clothing/mob/uniform.dmi', | ||||||
"Golem" = 'modular_ss220/jobs/icons/clothing/mob/uniform.dmi', | ||||||
"Grey" = 'modular_ss220/jobs/icons/clothing/mob/uniform.dmi', | ||||||
"Human" = 'modular_ss220/jobs/icons/clothing/mob/uniform.dmi', | ||||||
"Kidan" = 'modular_ss220/jobs/icons/clothing/mob/uniform.dmi', | ||||||
"Machine" = 'modular_ss220/jobs/icons/clothing/mob/uniform.dmi', | ||||||
"Monkey" = 'modular_ss220/jobs/icons/clothing/mob/uniform.dmi', | ||||||
"Nian" = 'modular_ss220/jobs/icons/clothing/mob/uniform.dmi', | ||||||
"Plasmaman" = 'modular_ss220/jobs/icons/clothing/mob/uniform.dmi', | ||||||
"Shadow" = 'modular_ss220/jobs/icons/clothing/mob/uniform.dmi', | ||||||
"Skrell" = 'modular_ss220/jobs/icons/clothing/mob/uniform.dmi', | ||||||
"Slime People" = 'modular_ss220/jobs/icons/clothing/mob/uniform.dmi', | ||||||
"Tajaran" = 'modular_ss220/jobs/icons/clothing/mob/uniform.dmi', | ||||||
"Unathi" = 'modular_ss220/jobs/icons/clothing/mob/uniform.dmi', | ||||||
"Vox" = 'modular_ss220/jobs/icons/clothing/mob/uniform.dmi', | ||||||
"Vulpkanin" = 'modular_ss220/jobs/icons/clothing/mob/uniform.dmi', | ||||||
"Nucleation" = 'modular_ss220/jobs/icons/clothing/mob/uniform.dmi', | ||||||
) | ||||||
|
||||||
/obj/item/clothing/under/rank/medical/chief_medical_officer/suit | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. suit? |
||||||
name = "Парадная униформа СМО" | ||||||
desc = "Форма СМО для торжественных мероприятий." | ||||||
icon = 'modular_ss220/jobs/icons/clothing/uniforms.dmi' | ||||||
icon_state = "cmo2" | ||||||
item_color = "cmo2" | ||||||
icon_override = 'modular_ss220/jobs/icons/clothing/mob/uniform.dmi' | ||||||
sprite_sheets = list( | ||||||
"Abductor" = 'modular_ss220/jobs/icons/clothing/mob/uniform.dmi', | ||||||
"Ancient Skeleton" = 'modular_ss220/jobs/icons/clothing/mob/uniform.dmi', | ||||||
"Diona" = 'modular_ss220/jobs/icons/clothing/mob/uniform.dmi', | ||||||
"Drask" = 'modular_ss220/jobs/icons/clothing/mob/uniform.dmi', | ||||||
"Golem" = 'modular_ss220/jobs/icons/clothing/mob/uniform.dmi', | ||||||
"Grey" = 'modular_ss220/jobs/icons/clothing/mob/uniform.dmi', | ||||||
"Human" = 'modular_ss220/jobs/icons/clothing/mob/uniform.dmi', | ||||||
"Kidan" = 'modular_ss220/jobs/icons/clothing/mob/uniform.dmi', | ||||||
"Machine" = 'modular_ss220/jobs/icons/clothing/mob/uniform.dmi', | ||||||
"Monkey" = 'modular_ss220/jobs/icons/clothing/mob/uniform.dmi', | ||||||
"Nian" = 'modular_ss220/jobs/icons/clothing/mob/uniform.dmi', | ||||||
"Plasmaman" = 'modular_ss220/jobs/icons/clothing/mob/uniform.dmi', | ||||||
"Shadow" = 'modular_ss220/jobs/icons/clothing/mob/uniform.dmi', | ||||||
"Skrell" = 'modular_ss220/jobs/icons/clothing/mob/uniform.dmi', | ||||||
"Slime People" = 'modular_ss220/jobs/icons/clothing/mob/uniform.dmi', | ||||||
"Tajaran" = 'modular_ss220/jobs/icons/clothing/mob/uniform.dmi', | ||||||
"Unathi" = 'modular_ss220/jobs/icons/clothing/mob/uniform.dmi', | ||||||
"Vox" = 'modular_ss220/jobs/icons/clothing/mob/uniform.dmi', | ||||||
"Vulpkanin" = 'modular_ss220/jobs/icons/clothing/mob/uniform.dmi', | ||||||
"Nucleation" = 'modular_ss220/jobs/icons/clothing/mob/uniform.dmi', | ||||||
) | ||||||
|
||||||
/obj/item/clothing/head/beret/paramedic | ||||||
name = "Берет парамедика" | ||||||
desc = "Обычный берет парамедика." | ||||||
icon = 'modular_ss220/jobs/icons/clothing/hats.dmi' | ||||||
icon_state = "beret_paramed" | ||||||
icon_override = 'modular_ss220/jobs/icons/clothing/mob/head.dmi' | ||||||
sprite_sheets = list( | ||||||
"Abductor" = 'modular_ss220/jobs/icons/clothing/mob/head.dmi', | ||||||
"Ancient Skeleton" = 'modular_ss220/jobs/icons/clothing/mob/head.dmi', | ||||||
"Diona" = 'modular_ss220/jobs/icons/clothing/mob/head.dmi', | ||||||
"Drask" = 'modular_ss220/jobs/icons/clothing/mob/head.dmi', | ||||||
"Golem" = 'modular_ss220/jobs/icons/clothing/mob/head.dmi', | ||||||
"Grey" = 'modular_ss220/jobs/icons/clothing/mob/head.dmi', | ||||||
"Human" = 'modular_ss220/jobs/icons/clothing/mob/head.dmi', | ||||||
"Kidan" = 'modular_ss220/jobs/icons/clothing/mob/head.dmi', | ||||||
"Machine" = 'modular_ss220/jobs/icons/clothing/mob/head.dmi', | ||||||
"Monkey" = 'modular_ss220/jobs/icons/clothing/mob/head.dmi', | ||||||
"Nian" = 'modular_ss220/jobs/icons/clothing/mob/head.dmi', | ||||||
"Plasmaman" = 'modular_ss220/jobs/icons/clothing/mob/head.dmi', | ||||||
"Shadow" = 'modular_ss220/jobs/icons/clothing/mob/head.dmi', | ||||||
"Skrell" = 'modular_ss220/jobs/icons/clothing/mob/head.dmi', | ||||||
"Slime People" = 'modular_ss220/jobs/icons/clothing/mob/head.dmi', | ||||||
"Tajaran" = 'modular_ss220/jobs/icons/clothing/mob/head.dmi', | ||||||
"Unathi" = 'modular_ss220/jobs/icons/clothing/mob/head.dmi', | ||||||
"Vox" = 'modular_ss220/jobs/icons/clothing/mob/species/vox/head.dmi', | ||||||
"Vulpkanin" = 'modular_ss220/jobs/icons/clothing/mob/head.dmi', | ||||||
"Nucleation" = 'modular_ss220/jobs/icons/clothing/mob/head.dmi', | ||||||
) | ||||||
|
||||||
/obj/item/clothing/head/beret/cmo | ||||||
name = "Берет СМО" | ||||||
desc = "Парадный берет СМО." | ||||||
icon = 'modular_ss220/jobs/icons/clothing/hats.dmi' | ||||||
icon_state = "beret_cmo" | ||||||
icon_override = 'modular_ss220/jobs/icons/clothing/mob/head.dmi' | ||||||
sprite_sheets = list( | ||||||
"Abductor" = 'modular_ss220/jobs/icons/clothing/mob/head.dmi', | ||||||
"Ancient Skeleton" = 'modular_ss220/jobs/icons/clothing/mob/head.dmi', | ||||||
"Diona" = 'modular_ss220/jobs/icons/clothing/mob/head.dmi', | ||||||
"Drask" = 'modular_ss220/jobs/icons/clothing/mob/head.dmi', | ||||||
"Golem" = 'modular_ss220/jobs/icons/clothing/mob/head.dmi', | ||||||
"Grey" = 'modular_ss220/jobs/icons/clothing/mob/head.dmi', | ||||||
"Human" = 'modular_ss220/jobs/icons/clothing/mob/head.dmi', | ||||||
"Kidan" = 'modular_ss220/jobs/icons/clothing/mob/head.dmi', | ||||||
"Machine" = 'modular_ss220/jobs/icons/clothing/mob/head.dmi', | ||||||
"Monkey" = 'modular_ss220/jobs/icons/clothing/mob/head.dmi', | ||||||
"Nian" = 'modular_ss220/jobs/icons/clothing/mob/head.dmi', | ||||||
"Plasmaman" = 'modular_ss220/jobs/icons/clothing/mob/head.dmi', | ||||||
"Shadow" = 'modular_ss220/jobs/icons/clothing/mob/head.dmi', | ||||||
"Skrell" = 'modular_ss220/jobs/icons/clothing/mob/head.dmi', | ||||||
"Slime People" = 'modular_ss220/jobs/icons/clothing/mob/head.dmi', | ||||||
"Tajaran" = 'modular_ss220/jobs/icons/clothing/mob/head.dmi', | ||||||
"Unathi" = 'modular_ss220/jobs/icons/clothing/mob/head.dmi', | ||||||
"Vox" = 'modular_ss220/jobs/icons/clothing/mob/head.dmi', | ||||||
"Vulpkanin" = 'modular_ss220/jobs/icons/clothing/mob/head.dmi', | ||||||
"Nucleation" = 'modular_ss220/jobs/icons/clothing/mob/head.dmi', | ||||||
) | ||||||
|
||||||
/obj/item/storage/belt/medical/medicalwebbing | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. И так понятно что medical
Suggested change
|
||||||
name = "Медицинский разгрузочный пояс" | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. все name на английском с маленькой буквы |
||||||
desc = "Медицинский разгрузочный пояс с большим количеством карманов, что отлично подойдет для хранения и переноски различных медикаментов." | ||||||
icon = 'modular_ss220/jobs/icons/clothing/belts.dmi' | ||||||
icon_state = "medicalwebbing" | ||||||
item_state = "medicalwebbing" | ||||||
sprite_sheets = list( | ||||||
"Abductor" = 'modular_ss220/jobs/icons/clothing/mob/belts.dmi', | ||||||
"Ancient Skeleton" = 'modular_ss220/jobs/icons/clothing/mob/belts.dmi', | ||||||
"Diona" = 'modular_ss220/jobs/icons/clothing/mob/belts.dmi', | ||||||
"Drask" = 'modular_ss220/jobs/icons/clothing/mob/species/drask/belts.dmi', | ||||||
"Golem" = 'modular_ss220/jobs/icons/clothing/mob/belts.dmi', | ||||||
"Grey" = 'modular_ss220/jobs/icons/clothing/mob/species/grey/belts.dmi', | ||||||
"Human" = 'modular_ss220/jobs/icons/clothing/mob/belts.dmi', | ||||||
"Kidan" = 'modular_ss220/jobs/icons/clothing/mob/belts.dmi', | ||||||
"Machine" = 'modular_ss220/jobs/icons/clothing/mob/belts.dmi', | ||||||
"Monkey" = 'modular_ss220/jobs/icons/clothing/mob/species/monkey/belts.dmi', | ||||||
"Nian" = 'modular_ss220/jobs/icons/clothing/mob/belts.dmi', | ||||||
"Plasmaman" = 'modular_ss220/jobs/icons/clothing/mob/belts.dmi', | ||||||
"Shadow" = 'modular_ss220/jobs/icons/clothing/mob/belts.dmi', | ||||||
"Skrell" = 'modular_ss220/jobs/icons/clothing/mob/belts.dmi', | ||||||
"Slime People" = 'modular_ss220/jobs/icons/clothing/mob/belts.dmi', | ||||||
"Tajaran" = 'modular_ss220/jobs/icons/clothing/mob/belts.dmi', | ||||||
"Unathi" = 'modular_ss220/jobs/icons/clothing/mob/belts.dmi', | ||||||
"Vox" = 'modular_ss220/jobs/icons/clothing/mob/species/vox/belts.dmi', | ||||||
"Vulpkanin" = 'modular_ss220/jobs/icons/clothing/mob/belts.dmi', | ||||||
"Nucleation" = 'modular_ss220/jobs/icons/clothing/mob/belts.dmi', | ||||||
) |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
/obj/item/storage/bag/garment/chief_medical_officer/populate_contents() | ||
. = ..() | ||
new /obj/item/clothing/suit/mantle/cmo(src) | ||
new /obj/item/clothing/under/rank/medical/chief_medical_officer/skirt2(src) | ||
new /obj/item/clothing/under/rank/medical/chief_medical_officer/suit(src) | ||
new /obj/item/clothing/head/beret/cmo(src) | ||
Comment on lines
+1
to
+6
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. в modular_ss220\clothing\code\garment_bag.dm |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -38,3 +38,16 @@ | |
/obj/item/clothing/under/rank/engineering/engineer/trainee/assistant = 5, | ||
/obj/item/clothing/under/rank/engineering/engineer/trainee/assistant/skirt = 5, | ||
) | ||
|
||
/obj/machinery/economy/vending/medidrobe/Initialize(mapload) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. в modular_ss220\clothing\code\clothing_vendors.dm |
||
products += list( | ||
/obj/item/clothing/under/rank/medical/paramedic/suit = 2, | ||
/obj/item/clothing/head/beret/paramedic = 2, | ||
/obj/item/storage/belt/medical/medicalwebbing = 2, | ||
) | ||
prices += list( | ||
/obj/item/clothing/under/rank/medical/paramedic/suit = 50, | ||
/obj/item/clothing/head/beret/paramedic = 50, | ||
/obj/item/storage/belt/medical/medicalwebbing = 75, | ||
) | ||
. = ..() |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
тоже не suit