From e035bd9745f239865a6a05e9b1da8680b87ab9ea Mon Sep 17 00:00:00 2001 From: PhantornRU Date: Sat, 7 Oct 2023 19:33:22 +1000 Subject: [PATCH] =?UTF-8?q?=D0=98=D0=BA=D0=BE=D0=BD=D0=BA=D0=B0=20=D0=BD?= =?UTF-8?q?=D0=B0=D0=BA=D0=BB=D0=B0=D0=B4=D1=8B=D0=B2=D0=B0=D0=B5=D1=82?= =?UTF-8?q?=D1=81=D1=8F=20=D0=BF=D0=BE=D0=B2=D0=B5=D1=80=D1=85=20=D1=87?= =?UTF-8?q?=D0=B5=D1=80=D0=B5=D0=B7=20=D1=85=D0=B0=D1=80=D0=B4=D0=BA=D0=BE?= =?UTF-8?q?=D0=B4,=20=D0=BD=D0=BE=20=D0=BD=D0=B5=20=D0=B1=D0=B5=D1=80?= =?UTF-8?q?=D0=B5=D1=82=D1=81=D1=8F=20=D0=B8=D0=B7=20=D0=B4=D0=BE=D0=BF.?= =?UTF-8?q?=20.dmi?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modular_ss220/jobs/_jobs.dme | 13 +- modular_ss220/jobs/code/cards_ids.dm | 128 +++++++++++++++--- .../jobs/code/clothing/medical_clothing.dm | 10 +- modular_ss220/jobs/code/job/medical_jobs.dm | 46 ++++--- modular_ss220/jobs/icons/clothing/hats.dmi | Bin 0 -> 300 bytes .../jobs/icons/clothing/mob/head.dmi | Bin 0 -> 380 bytes modular_ss220/jobs/icons/hud.dmi | Bin 492 -> 745 bytes 7 files changed, 145 insertions(+), 52 deletions(-) create mode 100644 modular_ss220/jobs/icons/clothing/hats.dmi create mode 100644 modular_ss220/jobs/icons/clothing/mob/head.dmi diff --git a/modular_ss220/jobs/_jobs.dme b/modular_ss220/jobs/_jobs.dme index f91d559c7a18..d67e17013d32 100644 --- a/modular_ss220/jobs/_jobs.dme +++ b/modular_ss220/jobs/_jobs.dme @@ -1,15 +1,6 @@ #include "_jobs.dm" -#include "code/clothing/medical_clothing.dm" -#include "code/job/medical_jobs.dm" #include "code/access.dm" #include "code/cards_ids.dm" -// BEGIN_INTERNALS -// END_INTERNALS -// BEGIN_FILE_DIR -#define FILE_DIR . -// END_FILE_DIR -// BEGIN_PREFERENCES -// END_PREFERENCES -// BEGIN_INCLUDE -// END_INCLUDE +#include "code/clothing/medical_clothing.dm" +#include "code/job/medical_jobs.dm" diff --git a/modular_ss220/jobs/code/cards_ids.dm b/modular_ss220/jobs/code/cards_ids.dm index 3db2f8573a33..491b7205fdc6 100644 --- a/modular_ss220/jobs/code/cards_ids.dm +++ b/modular_ss220/jobs/code/cards_ids.dm @@ -1,23 +1,111 @@ -/proc/get_novice_card_skins() - return list("cadet", "intern", "student", "trainee") - -get_station_card_skins() - var/test = "Test1: \n" - for(var/i in ..()) - test += ", [i]" - message_admins(test) - - test = "Test2: \n" - for(var/i in get_novice_card_skins()) - test += ", [i]" - message_admins(test) - - test = "Test3: \n" - for(var/i in ..() + get_novice_card_skins()) - test += ", [i]" - message_admins(test) - - return ..() + get_novice_card_skins() +// !!!!!!!! сделать автоустановку роли новичкам при загрузке + +// /proc/get_novice_card_skins() +// return list("cadet", "intern", "student", "trainee") + +// get_station_card_skins() +// var/test = "Test1: \n" +// for(var/i in ..()) +// test += ", [i]" +// message_admins(test) + +// test = "Test2: \n" +// for(var/i in get_novice_card_skins()) +// test += ", [i]" +// message_admins(test) + +// test = "Test3: \n" +// for(var/i in ..() + get_novice_card_skins()) +// test += ", [i]" +// message_admins(test) + +// return ..() + get_novice_card_skins() + +/proc/get_all_medical_novice_tittles() + return list("Intern", "Medical Assistant", "Student Medical Doctor") + +/proc/get_all_security_novice_tittles() + return list("Cadet") + +/proc/get_all_engineering_novice_tittles() + return list("Trainee") + +/proc/get_all_science_novice_tittles() + return list("Student") + +/proc/get_all_novice_tittles() + return get_all_medical_novice_tittles() + get_all_security_novice_tittles() + get_all_engineering_novice_tittles() + get_all_science_novice_tittles() + +// /proc/get_modular_ss220_hud_image(mob/living/carbon/human/H) +// var/image/I +// if(!H.wear_id) +// return +// if(H.wear_id.assignment == "Intern" || H.wear_id.get_ID_assignment() in get_all_novice_tittles()) +// I = image('modular_ss220/jobs/icons/hud.dmi', src, "") +// I.appearance_flags = RESET_COLOR | RESET_TRANSFORM + +// return I + + + + //var/image/holder = I + + +// /atom/prepare_huds() +// . = ..() +// var/hud = ID_HUD +// if(hud in hud_possible) // копипаст наследуемого метода +// var/hint = hud_possible[hud] +// switch(hint) +// if(HUD_LIST_LIST) +// hud_list[hud] = list() +// else +// var/image/I = image('modular_ss220/jobs/icons/hud.dmi', src, "") +// I.appearance_flags = RESET_COLOR | RESET_TRANSFORM +// hud_list[ID_HUD] = I //непральна + + +// /mob/living/carbon/human/sec_hud_set_ID() +// if(!wear_id) +// return ..() + +// if() + +// //.dmi с худама +// var/image/I = image('modular_ss220/jobs/icons/hud.dmi', src, "") +// I.appearance_flags = RESET_COLOR | RESET_TRANSFORM + +// //Устанавливаем ХУДы с .dmi +// var/image/holder = I +// holder.icon_state = "hudunknown" +// holder.icon_state = "hud[ckey(wear_id.get_job_name())]" +// sec_hud_set_security_status() + + + + +/proc/get_all_novice_huds() + return list("intern", "cadet", "trainee", "student") + +/obj/item/get_job_name() //Used in secHUD icon generation + var/assignmentName = get_ID_assignment(if_no_id = "Unknown") + var/rankName = get_ID_rank(if_no_id = "Unknown") + + var/novmed = get_all_medical_novice_tittles() + var/novsec = get_all_security_novice_tittles() + var/noveng = get_all_engineering_novice_tittles() + var/novrnd = get_all_science_novice_tittles() + + if((assignmentName in novmed) || (rankName in novmed)) + return "intern" + if((assignmentName in novsec) || (rankName in novsec)) + return "cadet" + if((assignmentName in noveng) || (rankName in noveng)) + return "trainee" + if((assignmentName in novrnd) || (rankName in novrnd)) + return "student" + + . = ..() // /atom/prepare_huds() // . = ..() diff --git a/modular_ss220/jobs/code/clothing/medical_clothing.dm b/modular_ss220/jobs/code/clothing/medical_clothing.dm index bb7dd7e9a457..e66454790af2 100644 --- a/modular_ss220/jobs/code/clothing/medical_clothing.dm +++ b/modular_ss220/jobs/code/clothing/medical_clothing.dm @@ -29,10 +29,18 @@ item_color = "med_ass_f" body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS -/obj/item/clothing/under/rank/medical/scrubs/lightgreen +/obj/item/clothing/under/rank/medical/scrubs/green/light name = "light green medical scrubs" desc = "It's made of a special fiber that provides minor protection against biohazards. This one is in light green." icon = 'modular_ss220/jobs/icons/clothing/uniforms.dmi' icon_override = 'modular_ss220/jobs/icons/clothing/mob/uniform.dmi' icon_state = "scrubsgreen" item_color = "scrubsgreen" + +/obj/item/clothing/head/surgery/green/light + name = "light green surgical cap" + desc = "A cap surgeons wear during operations. Keeps their hair from tickling your internal organs. This one is light green." + icon = 'modular_ss220/jobs/icons/clothing/hats.dmi' + icon_override = 'modular_ss220/jobs/icons/clothing/mob/head.dmi' + icon_state = "surgcap_green" + item_color = "surgcap_green" diff --git a/modular_ss220/jobs/code/job/medical_jobs.dm b/modular_ss220/jobs/code/job/medical_jobs.dm index 99e14716a5c6..c5321f411ca5 100644 --- a/modular_ss220/jobs/code/job/medical_jobs.dm +++ b/modular_ss220/jobs/code/job/medical_jobs.dm @@ -1,47 +1,53 @@ /datum/job/doctor/New() . = ..() - alt_titles |= list("Intern", "Medical Assistant", "Student Medical Doctor") + alt_titles |= get_all_medical_novice_tittles() /datum/station_department/medical/New() . = ..() - department_roles |= list("Intern", "Medical Assistant", "Student Medical Doctor") + department_roles |= get_all_medical_novice_tittles() /datum/nttc_configuration/New() . = ..() - all_jobs |= list( - "Intern" = "medradio", - "Medical Assistant" = "medradio", - "Student Medical Doctor" = "medradio", - ) + var/list/job_radio_dict = list() + + for(var/i in get_all_medical_novice_tittles()) + job_radio_dict.Add(list("[i]" = "medradio")) + for(var/i in get_all_security_novice_tittles()) + job_radio_dict.Add(list("[i]" = "secradio")) + for(var/i in get_all_engineering_novice_tittles()) + job_radio_dict.Add(list("[i]" = "engradio")) + for(var/i in get_all_science_novice_tittles()) + job_radio_dict.Add(list("[i]" = "scirradio")) + + all_jobs |= job_radio_dict /datum/outfit/job/doctor/pre_equip(mob/living/carbon/human/H, visualsOnly) . = ..() if(H.mind && H.mind.role_alt_title) - var/is_novice = FALSE + if(H.mind.role_alt_title in get_all_medical_novice_tittles()) + uniform = /obj/item/clothing/under/rank/medical/intern + if(H.gender == FEMALE) + uniform = /obj/item/clothing/under/rank/medical/intern/skirt + id = /obj/item/card/id/medical/intern + //l_pocket = /obj/item/paper/deltainfo + l_hand = /obj/item/storage/firstaid/o2 + mask = /obj/item/clothing/mask/surgical + gloves = /obj/item/clothing/gloves/color/latex + glasses = /obj/item/clothing/glasses/hud/security/sunglasses // !!!! ДЛЯ ТЕСТА switch(H.mind.role_alt_title) if("Intern") - is_novice = TRUE uniform = /obj/item/clothing/under/rank/medical/intern if(H.gender == FEMALE) uniform = /obj/item/clothing/under/rank/medical/intern/skirt if("Student Medical Doctor") - is_novice = TRUE - //head = /obj/item/clothing/head/surgery/lightgreen - //uniform = /obj/item/clothing/under/rank/medical/lightgreen + head = /obj/item/clothing/head/surgery/green/light + uniform = /obj/item/clothing/under/rank/medical/scrubs/green/light if("Medical Assistant") - is_novice = TRUE uniform = /obj/item/clothing/under/rank/medical/intern/assistant if(H.gender == FEMALE) uniform = /obj/item/clothing/under/rank/medical/intern/assistant/skirt - if(is_novice) - id = /obj/item/card/id/medical/intern - //l_pocket = /obj/item/paper/deltainfo - l_hand = /obj/item/storage/firstaid/o2 - mask = /obj/item/clothing/mask/surgical - gloves = /obj/item/clothing/gloves/color/latex - glasses = /obj/item/clothing/glasses/hud/security/sunglasses // !!!! ДЛЯ ТЕСТА // "student scientist" = "Учёный-практикант", diff --git a/modular_ss220/jobs/icons/clothing/hats.dmi b/modular_ss220/jobs/icons/clothing/hats.dmi new file mode 100644 index 0000000000000000000000000000000000000000..eb19b69c9388068402b3f9da4597313c8167d603 GIT binary patch literal 300 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnH3?%tPCZz)@o&cW^*8>L*F!n?-o@iv8nJi^) zDi0KAED7=pW^j0RBMrzYtO|)JaY-#sF3Kz@$;{7VV5pcA99B?N`u$6A!N;#pw7hk- z&Yd|Qydl)!qVa=AI_G^fPcjts^zN`Q4l=%M?4>a0(WE1jLKK2m?%1MXYq?RuZm))^ zsefm;vFhd(5*m3Yj?N65GGjJZqPF&qUppIm*%>??WD6D_ZC3Ibngs zhBhk)iNMur4lLK4C4>IQJ4#&oU$4t(d?bV=-0C=2J zR&a84_w-Y6@%7{?OD!tS%+FJ>RWQ*r;NmRLOex6#a*U0*I5Sc+(=$pSoZ^zil2jm5 zskpQ#Jvp%;KD{V4HBX6)GbOXA7^IntGp#5wHxYCm4**Gs9dnTC^=$wE z0G&xhK~zYI?UX?dgdhw>+l&XG#0yw2;8+i!(fglim}C}w1l+hV6JEli?WdGQKhaIF z2*e`dAmLTx1kb8(XfT=$Rl!6QCwMp8K=3<7!HM1$R~4kc$|x@CO^50Z@T5~cC}4=pE^{%+UCNrlrH3>c a&*TFRcnbfNC1Iri0000fY?zU(0a%OWcIRzLp0W z7?{{ST^vIy=DeM~(2vPbW0j&yqm}aPn zziMDh$rh|-{NVoVgzW7Nylr>S|B2tU^KI^A-)FODM;lI0i=1X7zxP>Z``7NPSIYnI zx0Kyi{oVfMT9=#kSKd~Af1eWh;qT?m*DCkj%&Zibch5hl8u8)v*InhgX0utRCmg&V zwc*=@mgyUw{JXK^jo9_&hjpIJpc0D1ed(CZ^MHN-V$z12`UVv6U#DubMF6^o_y@~L+Qypn+#9QD0{!>xA~^IA9^F@ zk9*EDk^Xn}q{$AJUH12z?!Vu@H@o?u#g3MpLRShN?g8 zxVxg-?tFTDuiN3`ymiSM6+BnJGwM`v9`<19VL3oLQN!qZ`q0d9^~F5Ew9DY>>gTe~ HDWM4fZV=- z0C=2@kk1OjFbu}e?NgNPF8;fEkqz0wy+di^8q|z6sl&IoI)4N&LNCepk?)s4YIAH) zU2mFmrymd*M=}SqU#+#8(M!l?x78{D4nY>fVg<6SLh>xh0|`6K6_fQECM!NEptp69TP1`r0hrR#> z(`hSALBnRs#7zLwX6bv!|08|M^ U?fyQ^%K!iX07*qoM6N<$f+^I_WdHyG