Skip to content
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

Closed
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 41 additions & 0 deletions modular_ss220/jobs/_jobs.dme
Original file line number Diff line number Diff line change
@@ -30,3 +30,44 @@
#include "code/objects/science_job_objects.dm"
#include "code/objects/security_job_objects.dm"
#include "code/objects/wardrobe_vendors.dm"
#include "code/garment_bag.dm"
// BEGIN_INTERNALS
// END_INTERNALS
// BEGIN_FILE_DIR
#define FILE_DIR .
// END_FILE_DIR
// BEGIN_PREFERENCES
// END_PREFERENCES
// BEGIN_INCLUDE
#include "_jobs.dm"

Check warning on line 42 in modular_ss220/jobs/_jobs.dme

GitHub Actions / Run Linters

duplicate #include "modular_ss220/jobs/_jobs.dm"
#include "code\card_computer.dm"

Check warning on line 43 in modular_ss220/jobs/_jobs.dme

GitHub Actions / Run Linters

duplicate #include "modular_ss220/jobs/code/card_computer.dm"
#include "code\card_id.dm"

Check warning on line 44 in modular_ss220/jobs/_jobs.dme

GitHub Actions / Run Linters

duplicate #include "modular_ss220/jobs/code/card_id.dm"
#include "code\departaments.dm"

Check warning on line 45 in modular_ss220/jobs/_jobs.dme

GitHub Actions / Run Linters

duplicate #include "modular_ss220/jobs/code/departaments.dm"
#include "code\jobs.dm"

Check warning on line 46 in modular_ss220/jobs/_jobs.dme

GitHub Actions / Run Linters

duplicate #include "modular_ss220/jobs/code/jobs.dm"
#include "code\jobs_character.dm"

Check warning on line 47 in modular_ss220/jobs/_jobs.dme

GitHub Actions / Run Linters

duplicate #include "modular_ss220/jobs/code/jobs_character.dm"
#include "code\jobs_gamemodes.dm"

Check warning on line 48 in modular_ss220/jobs/_jobs.dme

GitHub Actions / Run Linters

duplicate #include "modular_ss220/jobs/code/jobs_gamemodes.dm"
#include "code\jobs_global_list.dm"

Check warning on line 49 in modular_ss220/jobs/_jobs.dme

GitHub Actions / Run Linters

duplicate #include "modular_ss220/jobs/code/jobs_global_list.dm"
#include "code\landmarks.dm"

Check warning on line 50 in modular_ss220/jobs/_jobs.dme

GitHub Actions / Run Linters

duplicate #include "modular_ss220/jobs/code/landmarks.dm"
#include "code\clothing\engineering_clothing.dm"

Check warning on line 51 in modular_ss220/jobs/_jobs.dme

GitHub Actions / Run Linters

duplicate #include "modular_ss220/jobs/code/clothing/engineering_clothing.dm"
#include "code\clothing\medical_clothing.dm"
#include "code\clothing\science_clothing.dm"
#include "code\clothing\security_clothing.dm"
#include "code\donor\donor_jobs.dm"
#include "code\donor\job\1_tier_jobs.dm"
#include "code\donor\job\2_tier_jobs.dm"
#include "code\donor\job\3_tier_jobs.dm"
#include "code\donor\job\4_tier_jobs.dm"
#include "code\donor\job\5_tier_jobs.dm"
#include "code\job\engineering_jobs.dm"
#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\engineering_job_objects.dm"
#include "code\objects\job_objects.dm"
#include "code\objects\mail.dm"
#include "code\objects\medical_job_objects.dm"
#include "code\objects\science_job_objects.dm"
#include "code\objects\security_job_objects.dm"
#include "code\objects\wardrobe_vendors.dm"
// END_INCLUDE
185 changes: 185 additions & 0 deletions modular_ss220/jobs/code/clothing/medical_clothing.dm
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
Copy link
Collaborator

Choose a reason for hiding this comment

The 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 = "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
Copy link
Collaborator

Choose a reason for hiding this comment

The 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
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

А у нас есть skirt1?
Если нет, в таком случаи либо skirt_parade, либо skirt_alt

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
Copy link
Collaborator

Choose a reason for hiding this comment

The 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
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

И так понятно что medical

Suggested change
/obj/item/storage/belt/medical/medicalwebbing
/obj/item/storage/belt/medical/webbing

name = "Медицинский разгрузочный пояс"
Copy link
Collaborator

Choose a reason for hiding this comment

The 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',
)
6 changes: 6 additions & 0 deletions modular_ss220/jobs/code/garment_bag.dm
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
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

в modular_ss220\clothing\code\garment_bag.dm

13 changes: 13 additions & 0 deletions modular_ss220/jobs/code/objects/wardrobe_vendors.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)
Copy link
Collaborator

Choose a reason for hiding this comment

The 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,
)
. = ..()
Binary file added modular_ss220/jobs/icons/clothing/belts.dmi
Binary file not shown.
Binary file modified modular_ss220/jobs/icons/clothing/hats.dmi
Binary file not shown.
Binary file added modular_ss220/jobs/icons/clothing/mob/belts.dmi
Binary file not shown.
Binary file modified modular_ss220/jobs/icons/clothing/mob/head.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 added modular_ss220/jobs/icons/clothing/mob/suits.dmi
Binary file not shown.
Binary file modified modular_ss220/jobs/icons/clothing/mob/uniform.dmi
Binary file not shown.
Binary file added modular_ss220/jobs/icons/clothing/suits.dmi
Binary file not shown.
Binary file modified modular_ss220/jobs/icons/clothing/uniforms.dmi
Binary file not shown.