Job outfit changes (#118)

* Bunch of changes and fixes * Modularity * one misstake
CeladonSS13 · Nov 29, 2024 · 058fb3d · 058fb3d
1 parent 355d293
commit 058fb3d
Show file tree

Hide file tree

Showing 8 changed files with 161 additions and 28 deletions.
diff --git a/code/datums/outfits/jobs/engineering.dm b/code/datums/outfits/jobs/engineering.dm
@@ -27,24 +27,24 @@
 	name = OUTFIT_JOB_NAME("Containment Engineer")
 	uniform = /obj/item/clothing/under/solgov/utility/fleet/engineering
 	shoes = /obj/item/clothing/shoes/dutyboots
-	id_type = /obj/item/card/id/seclvl4eng
+	// [CELADON-EDIT] - CELADON_OUTFITS
+	// id_type = /obj/item/card/id/seclvl4eng // CELADON-EDIT - ORIGINAL
+	id_type = /obj/item/card/id/seclvl4conteng
+	// [/CELADON-EDIT]
 	belt = /obj/item/storage/belt/utility/full
 	l_pocket = /obj/item/device/radio
-	l_ear = /obj/item/device/radio/headset/conteng
+	// [CELADON-EDIT] - CELADON_OUTFITS
+	//l_ear = /obj/item/device/radio/headset/conteng
+	l_ear = /obj/item/device/radio/headset/conteng/alt
+	// [/CELADON-EDIT]
 
 /decl/hierarchy/outfit/job/engineering/seneng
 	name = OUTFIT_JOB_NAME("Senior Engineer")
 	uniform = /obj/item/clothing/under/solgov/utility/fleet/engineering
 	shoes = /obj/item/clothing/shoes/dutyboots
-	// [CELADON-EDIT] - CELADON_OUTFITS
-	// id_type = /obj/item/card/id/seclvl4eng // CELADON-EDIT - ORIGINAL
-	id_type = /obj/item/card/id/seclvl4conteng
-	// [/CELADON-EDIT]
+	id_type = /obj/item/card/id/seclvl4eng
 	belt = /obj/item/storage/belt/utility/full
 	l_pocket = /obj/item/device/radio
-	// [CELADON-ADD] - CELADON_OUTFITS
-	r_ear = /obj/item/device/radio/headset/conteng/alt
-	// [/CELADON-ADD]
 	l_ear = /obj/item/device/radio/headset/heads/ce
 
 /decl/hierarchy/outfit/job/engineering/juneng

diff --git a/code/datums/outfits/jobs/security.dm b/code/datums/outfits/jobs/security.dm
@@ -85,7 +85,6 @@
 	mask = /obj/item/clothing/mask/balaclava
 	gloves = /obj/item/clothing/gloves/thick/swat/lcz
 
-
 /decl/hierarchy/outfit/job/security/hcz_sergeant
 	name = OUTFIT_JOB_NAME("HCZ Sergeant")
 	uniform = /obj/item/clothing/under/rank/warden/hcz
@@ -123,15 +122,21 @@
 	name = OUTFIT_JOB_NAME("EZ Combat Medic")
 	uniform = /obj/item/clothing/under/rank/security/ez
 	shoes = /obj/item/clothing/shoes/dutyboots
-	id_type = /obj/item/card/id/seclvl3ez
+	// [CELADON-EDIT] - CELADON_OUTFITS
+	// id_type = /obj/item/card/id/seclvl3ez
+	id_type = /obj/item/card/id/junseclvl2ez
+	// [/CELADON-EDIT]
 	l_ear = /obj/item/device/radio/headset/headset_sec_ecz
 	l_pocket = /obj/item/book/manual/scp/secsop
 	suit = /obj/item/clothing/suit/armor/pcarrier/scp/medium
 	l_pocket = /obj/item/handcuffs
 	r_pocket = /obj/item/melee/telebaton
 	backpack_contents = list(/obj/item/storage/firstaid/adv = 1, /obj/item/storage/firstaid/stab = 1)
 	belt = /obj/item/storage/belt/holster/security/fullmk9
-	glasses = /obj/item/clothing/glasses/sunglasses/sechud
+	// [CELADON-EDIT] - CELADON_OUTFITS
+	// glasses = /obj/item/clothing/glasses/sunglasses/sechud
+	glasses = /obj/item/clothing/glasses/hud/health/visor
+	// [CELADON-EDIT]
 	head = /obj/item/clothing/head/helmet/scp/hczsecurityguard
 	mask = /obj/item/clothing/mask/balaclava
 	gloves = /obj/item/clothing/gloves/latex/nitrile/armored
@@ -140,7 +145,10 @@
 	name = OUTFIT_JOB_NAME("EZ Agent")
 	uniform = /obj/item/clothing/under/rank/security/ez
 	shoes = /obj/item/clothing/shoes/dutyboots
-	id_type = /obj/item/card/id/seclvl3ez
+	// [CELADON-EDIT] - CELADON_OUTFITS
+	// id_type = /obj/item/card/id/seclvl3ez
+	id_type = /obj/item/card/id/junseclvl2ez
+	// [/CELADON-EDIT]
 	l_ear = /obj/item/device/radio/headset/headset_sec_ecz
 	l_pocket = /obj/item/book/manual/scp/secsop
 	suit = /obj/item/clothing/suit/armor/pcarrier/scp/medium
@@ -174,7 +182,10 @@
 	uniform = /obj/item/clothing/under/det
 	shoes = /obj/item/clothing/shoes/dress
 	suit = /obj/item/clothing/suit/storage/det_trench
-	id_type = /obj/item/card/id/seclvl3ez
+	// [CELADON-EDIT] - CELADON_OUTFITS
+	// id_type = /obj/item/card/id/seclvl3ez
+	id_type = /obj/item/card/id/junseclvl2ez
+	// /[CELADON-EDIT]
 	l_ear = /obj/item/device/radio/headset/heads/cos
 	belt = /obj/item/storage/belt/holster/security/fullrhino
 	l_hand = /obj/item/storage/briefcase/crimekit
@@ -277,7 +288,10 @@
 	r_pocket = /obj/item/melee/telebaton
 	backpack_contents = list()
 	glasses = /obj/item/clothing/glasses/sunglasses/sechud
-	belt = /obj/item/gun/energy/stunrevolver/taser
+	// [CELADON-EDIT] - CELADON_OUTFITS
+	//belt = /obj/item/gun/energy/stunrevolver/taser
+	belt = /obj/item/storage/belt/holster/security/fullmk9
+	// /[CELADON-EDIT]
 	gloves = /obj/item/clothing/gloves/tactical/scp
 
 /decl/hierarchy/outfit/job/security/lcz_cadet

diff --git a/code/game/jobs/job/engineering.dm b/code/game/jobs/job/engineering.dm
@@ -127,6 +127,12 @@
 	economic_power = 5
 	minimal_player_age = 10
 	ideal_character_age = 30
+	// [CELADON-ADD] - CELADON_OUTFITS
+	alt_titles = list(
+		"Containment Specialist",
+		"Containment Technician"
+		)
+	// /[CELADON-ADD]
 	outfit_type = /decl/hierarchy/outfit/job/engineering/conteng
 	requirements = list(EXP_TYPE_ENGINEERING = 600)
 	class = CLASS_B

diff --git a/code/game/jobs/job/security.dm b/code/game/jobs/job/security.dm
@@ -262,16 +262,30 @@
 		ACCESS_NETWORK
 	)
 	minimal_access = list()
