Less core code interferance

SierraBay · Dec 30, 2023 · 72c8f47 · 72c8f47
1 parent 3b7a3c2
commit 72c8f47
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 19 deletions.
diff --git a/code/modules/client/preference_setup/loadout/lists/suits.dm b/code/modules/client/preference_setup/loadout/lists/suits.dm
@@ -159,16 +159,7 @@
 
 /datum/gear/suit/medcoat/New()
 	..()
-	 // [SIERRA-EDIT] - LOADOUT_ITEMS - Порт спрайта first responder jacket с инфинити в качестве нового предмета
-	 // gear_tweaks += new/datum/gear_tweak/path/specified_types_args(/obj/item/clothing/suit/storage/toggle/fr_jacket, /obj/item/clothing/suit/storage/toggle/fr_jacket/ems, /obj/item/clothing/suit/surgicalapron, /obj/item/clothing/suit/storage/toggle/fr_jacket/emrs) // SIERRA-EDIT - ORIGINAL
-	var/medicoats = list()
-	medicoats["first responder jacket"] = /obj/item/clothing/suit/storage/toggle/fr_jacket
-	medicoats["first responder jacket (high-visibility)"] = /obj/item/clothing/suit/storage/toggle/fr_jacket/highvis
-	medicoats["EMS jacket"] = /obj/item/clothing/suit/storage/toggle/fr_jacket/ems
-	medicoats["surgical apron"] = /obj/item/clothing/suit/surgicalapron
-	medicoats["medical jacket"] = /obj/item/clothing/suit/storage/toggle/fr_jacket/emrs
-	gear_tweaks += new/datum/gear_tweak/path(medicoats)
-	 // [/SIERRA-EDIT]
+	gear_tweaks += new/datum/gear_tweak/path/specified_types_args(/obj/item/clothing/suit/storage/toggle/fr_jacket, /obj/item/clothing/suit/storage/toggle/fr_jacket/ems, /obj/item/clothing/suit/surgicalapron, /obj/item/clothing/suit/storage/toggle/fr_jacket/emrs)
 
 /datum/gear/suit/trenchcoat
 	display_name = "trenchcoat selection"

diff --git a/code/modules/client/preference_setup/loadout/lists/uniforms.dm b/code/modules/client/preference_setup/loadout/lists/uniforms.dm
@@ -170,10 +170,6 @@
 	corps += /obj/item/clothing/under/skinner
 	corps += /obj/item/clothing/under/dais
 	corps += /obj/item/clothing/under/rank/roboticist/bishop
-	 // [SIERRA-ADD] - LOADOUT_ITEMS - Новые варианты формы для ЭКшников
-	corps += /obj/item/clothing/under/scg_expeditonary
-	corps += /obj/item/clothing/under/scg_expeditonary/officer
-	 // [/SIERRA-ADD]
 	gear_tweaks += new/datum/gear_tweak/path/specified_types_list(corps)
 
 /datum/gear/uniform/corp_exec

diff --git a/maps/sierra/loadout/_defines.dm b/maps/sierra/loadout/_defines.dm
@@ -3,6 +3,7 @@
 	loadout_blacklist = list(
 		/datum/gear/union_card,
 		/datum/gear/suit/labcoat_corp,
+		/datum/gear/suit/medcoat,
 		/datum/gear/uniform/corp_exec,
 		/datum/gear/uniform/corp_overalls,
 		/datum/gear/uniform/corp_flight,

diff --git a/mods/loadout_items/README.md b/mods/loadout_items/README.md
@@ -32,10 +32,6 @@ ID мода: LOADOUT_ITEMS
 
 - `code/controllers/subsystems/jobs.dm`:
   - `/datum/controller/subsystem/jobs/proc/equip_custom_loadout`
-- `code/modules/client/preference_setup/loadout/lists/suits.dm`:
-  - `/datum/gear/suit/medcoat/New()`
-- `code/modules/client/preference_setup/loadout/lists/uniforms.dm`:
-  - `/datum/gear/uniform/corporate/New()`
 <!--
   Если вы редактировали какие-либо процедуры или переменные в кор коде,
   они должны быть указаны здесь.
@@ -75,7 +71,7 @@ ID мода: LOADOUT_ITEMS
 - `maps\torch\icons\mob\onmob_accessories_solgov.dmi`
 - `maps\torch\icons\obj\obj_under_solgov.dmi`
 - `maps\torch\icons\mob\onmob_under_solgov.dmi`
-- `maps\torch\icons\mob\unathi/onmob_under_solgov_unathi.dmi`
+- `maps\torch\icons\mob\unathi\onmob_under_solgov_unathi.dmi`
 
 <!--
   Будь то немодульный файл или модульный файл, который не содержится в папке,

diff --git a/mods/loadout_items/code/lists/suits.dm b/mods/loadout_items/code/lists/suits.dm
@@ -45,3 +45,19 @@
 	kim += /obj/item/clothing/suit/storage/kimono/red_short
 	kim += /obj/item/clothing/suit/storage/kimono/black
 	gear_tweaks += new/datum/gear_tweak/path/specified_types_list(kim)
+
+/datum/gear/suit/sierra_medcoat
+	display_name = "medical suit selection"
+	path = /obj/item/clothing/suit
+	allowed_roles = MEDICAL_ROLES
+	flags = GEAR_HAS_NO_CUSTOMIZATION
+
+/datum/gear/suit/sierra_medcoat/New()
+	..()
+	var/medicoats = list()
+	medicoats["first responder jacket"] = /obj/item/clothing/suit/storage/toggle/fr_jacket
+	medicoats["first responder jacket (high-visibility)"] = /obj/item/clothing/suit/storage/toggle/fr_jacket/highvis
+	medicoats["EMS jacket"] = /obj/item/clothing/suit/storage/toggle/fr_jacket/ems
+	medicoats["surgical apron"] = /obj/item/clothing/suit/surgicalapron
+	medicoats["medical jacket"] = /obj/item/clothing/suit/storage/toggle/fr_jacket/emrs
+	gear_tweaks += new/datum/gear_tweak/path(medicoats)
diff --git a/mods/loadout_items/code/lists/uniforms.dm b/mods/loadout_items/code/lists/uniforms.dm
@@ -19,3 +19,16 @@
 	path = /obj/item/clothing/under/gray_camo
 	slot = slot_w_uniform
 	flags = GEAR_HAS_COLOR_SELECTION
+
+/datum/gear/uniform/sierra_scg
+	display_name = "SCG uniform selection"
+	allowed_branches = list(/datum/mil_branch/contractor)
+	allowed_factions = list(FACTION_EXPEDITIONARY, FACTION_CORPORATE)
+	path = /obj/item/clothing/under
+
+/datum/gear/uniform/sierra_scg/New()
+	..()
+	var/scg = list()
+	scg += /obj/item/clothing/under/scg_expeditonary
+	scg += /obj/item/clothing/under/scg_expeditonary/officer
+	gear_tweaks += new/datum/gear_tweak/path/specified_types_list(scg)