From c00678c1428b17fd29fd0d574605ecf7a39c41a0 Mon Sep 17 00:00:00 2001
From: PhantornRU <stalkerlesha2@mail.ru>
Date: Sat, 7 Oct 2023 00:35:44 +1000
Subject: [PATCH 1/5] initial

---
 modular_ss220/jobs/_jobs.dm                   |   2 +-
 modular_ss220/jobs/_jobs.dme                  |  12 ++++
 modular_ss220/jobs/code/cards_ids.dm          |  55 ++++++++++++++++++
 .../jobs/code/clothing/medical_clothing.dm    |  38 ++++++++++++
 modular_ss220/jobs/code/job/medical_jobs.dm   |  51 ++++++++++++++++
 modular_ss220/jobs/icons/card.dmi             | Bin 0 -> 5448 bytes
 .../jobs/icons/clothing/mob/uniform.dmi       | Bin 0 -> 6808 bytes
 .../jobs/icons/clothing/uniforms.dmi          | Bin 0 -> 2408 bytes
 modular_ss220/jobs/icons/hud.dmi              | Bin 0 -> 492 bytes
 modular_ss220/jobs/icons/uniforms.dmi         | Bin 0 -> 2408 bytes
 10 files changed, 157 insertions(+), 1 deletion(-)
 create mode 100644 modular_ss220/jobs/code/cards_ids.dm
 create mode 100644 modular_ss220/jobs/code/clothing/medical_clothing.dm
 create mode 100644 modular_ss220/jobs/code/job/medical_jobs.dm
 create mode 100644 modular_ss220/jobs/icons/card.dmi
 create mode 100644 modular_ss220/jobs/icons/clothing/mob/uniform.dmi
 create mode 100644 modular_ss220/jobs/icons/clothing/uniforms.dmi
 create mode 100644 modular_ss220/jobs/icons/hud.dmi
 create mode 100644 modular_ss220/jobs/icons/uniforms.dmi

diff --git a/modular_ss220/jobs/_jobs.dm b/modular_ss220/jobs/_jobs.dm
index cd20e61a4ff3..47f40207e7b0 100644
--- a/modular_ss220/jobs/_jobs.dm
+++ b/modular_ss220/jobs/_jobs.dm
@@ -1,4 +1,4 @@
 /datum/modpack/jobs
 	name = "Работы"
 	desc = "Новые джобки и изменения старых"
-	author = "furior"
+	author = "furior, PhantomRU"
diff --git a/modular_ss220/jobs/_jobs.dme b/modular_ss220/jobs/_jobs.dme
index c8c3a6f2b56a..f91d559c7a18 100644
--- a/modular_ss220/jobs/_jobs.dme
+++ b/modular_ss220/jobs/_jobs.dme
@@ -1,3 +1,15 @@
 #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