-
+// [CELADON-EDIT] - CELADON_OUTFITS
+//	min_skill = list(
+//	    SKILL_COMPUTER    = SKILL_EXPERIENCED,
+//	    SKILL_FORENSICS   = SKILL_TRAINED
+//	)
+
+//	max_skill = list(
+//	    SKILL_COMPUTER    = SKILL_MASTER,
+//	    SKILL_FORENSICS   = SKILL_EXPERIENCED
+//	)
 	min_skill = list(
-	    SKILL_COMPUTER    = SKILL_EXPERIENCED,
-	    SKILL_FORENSICS   = SKILL_TRAINED
+		SKILL_COMPUTER    = SKILL_EXPERIENCED,
+		SKILL_FORENSICS   = SKILL_TRAINED,
+		SKILL_COMBAT      = SKILL_BASIC,
+		SKILL_WEAPONS     = SKILL_BASIC
 	)
 
 	max_skill = list(
-	    SKILL_COMPUTER    = SKILL_MASTER,
-	    SKILL_FORENSICS   = SKILL_EXPERIENCED
+		SKILL_COMBAT      = SKILL_EXPERIENCED,
+		SKILL_WEAPONS     = SKILL_EXPERIENCED,
+		SKILL_COMPUTER    = SKILL_MASTER,
+		SKILL_FORENSICS   = SKILL_EXPERIENCED
 	)
