diff --git a/modular_ss220/jobs/_jobs.dme b/modular_ss220/jobs/_jobs.dme index 52d6ceb3d615..85cb0870272a 100644 --- a/modular_ss220/jobs/_jobs.dme +++ b/modular_ss220/jobs/_jobs.dme @@ -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" +#include "code\card_computer.dm" +#include "code\card_id.dm" +#include "code\departaments.dm" +#include "code\jobs.dm" +#include "code\jobs_character.dm" +#include "code\jobs_gamemodes.dm" +#include "code\jobs_global_list.dm" +#include "code\landmarks.dm" +#include "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 diff --git a/modular_ss220/jobs/code/clothing/medical_clothing.dm b/modular_ss220/jobs/code/clothing/medical_clothing.dm index f9ffc439ad70..c08703e5b666 100644 --- a/modular_ss220/jobs/code/clothing/medical_clothing.dm +++ b/modular_ss220/jobs/code/clothing/medical_clothing.dm @@ -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', + "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 + 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 + 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 + 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', + ) diff --git a/modular_ss220/jobs/code/garment_bag.dm b/modular_ss220/jobs/code/garment_bag.dm new file mode 100644 index 000000000000..a2950a149983 --- /dev/null +++ b/modular_ss220/jobs/code/garment_bag.dm @@ -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) diff --git a/modular_ss220/jobs/code/objects/wardrobe_vendors.dm b/modular_ss220/jobs/code/objects/wardrobe_vendors.dm index f508f3d87774..6fd36bdbb37d 100644 --- a/modular_ss220/jobs/code/objects/wardrobe_vendors.dm +++ b/modular_ss220/jobs/code/objects/wardrobe_vendors.dm @@ -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) + 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, + ) + . = ..() diff --git a/modular_ss220/jobs/icons/clothing/belts.dmi b/modular_ss220/jobs/icons/clothing/belts.dmi new file mode 100644 index 000000000000..288c94b5df91 Binary files /dev/null and b/modular_ss220/jobs/icons/clothing/belts.dmi differ diff --git a/modular_ss220/jobs/icons/clothing/hats.dmi b/modular_ss220/jobs/icons/clothing/hats.dmi index eb19b69c9388..a55831ab3666 100644 Binary files a/modular_ss220/jobs/icons/clothing/hats.dmi and b/modular_ss220/jobs/icons/clothing/hats.dmi differ diff --git a/modular_ss220/jobs/icons/clothing/mob/belts.dmi b/modular_ss220/jobs/icons/clothing/mob/belts.dmi new file mode 100644 index 000000000000..47379c2341e3 Binary files /dev/null and b/modular_ss220/jobs/icons/clothing/mob/belts.dmi differ diff --git a/modular_ss220/jobs/icons/clothing/mob/head.dmi b/modular_ss220/jobs/icons/clothing/mob/head.dmi index 70ef94abd256..387d5b6264aa 100644 Binary files a/modular_ss220/jobs/icons/clothing/mob/head.dmi and b/modular_ss220/jobs/icons/clothing/mob/head.dmi differ diff --git a/modular_ss220/jobs/icons/clothing/mob/species/drask/belts.dmi b/modular_ss220/jobs/icons/clothing/mob/species/drask/belts.dmi new file mode 100644 index 000000000000..47379c2341e3 Binary files /dev/null and b/modular_ss220/jobs/icons/clothing/mob/species/drask/belts.dmi differ diff --git a/modular_ss220/jobs/icons/clothing/mob/species/drask/uniform.dmi b/modular_ss220/jobs/icons/clothing/mob/species/drask/uniform.dmi new file mode 100644 index 000000000000..ec1661794f7f Binary files /dev/null and b/modular_ss220/jobs/icons/clothing/mob/species/drask/uniform.dmi differ diff --git a/modular_ss220/jobs/icons/clothing/mob/species/grey/belts.dmi b/modular_ss220/jobs/icons/clothing/mob/species/grey/belts.dmi new file mode 100644 index 000000000000..f722d3a6bfb2 Binary files /dev/null and b/modular_ss220/jobs/icons/clothing/mob/species/grey/belts.dmi differ diff --git a/modular_ss220/jobs/icons/clothing/mob/species/grey/uniform.dmi b/modular_ss220/jobs/icons/clothing/mob/species/grey/uniform.dmi new file mode 100644 index 000000000000..01199c763381 Binary files /dev/null and b/modular_ss220/jobs/icons/clothing/mob/species/grey/uniform.dmi differ diff --git a/modular_ss220/jobs/icons/clothing/mob/species/kidan/uniform.dmi b/modular_ss220/jobs/icons/clothing/mob/species/kidan/uniform.dmi new file mode 100644 index 000000000000..ec1661794f7f Binary files /dev/null and b/modular_ss220/jobs/icons/clothing/mob/species/kidan/uniform.dmi differ diff --git a/modular_ss220/jobs/icons/clothing/mob/species/monkey/belts.dmi b/modular_ss220/jobs/icons/clothing/mob/species/monkey/belts.dmi new file mode 100644 index 000000000000..47379c2341e3 Binary files /dev/null and b/modular_ss220/jobs/icons/clothing/mob/species/monkey/belts.dmi differ diff --git a/modular_ss220/jobs/icons/clothing/mob/species/unathi/uniform.dmi b/modular_ss220/jobs/icons/clothing/mob/species/unathi/uniform.dmi new file mode 100644 index 000000000000..ec1661794f7f Binary files /dev/null and b/modular_ss220/jobs/icons/clothing/mob/species/unathi/uniform.dmi differ diff --git a/modular_ss220/jobs/icons/clothing/mob/species/vox/belts.dmi b/modular_ss220/jobs/icons/clothing/mob/species/vox/belts.dmi new file mode 100644 index 000000000000..30d6c70a8d19 Binary files /dev/null and b/modular_ss220/jobs/icons/clothing/mob/species/vox/belts.dmi differ diff --git a/modular_ss220/jobs/icons/clothing/mob/species/vox/head.dmi b/modular_ss220/jobs/icons/clothing/mob/species/vox/head.dmi new file mode 100644 index 000000000000..06a7344c8196 Binary files /dev/null and b/modular_ss220/jobs/icons/clothing/mob/species/vox/head.dmi differ diff --git a/modular_ss220/jobs/icons/clothing/mob/species/vox/uniform.dmi b/modular_ss220/jobs/icons/clothing/mob/species/vox/uniform.dmi new file mode 100644 index 000000000000..41e88fff7445 Binary files /dev/null and b/modular_ss220/jobs/icons/clothing/mob/species/vox/uniform.dmi differ diff --git a/modular_ss220/jobs/icons/clothing/mob/suits.dmi b/modular_ss220/jobs/icons/clothing/mob/suits.dmi new file mode 100644 index 000000000000..99de86619e00 Binary files /dev/null and b/modular_ss220/jobs/icons/clothing/mob/suits.dmi differ diff --git a/modular_ss220/jobs/icons/clothing/mob/uniform.dmi b/modular_ss220/jobs/icons/clothing/mob/uniform.dmi index c14f29cbca83..093564fa223e 100644 Binary files a/modular_ss220/jobs/icons/clothing/mob/uniform.dmi and b/modular_ss220/jobs/icons/clothing/mob/uniform.dmi differ diff --git a/modular_ss220/jobs/icons/clothing/suits.dmi b/modular_ss220/jobs/icons/clothing/suits.dmi new file mode 100644 index 000000000000..946e3d242940 Binary files /dev/null and b/modular_ss220/jobs/icons/clothing/suits.dmi differ diff --git a/modular_ss220/jobs/icons/clothing/uniforms.dmi b/modular_ss220/jobs/icons/clothing/uniforms.dmi index 7b593a0b97f4..f752d8189e4d 100644 Binary files a/modular_ss220/jobs/icons/clothing/uniforms.dmi and b/modular_ss220/jobs/icons/clothing/uniforms.dmi differ