diff --git a/modular_ss220/jobs/code/cards_ids.dm b/modular_ss220/jobs/code/cards_ids.dm
new file mode 100644
index 000000000000..3db2f8573a33
--- /dev/null
+++ b/modular_ss220/jobs/code/cards_ids.dm
@@ -0,0 +1,55 @@
+/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()
+
+// /atom/prepare_huds()
+// 	. = ..()
+// 	var/image/img = image('modular_ss220/jobs/icons/hud.dmi', src, "")
+// 	img.appearance_flags = RESET_COLOR | RESET_TRANSFORM
+// 	hud_list[ID_HUD] += img
+
+/obj/item/card/id/medical/intern
+	name = "Intern ID"
+	registered_name = "Intern"
+	icon = 'modular_ss220/jobs/icons/card.dmi'
+	icon_state = "intern"
+	item_state = "intern-id"
+	rank = "Intern"
+
+/obj/item/card/id/research/student
+	name = "Student ID"
+	registered_name = "Student"
+	icon = 'modular_ss220/jobs/icons/card.dmi'
+	icon_state = "student"
+	item_state = "student-id"
+
+/obj/item/card/id/engineering/trainee
+	name = "Trainee ID"
+	registered_name = "Trainee"
+	icon = 'modular_ss220/jobs/icons/card.dmi'
+	icon_state = "trainee"
+	item_state = "trainee-id"
+
+/obj/item/card/id/security/cadet
+	name = "Cadet ID"
+	registered_name = "Cadet"
+	icon = 'modular_ss220/jobs/icons/card.dmi'
+	icon_state = "cadet"
+	item_state = "cadet-id"
diff --git a/modular_ss220/jobs/code/clothing/medical_clothing.dm b/modular_ss220/jobs/code/clothing/medical_clothing.dm
new file mode 100644
index 000000000000..bb7dd7e9a457
--- /dev/null
+++ b/modular_ss220/jobs/code/clothing/medical_clothing.dm
@@ -0,0 +1,38 @@
+/obj/item/clothing/under/rank/medical/intern
+	icon = 'modular_ss220/jobs/icons/clothing/uniforms.dmi'
+	icon_override = 'modular_ss220/jobs/icons/clothing/mob/uniform.dmi'
+	//lefthand_file = 'icons/mob/inhands/clothing_lefthand.dmi'
+	//righthand_file = 'icons/mob/inhands/clothing_righthand.dmi'
+	sprite_sheets = null //если не сработает icon_override, то использовать: (и снизу тоже у зеленки)
+	// sprite_sheets = list(
+	// 	"Human" = 'modular_ss220/jobs/icons/clothing/mob/uniform.dmi',
+	// 	)
+
+	name = "intern jumpsuit"
+	icon_state = "intern_s"
+	item_color = "intern"
+
+/obj/item/clothing/under/rank/medical/intern/skirt
+	name = "intern jumpskirt"
+	icon_state = "internf_s"
+	item_color = "internf"
+	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
+
+/obj/item/clothing/under/rank/medical/intern/assistant
+	name = "medical assistant jumpsuit"
+	icon_state = "med_ass_s"
+	item_color = "med_ass"
+
+/obj/item/clothing/under/rank/medical/intern/assistant/skirt
+	name = "medical assistant jumpskirt"
+	icon_state = "med_ass_f_s"
+	item_color = "med_ass_f"
+	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
+
+/obj/item/clothing/under/rank/medical/scrubs/lightgreen
+	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"
diff --git a/modular_ss220/jobs/code/job/medical_jobs.dm b/modular_ss220/jobs/code/job/medical_jobs.dm
new file mode 100644
index 000000000000..99e14716a5c6
--- /dev/null
+++ b/modular_ss220/jobs/code/job/medical_jobs.dm
@@ -0,0 +1,51 @@
+/datum/job/doctor/New()
+	. = ..()
+	alt_titles |= list("Intern", "Medical Assistant", "Student Medical Doctor")
+
+/datum/station_department/medical/New()
+	. = ..()
+	department_roles |= list("Intern", "Medical Assistant", "Student Medical Doctor")
+
+/datum/nttc_configuration/New()
+	. = ..()
+	all_jobs |= list(
+		"Intern" = "medradio",
+		"Medical Assistant" = "medradio",
+		"Student Medical Doctor" = "medradio",
+		)
+
+/datum/outfit/job/doctor/pre_equip(mob/living/carbon/human/H, visualsOnly)
+	. = ..()
+	if(H.mind && H.mind.role_alt_title)
+		var/is_novice = FALSE
+
+		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
+			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" = "Учёный-практикант",
+	// "Scientist Assistant" = "Научный Ассистент",
+	// "Scientist Pregraduate" = "Учёный-бакалавр",
+	// "Scientist Graduate" = "Научный выпускник",
+	// "Scientist Postgraduate" = "Учёный-аспирант",
diff --git a/modular_ss220/jobs/icons/card.dmi b/modular_ss220/jobs/icons/card.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..ac6614d2ce033da29f82e0a64bb7e96a23e46db4
GIT binary patch
literal 5448
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

literal 0
HcmV?d00001

diff --git a/modular_ss220/jobs/icons/clothing/mob/uniform.dmi b/modular_ss220/jobs/icons/clothing/mob/uniform.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..c14f29cbca8379b082fcb228d2926fba502e3413
GIT binary patch
literal 6808
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

literal 0
HcmV?d00001