+// /[CELADON-EDIT]
 	skill_points = 17
 
 	roleplay_difficulty = "Medium - Hard"
@@ -290,7 +304,7 @@
 	supervisors = "the LCZ Zone Lieutenant"
 	economic_power = 4
 	requirements = list(EXP_TYPE_LCZ = 480)
-	alt_titles = list("LCZ Senior Combat Medic" = /decl/hierarchy/outfit/job/security/lcz_medic, "LCZ Senior Riot Control Unit" = /decl/hierarchy/outfit/job/security/lcz_riot)
+	alt_titles = list("LCZ Senior Combat Medic" = /decl/hierarchy/outfit/job/security/lcz_senmedic, "LCZ Senior Riot Control Unit" = /decl/hierarchy/outfit/job/security/lcz_riot)
 	minimal_player_age = 5
 	ideal_character_age = 25
 	outfit_type = /decl/hierarchy/outfit/job/security/lcz_sergeant
@@ -339,7 +353,7 @@
 	supervisors = "the HCZ Zone Lieutenant"
 	economic_power = 4
 	requirements = list(EXP_TYPE_HCZ = 480)
-	alt_titles = list("HCZ Senior Containment Response Agent", "HCZ Containment Response Sergeant", "HCZ Senior Combat Medic", "HCZ Senior Agent")
+	alt_titles = list("HCZ Senior Containment Response Agent", "HCZ Containment Response Sergeant", "HCZ Senior Combat Medic" = /decl/hierarchy/outfit/job/security/hcz_senmedic, "HCZ Senior Agent")
 	minimal_player_age = 5
 	ideal_character_age = 25
 	outfit_type = /decl/hierarchy/outfit/job/security/hcz_sergeant
@@ -383,7 +397,7 @@
 	supervisors = "the EZ Zone Supervisor"
 	economic_power = 4
 	requirements = list(EXP_TYPE_ECZ = 480)
-	alt_titles = list("Investigation Officer" = /decl/hierarchy/outfit/job/security/ez_sergeant_investigative, "EZ Senior Combat Medic" = /decl/hierarchy/outfit/job/security/ez_medic)
+	alt_titles = list("Investigation Officer" = /decl/hierarchy/outfit/job/security/ez_sergeant_investigative, "EZ Senior Combat Medic" = /decl/hierarchy/outfit/job/security/ez_senmedic)
 	minimal_player_age = 5
 	ideal_character_age = 25
 	outfit_type = /decl/hierarchy/outfit/job/security/ez_sergeant
@@ -485,7 +499,7 @@
 	supervisors = "the HCZ Sergeants and Zone Lieutenant"
 	economic_power = 4
 	requirements = list(EXP_TYPE_HCZ = 220)
-	alt_titles = list("HCZ Containment Response Agent", "HCZ Containment Response Guard", "HCZ Combat Medic", "HCZ Agent")
+	alt_titles = list("HCZ Containment Response Agent", "HCZ Containment Response Guard", "HCZ Combat Medic" = /decl/hierarchy/outfit/job/security/hcz_medic, "HCZ Agent")
 //	minimal_player_age = 0
 	ideal_character_age = 25
 	outfit_type = /decl/hierarchy/outfit/job/security/hcz_guard