diff --git a/modular_ss220/jobs/icons/clothing/uniforms.dmi b/modular_ss220/jobs/icons/clothing/uniforms.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..cab653e13b24f5ec3a15dc5f2052a47819516327
GIT binary patch
literal 2408
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
UTH+ugBY4Tc(%jnYu_-b7AO75X3IG5A

literal 0
HcmV?d00001

diff --git a/modular_ss220/jobs/icons/hud.dmi b/modular_ss220/jobs/icons/hud.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..cc08b6d4a546230bdd1922696fbd6f535880feea
GIT binary patch
literal 492
zcmV<I0Tcd-P)<h;3K|Lk000e1NJLTq003YB002M)0{{R37aDIp0000aP)t-sz`($Z
zFpoifqJsbc$!)(|m%PgW0RR90^LGH50A}-_C;w)dp^=O300001bW%=J06^y0W&i*H
zs(MsdbVOxyV{&P5bZKvH004NLjgZd@!Y~ZR&+Su`?JoYidXWv;!M#Ii;~LbAHL1h5
zw>ktbLNCepk?)s4YIAH)U2mFmrymd*M=}SqU#+#8(M!l?x78{D4nY>fVg<6SLh>xh
z0|`6K6<I2+JVwsbjaHXv@381!21y`NNs_^(i1KvSL(yu976|}oc(+)BxZ60>_fQEC
zM!NEptp69TP1`r0hrR#>(`hSA<n!ME006*AL_t(YiDO_C6ck`U0!&Iu3dnqBV`Bqk
zK7)vhiz6~$H8eB`nQxYsmW-;wy#!T5cqyue^fELJCGMyiO2bh#l%-Rufn+C@m!oPZ
zFGtl-UXH4P<X{~IqhJ(_g24tjIyxGV`RD}~=ggTCP&9O{TD1b1k6s_l-o1M#s)prN
zs2b2p>)F-Y(KJ*oN7aB<TF>5IO{oSnCz+?E6(jSf@7`UBs-e6b)dsZsV0L*qstqIu
i>nIonqhJ&aG5`Qn2}bSyKF!Mj0000<MNUMnLSTZWoXv><

literal 0
HcmV?d00001

diff --git a/modular_ss220/jobs/icons/uniforms.dmi b/modular_ss220/jobs/icons/uniforms.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..cab653e13b24f5ec3a15dc5f2052a47819516327
GIT binary patch
literal 2408
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
UTH+ugBY4Tc(%jnYu_-b7AO75X3IG5A

literal 0
HcmV?d00001


From e035bd9745f239865a6a05e9b1da8680b87ab9ea Mon Sep 17 00:00:00 2001
From: PhantornRU <stalkerlesha2@mail.ru>
Date: Sat, 7 Oct 2023 19:33:22 +1000
Subject: [PATCH 2/5] =?UTF-8?q?=D0=98=D0=BA=D0=BE=D0=BD=D0=BA=D0=B0=20?=
 =?UTF-8?q?=D0=BD=D0=B0=D0=BA=D0=BB=D0=B0=D0=B4=D1=8B=D0=B2=D0=B0=D0=B5?=
 =?UTF-8?q?=D1=82=D1=81=D1=8F=20=D0=BF=D0=BE=D0=B2=D0=B5=D1=80=D1=85=20?=
 =?UTF-8?q?=D1=87=D0=B5=D1=80=D0=B5=D0=B7=20=D1=85=D0=B0=D1=80=D0=B4=D0=BA?=
 =?UTF-8?q?=D0=BE=D0=B4,=20=D0=BD=D0=BE=20=D0=BD=D0=B5=20=D0=B1=D0=B5?=
 =?UTF-8?q?=D1=80=D0=B5=D1=82=D1=81=D1=8F=20=D0=B8=D0=B7=20=D0=B4=D0=BE?=
 =?UTF-8?q?=D0=BF.=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_ZC3<Z9_Z=f7$Pw>Ibngs
zhBhk)iNMur4lLK4C4>IQJ4#&oU$4t(d?b<Q+yDPzPLls0_NXgFHGKU4pFyD6^~3-8
u4Lplq-xuiMWeS*eP}Ivf=v~bp28Ny-X+g(`-yea7GkCiCxvX<aXaWG5-f$2A

literal 0
HcmV?d00001

diff --git a/modular_ss220/jobs/icons/clothing/mob/head.dmi b/modular_ss220/jobs/icons/clothing/mob/head.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..70ef94abd256affa98d582c0ebfa75788b73f447
GIT binary patch
literal 380
zcmV-?0fYXDP)<h;3K|Lk000e1NJLTq002M$002M)0{{R3SVwH_0000FP)t-sz`(!(
zj9LN6fdRaE0i|oq;MX_+0004WQchC<K<3zH0001TdQ@0+L}hbha%pgMX>V=-0C=2J
zR&a84_w-Y6@%7{?OD!tS%+FJ>RWQ*r;NmRLOex6#a*U0*I5Sc+(=$pSoZ^zil2jm5
zskpQ#Jvp%;KD{V4HBX6)GbOXA7^IntGp#5wHx<M-<Wg2}^>YCm4**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@C<mxXp8h-)1a`Z)f
zyxru7WV2Wm1?U$cVK&Ec;um3?_X%6R7W9W>O^50Z@T5~cC}4=pE^{%+UCNrlrH3>c
a&*TFRcnbfNC1Iri0000<MNUMnLSTaL0GW^g

literal 0
HcmV?d00001

diff --git a/modular_ss220/jobs/icons/hud.dmi b/modular_ss220/jobs/icons/hud.dmi
index cc08b6d4a546230bdd1922696fbd6f535880feea..b2a80ca3a66dea0c658d9d84078b04f6571653d9 100644
GIT binary patch
literal 745
zcmeAS@N?(olHy`uVBq!ia0vp^2|(<?!3HFsniTN?skv1l5hX6E#mPmP1tppJc?=8{
zb9yK2<vV1+)AIa@=Att9KWlYXh`w^TuegeLBZIpIpJ=|ni@4a5obu)G^LAX5{e9VB
z*E^dV;$DkRynFC%^;T2k#<rxg=xnA-rZ18vRUK8DJwY*(EhTpi<D`&7y{6(H`D4E5
zd#%xkarTqjkQH=PSUD{B-s3Zz%XOB#pXJn1<9+_kL-{+q>fY?zU(0a%OWcIRzLp0W
z7?{{ST^vIy=DeM~(2v<spzXbsihn?3ZmK6^_@yOmag7QAtgZzfO>PbW0j&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_&hjpIJ<KAieLiGCG)ry<`NB#S&uxCl2+@7W=%Z(4BALLF^
zN=iDo{lIMv*CR)o@*B4Yc6B(ueZRkBLWt^#vo(uYcFy#lqG0}cqtKJt#}DaRhj4y6
z>pc0D1ed(CZ^MHN-V$z12`UVv6U#DubMF6^o_y@~L+Qypn+#9QD0{!>xA~^IA9^F@
zk9*EDk^Xn}q{$AJUH12z?!Vu@H@o?u#g3MpLR<EjYqBw3ogG<t_xpL~;8OSK2ln~1
z_CMRWVAo{rZ|wGs+bdPR2(_(bi8wZ0Rio_N?wRpv^;e9Zq}9#*JMq+o7|x>ShN?g8
zxVxg-?tFTDuiN3`ymiSM6+BnJGwM`v9`<19VL3oLQN!qZ`q0d9^~F5Ew9DY>>gTe~
HDWM4fZ<I;+

delta 478
zcmV<40U`eB1?&Tm7=Hu<0000N8gD%S001OVOjJd{z`%<zk3oH+g8%@@ZNFQWyvqOp
z|NsB<cL13HX7isX|7Mw?k&EsC0004WQchC<K<3zH00020dQ@0+L}hbha%pgMX>V=-
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<I2+JVwsbjaHXv
z@381!21y`NNs_^(i1KvSL(yu976|}oc(+)BxZ60>_fQECM!NEptp69TP1`r0hrR#>
z(`hSA<n!ME0Dl0$Nkl<ZNQq-$6ciL-KmtrkN(#t)W@BRmWIlt4i;E*NUo|u|2$^q|
zmX?gF!My}kLwG5whV(Kt4JGcV8cM@aHI$`Os)1xDm6xMxC@)9VP+pFzf#hHv1*2dT
zjDo=iI668Skoo8Z7w62G6HqjCty;ALnU7u{%-+3wCs(S5<yEK}&`Rss)!WfDR4qr<
zfL2=1-d;_q1~ey`r==Am^QZ6LU5Topyd2dAwEAFnc{!>LBnRs#7zLwX6bv!|08|M^
U?fyQ^%K!iX07*qoM6N<$f+^I_WdHyG


From a7f5dcc4f6b85bf160060a7aa8061107c4ad9cc4 Mon Sep 17 00:00:00 2001
From: PhantornRU <stalkerlesha2@mail.ru>
Date: Sun, 8 Oct 2023 00:34:42 +1000
Subject: [PATCH 3/5] =?UTF-8?q?HUD,=20=D0=9A=D0=B0=D1=80=D1=82=D1=8B,=20?=
 =?UTF-8?q?=D0=B0=D0=BB=D1=8C=D1=82-=D1=80=D0=BE=D0=BB=D0=B8,=20=D0=BE?=
 =?UTF-8?q?=D0=B4=D0=B5=D0=B6=D0=B4=D0=B0,=20=D0=B4=D0=BE=D0=BB=D0=B6?=
 =?UTF-8?q?=D0=BD=D0=BE=D1=81=D1=82=D0=B8,=20=D0=B2=D0=BD=D0=B5=D1=81?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B2=20=D0=B3=D0=BB=D0=BE=D0=B1?=
 =?UTF-8?q?=D0=B0=D0=BB=20=D1=81=D0=BF=D0=B8=D1=81=D0=BA=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modular_ss220/jobs/_jobs.dme                  |   7 ++
 modular_ss220/jobs/code/cards_ids.dm          |  92 +++---------------
 .../code/clothing/engineering_clothing.dm     |  26 +++++
 .../jobs/code/clothing/medical_clothing.dm    |   7 +-
 .../jobs/code/clothing/science_clothing.dm    |  26 +++++
 .../jobs/code/clothing/security_clothing.dm   |  26 +++++
 .../jobs/code/job/engineering_jobs.dm         |  32 ++++++
 modular_ss220/jobs/code/job/medical_jobs.dm   |  31 +-----
 modular_ss220/jobs/code/job/science_jobs.dm   |  22 +++++
 modular_ss220/jobs/code/job/security_jobs.dm  |  26 +++++
 modular_ss220/jobs/code/jobs.dm               |  14 +++
 modular_ss220/jobs/icons/card.dmi             | Bin 5448 -> 3846 bytes
 12 files changed, 196 insertions(+), 113 deletions(-)
 create mode 100644 modular_ss220/jobs/code/clothing/engineering_clothing.dm
 create mode 100644 modular_ss220/jobs/code/clothing/science_clothing.dm
 create mode 100644 modular_ss220/jobs/code/clothing/security_clothing.dm
 create mode 100644 modular_ss220/jobs/code/job/engineering_jobs.dm
 create mode 100644 modular_ss220/jobs/code/job/science_jobs.dm
 create mode 100644 modular_ss220/jobs/code/job/security_jobs.dm
 create mode 100644 modular_ss220/jobs/code/jobs.dm

diff --git a/modular_ss220/jobs/_jobs.dme b/modular_ss220/jobs/_jobs.dme
index d67e17013d32..079b4f390d42 100644
--- a/modular_ss220/jobs/_jobs.dme
+++ b/modular_ss220/jobs/_jobs.dme
@@ -2,5 +2,12 @@
 
 #include "code/access.dm"
 #include "code/cards_ids.dm"
+#include "code/jobs.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/job/engineering_jobs.dm"
 #include "code/job/medical_jobs.dm"
+#include "code/job/science_jobs.dm"
+#include "code/job/security_jobs.dm"
diff --git a/modular_ss220/jobs/code/cards_ids.dm b/modular_ss220/jobs/code/cards_ids.dm
index 491b7205fdc6..85e0fb68fc7b 100644
--- a/modular_ss220/jobs/code/cards_ids.dm
+++ b/modular_ss220/jobs/code/cards_ids.dm
@@ -1,91 +1,27 @@
-// !!!!!!!! сделать автоустановку роли новичкам при загрузке
-
-// /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()
+// Для отрисовки ХУД'ов.
+GLOBAL_LIST_INIT(Jobs_SS220, list("intern", "cadet", "trainee", "student"))
 
 /proc/get_all_medical_novice_tittles()
 	return list("Intern", "Medical Assistant", "Student Medical Doctor")
 
 /proc/get_all_security_novice_tittles()
-	return list("Cadet")
+	return list("Security Cadet", "Security Assistant", "Security Graduate")
 
 /proc/get_all_engineering_novice_tittles()
-	return list("Trainee")
+	return list("Trainee Engineer", "Engineer Assistant", "Technical Assistant", "Engineer Student", "Technical Student", "Technical Trainee")
 
 /proc/get_all_science_novice_tittles()
-	return list("Student")
+	return list("Student Scientist", "Scientist Assistant", "Scientist Pregraduate", "Scientist Graduate", "Scientist Postgraduate")
 
 /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")
+/mob/living/carbon/human/sec_hud_set_ID()
+	var/image/holder = hud_list[ID_HUD]
+	holder.icon = 'icons/mob/hud.dmi'
+	if(wear_id && wear_id.get_job_name() in GLOB.Jobs_SS220)
+		holder.icon = 'modular_ss220/jobs/icons/hud.dmi'
+	. = ..()
 
 /obj/item/get_job_name() //Used in secHUD icon generation
 	var/assignmentName = get_ID_assignment(if_no_id = "Unknown")
@@ -107,12 +43,6 @@
 
 	. = ..()
 
-// /atom/prepare_huds()
-// 	. = ..()
-// 	var/image/img = image('modular_ss220/jobs/icons/hud.dmi', src, "")
-// 	img.appearance_flags = RESET_COLOR | RESET_TRANSFORM
-// 	hud_list[ID_HUD] += img
-
 /obj/item/card/id/medical/intern
 	name = "Intern ID"
 	registered_name = "Intern"
diff --git a/modular_ss220/jobs/code/clothing/engineering_clothing.dm b/modular_ss220/jobs/code/clothing/engineering_clothing.dm
new file mode 100644
index 000000000000..7e7078bec5c8
--- /dev/null
+++ b/modular_ss220/jobs/code/clothing/engineering_clothing.dm
@@ -0,0 +1,26 @@
+/obj/item/clothing/under/rank/engineer/trainee
+	name = "engineer trainee jumpsuit"
+	icon = 'modular_ss220/jobs/icons/clothing/uniforms.dmi'
+	icon_override = 'modular_ss220/jobs/icons/clothing/mob/uniform.dmi'
+	//lefthand_file = 'icons/mob/inhands/clothing_lefthand.dmi'
+	//righthand_file = 'icons/mob/inhands/clothing_righthand.dmi'
+	icon_state = "trainee_s"
+	item_color = "trainee"
+	sprite_sheets = null
+
+/obj/item/clothing/under/rank/engineer/trainee/skirt
+	name = "engineer trainee jumpskirt"
+	icon_state = "traineef_s"
+	item_color = "traineef"
+	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
+
+/obj/item/clothing/under/rank/engineer/trainee/assistant
+	name = "engineer assistant jumpsuit"
+	icon_state = "eng_ass_s"
+	item_color = "eng_ass"
+
+/obj/item/clothing/under/rank/engineer/trainee/assistant/skirt
+	name = "engineer assistant jumpskirt"
+	icon_state = "eng_ass_f_s"
+	item_color = "eng_ass_f"
+	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
diff --git a/modular_ss220/jobs/code/clothing/medical_clothing.dm b/modular_ss220/jobs/code/clothing/medical_clothing.dm
index e66454790af2..43e99519aacf 100644
--- a/modular_ss220/jobs/code/clothing/medical_clothing.dm
+++ b/modular_ss220/jobs/code/clothing/medical_clothing.dm
@@ -3,10 +3,7 @@
 	icon_override = 'modular_ss220/jobs/icons/clothing/mob/uniform.dmi'
 	//lefthand_file = 'icons/mob/inhands/clothing_lefthand.dmi'
 	//righthand_file = 'icons/mob/inhands/clothing_righthand.dmi'
-	sprite_sheets = null //если не сработает icon_override, то использовать: (и снизу тоже у зеленки)
-	// sprite_sheets = list(
-	// 	"Human" = 'modular_ss220/jobs/icons/clothing/mob/uniform.dmi',
-	// 	)
+	sprite_sheets = null
 
 	name = "intern jumpsuit"
 	icon_state = "intern_s"
@@ -36,6 +33,7 @@
 	icon_override = 'modular_ss220/jobs/icons/clothing/mob/uniform.dmi'
 	icon_state = "scrubsgreen"
 	item_color = "scrubsgreen"
+	sprite_sheets = null
 
 /obj/item/clothing/head/surgery/green/light
 	name = "light green surgical cap"
@@ -44,3 +42,4 @@
 	icon_override = 'modular_ss220/jobs/icons/clothing/mob/head.dmi'
 	icon_state = "surgcap_green"
 	item_color = "surgcap_green"
+	sprite_sheets = null
diff --git a/modular_ss220/jobs/code/clothing/science_clothing.dm b/modular_ss220/jobs/code/clothing/science_clothing.dm
new file mode 100644
index 000000000000..d885bff41bbf
--- /dev/null
+++ b/modular_ss220/jobs/code/clothing/science_clothing.dm
@@ -0,0 +1,26 @@
+/obj/item/clothing/under/rank/scientist/student
+	name = "scientist student jumpsuit"
+	icon = 'modular_ss220/jobs/icons/clothing/uniforms.dmi'
+	icon_override = 'modular_ss220/jobs/icons/clothing/mob/uniform.dmi'
+	//lefthand_file = 'icons/mob/inhands/clothing_lefthand.dmi'
+	//righthand_file = 'icons/mob/inhands/clothing_righthand.dmi'
+	icon_state = "student_s"
+	item_color = "student"
+	sprite_sheets = null
+
+/obj/item/clothing/under/rank/scientist/student/skirt
+	name = "scientist student jumpskirt"
+	icon_state = "studentf_s"
+	item_color = "studentf"
+	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
+
+/obj/item/clothing/under/rank/scientist/student/assistant
+	name = "scientist assistant jumpsuit"
+	icon_state = "sci_ass_s"
+	item_color = "sci_ass"
+
+/obj/item/clothing/under/rank/scientist/student/assistant/skirt
+	name = "scientist assistant jumpskirt"
+	icon_state = "sci_ass_f_s"
+	item_color = "sci_ass_f"
+	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
diff --git a/modular_ss220/jobs/code/clothing/security_clothing.dm b/modular_ss220/jobs/code/clothing/security_clothing.dm
new file mode 100644
index 000000000000..681b4581b9ef
--- /dev/null
+++ b/modular_ss220/jobs/code/clothing/security_clothing.dm
@@ -0,0 +1,26 @@
+/obj/item/clothing/under/rank/security/cadet
+	name = "security cadet jumpsuit"
+	icon = 'modular_ss220/jobs/icons/clothing/uniforms.dmi'
+	icon_override = 'modular_ss220/jobs/icons/clothing/mob/uniform.dmi'
+	//lefthand_file = 'icons/mob/inhands/clothing_lefthand.dmi'
+	//righthand_file = 'icons/mob/inhands/clothing_righthand.dmi'
+	icon_state = "cadet_s"
+	item_color = "cadet"
+	sprite_sheets = null
+
+/obj/item/clothing/under/rank/security/cadet/skirt
+	name = "security cadet jumpskirt"
+	icon_state = "cadetf_s"
+	item_color = "cadetf"
+	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
+
+/obj/item/clothing/under/rank/security/cadet/assistant
+	name = "security assistant jumpsuit"
+	icon_state = "sec_ass_s"
+	item_color = "sec_ass"
+
+/obj/item/clothing/under/rank/security/cadet/assistant/skirt
+	name = "security assistant jumpskirt"
+	icon_state = "sec_ass_f_s"
+	item_color = "sec_ass_f"
+	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
diff --git a/modular_ss220/jobs/code/job/engineering_jobs.dm b/modular_ss220/jobs/code/job/engineering_jobs.dm
new file mode 100644
index 000000000000..b50807bc4cb8
--- /dev/null
+++ b/modular_ss220/jobs/code/job/engineering_jobs.dm
@@ -0,0 +1,32 @@
+/datum/job/engineer/New()
+	. = ..()
+	alt_titles |= get_all_engineering_novice_tittles()
+
+/datum/station_department/engineering/New()
+	. = ..()
+	department_roles |= get_all_engineering_novice_tittles()
+
+/datum/outfit/job/engineer/pre_equip(mob/living/carbon/human/H, visualsOnly)
+	. = ..()
+	if(H.mind && H.mind.role_alt_title)
+		if(H.mind.role_alt_title in get_all_engineering_novice_tittles())
+			uniform = /obj/item/clothing/under/rank/engineer/trainee
+			if(H.gender == FEMALE)
+				uniform = /obj/item/clothing/under/rank/engineer/trainee/skirt
+			id = /obj/item/card/id/engineering/trainee
+			gloves = /obj/item/clothing/gloves/color/orange
+
+		switch(H.mind.role_alt_title)
+			if("Engineer Assistant")
+				uniform = /obj/item/clothing/under/rank/engineer/trainee/assistant
+				if(H.gender == FEMALE)
+					uniform = /obj/item/clothing/under/rank/engineer/trainee/assistant/skirt
+			if("Technical Assistant")
+				uniform = /obj/item/clothing/under/rank/engineer/trainee/assistant
+				if(H.gender == FEMALE)
+					uniform = /obj/item/clothing/under/rank/engineer/trainee/assistant/skirt
+				head = /obj/item/clothing/head/soft/orange
+			if("Technical Student", "Technical Trainee")
+				head = /obj/item/clothing/head/soft/orange
+			if("Engineer Student")
+				head = /obj/item/clothing/head/beret/eng
diff --git a/modular_ss220/jobs/code/job/medical_jobs.dm b/modular_ss220/jobs/code/job/medical_jobs.dm
index c5321f411ca5..8d098a8b4cbc 100644
--- a/modular_ss220/jobs/code/job/medical_jobs.dm
+++ b/modular_ss220/jobs/code/job/medical_jobs.dm
@@ -6,21 +6,6 @@
 	. = ..()
 	department_roles |= get_all_medical_novice_tittles()
 
-/datum/nttc_configuration/New()
-	. = ..()
-	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)
@@ -29,29 +14,19 @@
 			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")
 				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")
-				head = /obj/item/clothing/head/surgery/green/light
-				uniform = /obj/item/clothing/under/rank/medical/scrubs/green/light
 			if("Medical Assistant")
 				uniform = /obj/item/clothing/under/rank/medical/intern/assistant
 				if(H.gender == FEMALE)
 					uniform = /obj/item/clothing/under/rank/medical/intern/assistant/skirt
-
-
-
-	// "student scientist" = "Учёный-практикант",
-	// "Scientist Assistant" = "Научный Ассистент",
-	// "Scientist Pregraduate" = "Учёный-бакалавр",
-	// "Scientist Graduate" = "Научный выпускник",
-	// "Scientist Postgraduate" = "Учёный-аспирант",
+			if("Student Medical Doctor")
+				head = /obj/item/clothing/head/surgery/green/light
+				uniform = /obj/item/clothing/under/rank/medical/scrubs/green/light
diff --git a/modular_ss220/jobs/code/job/science_jobs.dm b/modular_ss220/jobs/code/job/science_jobs.dm
new file mode 100644
index 000000000000..2b51cb306222
--- /dev/null
+++ b/modular_ss220/jobs/code/job/science_jobs.dm
@@ -0,0 +1,22 @@
+/datum/job/scientist/New()
+	. = ..()
+	alt_titles |= get_all_science_novice_tittles()
+
+/datum/station_department/science/New()
+	. = ..()
+	department_roles |= get_all_science_novice_tittles()
+
+/datum/outfit/job/scientist/pre_equip(mob/living/carbon/human/H, visualsOnly)
+	. = ..()
+	if(H.mind && H.mind.role_alt_title)
+		if(H.mind.role_alt_title in get_all_science_novice_tittles())
+			uniform = /obj/item/clothing/under/rank/scientist/student
+			if(H.gender == FEMALE)
+				uniform = /obj/item/clothing/under/rank/scientist/student/skirt
+			id = /obj/item/card/id/research/student
+
+		switch(H.mind.role_alt_title)
+			if("Scientist Assistant")
+				uniform = /obj/item/clothing/under/rank/scientist/student/assistant
+				if(H.gender == FEMALE)
+					uniform = /obj/item/clothing/under/rank/scientist/student/assistant/skirt
diff --git a/modular_ss220/jobs/code/job/security_jobs.dm b/modular_ss220/jobs/code/job/security_jobs.dm
new file mode 100644
index 000000000000..ca6d70161673
--- /dev/null
+++ b/modular_ss220/jobs/code/job/security_jobs.dm
@@ -0,0 +1,26 @@
+/datum/job/officer/New()
+	. = ..()
+	alt_titles = get_all_security_novice_tittles() // =, а не |=, т.к. отсутствуют альт. названия
+
+/datum/station_department/security/New()
+	. = ..()
+	department_roles |= get_all_security_novice_tittles()
+
+/datum/outfit/job/officer/pre_equip(mob/living/carbon/human/H, visualsOnly)
+	. = ..()
+	if(H.mind && H.mind.role_alt_title)
+		if(H.mind.role_alt_title in get_all_security_novice_tittles())
+			uniform = /obj/item/clothing/under/rank/security/cadet
+			if(H.gender == FEMALE)
+				uniform = /obj/item/clothing/under/rank/security/cadet/skirt
+			head = /obj/item/clothing/head/soft/sec
+			id = /obj/item/card/id/security/cadet
+			l_pocket = /obj/item/reagent_containers/spray/pepper
+			//box = /obj/item/storage/box/survival_security/cadet
+		switch(H.mind.role_alt_title)
+			if("Security Assistant")
+				uniform = /obj/item/clothing/under/rank/security/cadet/assistant
+				if(H.gender == FEMALE)
+					uniform = /obj/item/clothing/under/rank/security/cadet/assistant/skirt
+			if("Security Graduate")
+				head = /obj/item/clothing/head/beret/sec
diff --git a/modular_ss220/jobs/code/jobs.dm b/modular_ss220/jobs/code/jobs.dm
new file mode 100644
index 000000000000..7c0ef38ead8f
--- /dev/null
+++ b/modular_ss220/jobs/code/jobs.dm
@@ -0,0 +1,14 @@
+/datum/nttc_configuration/New()
+	. = ..()
+	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
diff --git a/modular_ss220/jobs/icons/card.dmi b/modular_ss220/jobs/icons/card.dmi
index ac6614d2ce033da29f82e0a64bb7e96a23e46db4..590f670636481d30f429873fc370398891b9fba8 100644
GIT binary patch
literal 3846
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
K(fg}zG5-O9^tUMh

literal 5448
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


From d668d4a05bc89be2e2cf68952eb62ebbf950fd8c Mon Sep 17 00:00:00 2001
From: PhantornRU <stalkerlesha2@mail.ru>
Date: Sun, 8 Oct 2023 00:51:18 +1000
Subject: [PATCH 4/5] =?UTF-8?q?=D0=9E=D1=87=D0=B8=D1=81=D1=82=D0=BA=D0=B0?=
 =?UTF-8?q?=20=D0=BA=D0=BE=D0=B4=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modular_ss220/jobs/code/cards_ids.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modular_ss220/jobs/code/cards_ids.dm b/modular_ss220/jobs/code/cards_ids.dm
index 85e0fb68fc7b..ee9a7a72f773 100644
--- a/modular_ss220/jobs/code/cards_ids.dm
+++ b/modular_ss220/jobs/code/cards_ids.dm
@@ -19,7 +19,7 @@ GLOBAL_LIST_INIT(Jobs_SS220, list("intern", "cadet", "trainee", "student"))
 /mob/living/carbon/human/sec_hud_set_ID()
 	var/image/holder = hud_list[ID_HUD]
 	holder.icon = 'icons/mob/hud.dmi'
-	if(wear_id && wear_id.get_job_name() in GLOB.Jobs_SS220)
+	if(wear_id && (wear_id.get_job_name() in GLOB.Jobs_SS220))
 		holder.icon = 'modular_ss220/jobs/icons/hud.dmi'
 	. = ..()
 

From 9b0209a42140d907522372e5fbaca8b147c04e93 Mon Sep 17 00:00:00 2001
From: PhantornRU <stalkerlesha2@mail.ru>
Date: Sun, 8 Oct 2023 01:00:51 +1000
Subject: [PATCH 5/5] =?UTF-8?q?=D0=A1=D1=81=D1=8B=D0=BB=D0=BA=D0=B0=20?=
 =?UTF-8?q?=D0=BD=D0=B0=20=D1=83=D0=BB=D1=83=D1=87=D1=88=D0=B5=D0=BD=D0=BD?=
 =?UTF-8?q?=D1=8B=D0=B5=20=D0=BA=D0=B0=D1=80=D1=82=D1=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modular_ss220/jobs/code/cards_ids.dm |   8 ++++----
 modular_ss220/jobs/icons/card.dmi    | Bin 3846 -> 0 bytes
 2 files changed, 4 insertions(+), 4 deletions(-)
 delete mode 100644 modular_ss220/jobs/icons/card.dmi

diff --git a/modular_ss220/jobs/code/cards_ids.dm b/modular_ss220/jobs/code/cards_ids.dm
index ee9a7a72f773..dbb8ac982d67 100644
--- a/modular_ss220/jobs/code/cards_ids.dm
+++ b/modular_ss220/jobs/code/cards_ids.dm
@@ -46,7 +46,7 @@ GLOBAL_LIST_INIT(Jobs_SS220, list("intern", "cadet", "trainee", "student"))
 /obj/item/card/id/medical/intern
 	name = "Intern ID"
 	registered_name = "Intern"
-	icon = 'modular_ss220/jobs/icons/card.dmi'
+	icon = 'modular_ss220/aesthetics/better_ids/icons/better_ids.dmi'
 	icon_state = "intern"
 	item_state = "intern-id"
 	rank = "Intern"
@@ -54,20 +54,20 @@ GLOBAL_LIST_INIT(Jobs_SS220, list("intern", "cadet", "trainee", "student"))
 /obj/item/card/id/research/student
 	name = "Student ID"
 	registered_name = "Student"
-	icon = 'modular_ss220/jobs/icons/card.dmi'
+	icon = 'modular_ss220/aesthetics/better_ids/icons/better_ids.dmi'
 	icon_state = "student"
 	item_state = "student-id"
 
 /obj/item/card/id/engineering/trainee
 	name = "Trainee ID"
 	registered_name = "Trainee"
-	icon = 'modular_ss220/jobs/icons/card.dmi'
+	icon = 'modular_ss220/aesthetics/better_ids/icons/better_ids.dmi'
 	icon_state = "trainee"
 	item_state = "trainee-id"
 
 /obj/item/card/id/security/cadet
 	name = "Cadet ID"
 	registered_name = "Cadet"
-	icon = 'modular_ss220/jobs/icons/card.dmi'
+	icon = 'modular_ss220/aesthetics/better_ids/icons/better_ids.dmi'
 	icon_state = "cadet"
 	item_state = "cadet-id"
diff --git a/modular_ss220/jobs/icons/card.dmi b/modular_ss220/jobs/icons/card.dmi
deleted file mode 100644
index 590f670636481d30f429873fc370398891b9fba8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3846
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
K(fg}zG5-O9^tUMh