diff --git a/mod_celadon/outfits/README.md b/mod_celadon/outfits/README.md
@@ -38,12 +38,45 @@ ID мода: CELADON_OUTFITS
         `/decl/hierarchy/outfit/mtf/epsilon_11/leader`
         Изменены: `suit`, `head`
 
-- EDIT: `code\datums\outfits\jobs\engineering.dm`:
+<!-- - EDIT: `code\datums\outfits\jobs\engineering.dm`:
         `/decl/hierarchy/outfit/job/engineering/seneng`
         Изменено: `id_type`
 - ADD: `code\datums\outfits\jobs\engineering.dm`:
         `/decl/hierarchy/outfit/job/engineering/seneng`
         Добавлено: `r_ear`
+-->
+- ADD: `code\datums\outfits\jobs\security.dm`
+        ADDED: `/decl/hierarchy/outfit/job/security/ez_senmedic`
+        ADDED: `/decl/hierarchy/outfit/job/security/lcz_senmedic`
+        ADDED: `/decl/hierarchy/outfit/job/security/hcz_senmedic`
+        ADDED: `/decl/hierarchy/outfit/job/security/hcz_medic`
+
+- ADD: `code\game\jobs\job\engineering.dm`
+        ADDED: `alt_titles`
+
+- EDIT: `code\datums\outfits\jobs\engineering.dm`:
+        `/decl/hierarchy/outfit/job/engineering/conteng`
+        EDITED: `id_type`, `l_ear`
+
+- EDIT: `code\datums\outfits\jobs\security.dm`
+        `/decl/hierarchy/outfit/job/security/ez_medic`
+        EDITED: `id_type`, `glasses`
+
+- EDIT: `code\datums\outfits\jobs\security.dm`
+        `/decl/hierarchy/outfit/job/security/ez_guard`
+        EDITED: `id_type`
+
+- EDIT: `code\datums\outfits\jobs\security.dm`
+        `/decl/hierarchy/outfit/job/security/raisa_agent`
+        EDITED: `belt`
+- EDIT: `code\datums\outfits\jobs\security.dm`
+        `/decl/hierarchy/outfit/job/security/ez_guard_investigative`
+        EDITED: `id_type`
+
+- EDIT `code\game\jobs\job\security.dm`
+        `/datum/job/raisa`
+        EDITED: `min_skills`, `max_skills`
+
 <!--
   Если вы редактировали какие-либо процедуры или переменные в кор коде,
   они должны быть указаны здесь.
@@ -85,7 +118,7 @@ ID мода: CELADON_OUTFITS
 
 ### Авторы:
 
-Voiko
+Voiko / John Chiffir
 <!--
   Здесь находится твой никнейм
   Если работал совместно - никнеймы тех, кто помогал.

diff --git a/mod_celadon/outfits/_outfits.dm b/mod_celadon/outfits/_outfits.dm
@@ -2,6 +2,6 @@
 	/// A string name for the modpack. Used for looking up other modpacks in init.
 	name = "Outfits"
 	/// A string desc for the modpack. Can be used for modpack verb list as description.
-	desc = "Этот мод добавляет различные наборы одежды."
+	desc = "Этот мод добавляет различные наборы одежды, а также фиксит существующие"
 	/// A string with authors of this modpack.
-	author = "Voiko"
+	author = "Voiko / John Chiffir"
diff --git a/mod_celadon/outfits/_outfits.dme b/mod_celadon/outfits/_outfits.dme
@@ -2,5 +2,6 @@
 #define MODPACK_CELADON_OUTFITS
 
 #include "_outfits.dm"
+#include "code\security.dm"
 
 #endif
diff --git a/mod_celadon/outfits/code/security.dm b/mod_celadon/outfits/code/security.dm
@@ -0,0 +1,65 @@
+/decl/hierarchy/outfit/job/security/lcz_senmedic
+	name = OUTFIT_JOB_NAME("LCZ Senior Medic")
+	uniform = /obj/item/clothing/under/rank/warden/lcz
+	glasses = /obj/item/clothing/glasses/hud/health/visor
+	suit = /obj/item/clothing/suit/armor/vest/scp/medarmor/medic
+	shoes = /obj/item/clothing/shoes/dutyboots
+	id_type = /obj/item/card/id/seclvl3lcz
+	l_ear = /obj/item/device/radio/headset/headset_sec_lcz/medic
+	l_pocket = /obj/item/handcuffs
+	r_pocket = /obj/item/melee/telebaton
+	backpack_contents = list(/obj/item/storage/firstaid/adv = 1, /obj/item/storage/firstaid/stab = 1)
+	belt = /obj/item/storage/belt/holster/security/fullmk9
+	head = /obj/item/clothing/head/helmet/scp/security/medic
+	mask = /obj/item/clothing/mask/balaclava
+	gloves = /obj/item/clothing/gloves/latex/nitrile/armored
+
+/decl/hierarchy/outfit/job/security/hcz_senmedic
+	name = OUTFIT_JOB_NAME("HCZ Senior Combat Medic")
+	uniform = /obj/item/clothing/under/rank/warden/hcz
+	shoes = /obj/item/clothing/shoes/dutyboots
+	id_type = /obj/item/card/id/seclvl3hcz
+	l_ear = /obj/item/device/radio/headset/headset_sec_hcz
+	suit = /obj/item/clothing/suit/armor/pcarrier/scp/tactical
+	l_pocket = /obj/item/handcuffs
+	r_pocket = /obj/item/melee/telebaton
+	backpack_contents = list(/obj/item/storage/firstaid/adv = 1, /obj/item/storage/firstaid/stab = 1)
+	belt = /obj/item/storage/belt/holster/security/fullmk9
+	glasses = /obj/item/clothing/glasses/hud/health/visor
+	head = /obj/item/clothing/head/helmet/scp/hczsecurityguard
+	mask = /obj/item/clothing/mask/balaclava
+	gloves = /obj/item/clothing/gloves/latex/nitrile/armored
+
+/decl/hierarchy/outfit/job/security/ez_senmedic
+	name = OUTFIT_JOB_NAME("EZ Senior Combat Medic")
+	uniform = /obj/item/clothing/under/rank/warden/ez
+	shoes = /obj/item/clothing/shoes/dutyboots
+	id_type = /obj/item/card/id/seclvl3ez
+	l_ear = /obj/item/device/radio/headset/headset_sec_ecz
+	l_pocket = /obj/item/book/manual/scp/secsop
+	suit = /obj/item/clothing/suit/armor/pcarrier/scp/medium
+	l_pocket = /obj/item/handcuffs
+	r_pocket = /obj/item/melee/telebaton
+	backpack_contents = list(/obj/item/storage/firstaid/adv = 1, /obj/item/storage/firstaid/stab = 1)
+	belt = /obj/item/storage/belt/holster/security/fullmk9
+	glasses = /obj/item/clothing/glasses/hud/health/visor
+	head = /obj/item/clothing/head/helmet/scp/hczsecurityguard
+	mask = /obj/item/clothing/mask/balaclava
+	gloves = /obj/item/clothing/gloves/latex/nitrile/armored
+
+/decl/hierarchy/outfit/job/security/hcz_medic
+	name = OUTFIT_JOB_NAME("HCZ Combat Medic")
+	uniform = /obj/item/clothing/under/rank/security/hcz
+	glasses = /obj/item/clothing/glasses/sunglasses/sechud/goggles
+	shoes = /obj/item/clothing/shoes/dutyboots
+	id_type = /obj/item/card/id/junseclvl3hcz
+	l_ear = /obj/item/device/radio/headset/headset_sec_hcz
+	suit = /obj/item/clothing/suit/armor/pcarrier/scp/tactical
+	l_pocket = /obj/item/handcuffs
+	r_pocket = /obj/item/melee/telebaton
+	backpack_contents = list(/obj/item/storage/firstaid/adv = 1, /obj/item/storage/firstaid/stab = 1)
+	belt = /obj/item/storage/belt/holster/security/fullmk9
+	glasses = /obj/item/clothing/glasses/hud/health/visor
+	head = /obj/item/clothing/head/helmet/scp/hczsecurityguard
+	mask = /obj/item/clothing/mask/balaclava
+	gloves = /obj/item/clothing/gloves/latex/nitrile/armored