More loadout additions

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,

maps/sierra/loadout/loadout_head.dm

@@ -28,3 +28,5 @@
 	beret_selection_type["ZPCI beret"] = /obj/item/clothing/head/beret/sec/corporate/zpci
 	gear_tweaks += new/datum/gear_tweak/path(beret_selection_type)
 
+/datum/gear/suit/unathi/security_cap
+	allowed_roles = SECURITY_ROLES

maps/sierra/loadout/loadout_suit.dm

@@ -1,6 +1,9 @@
 /datum/gear/suit/medcoat
 	allowed_roles = MEDICAL_ROLES
 
+/datum/gear/suit/sierra_medcoat
+	allowed_roles = MEDICAL_ROLES
+
 /datum/gear/suit/poncho
 	display_name = "poncho selection"
 	path = /obj/item/clothing/suit/poncho/colored
@@ -85,3 +88,6 @@
 /datum/gear/suit/snakeskin
 	display_name = "snakeskin coat"
 	path = /obj/item/clothing/suit/snakeskin
+
+/datum/gear/suit/unathi/security_jacket
+	allowed_roles = SECURITY_ROLES

maps/sierra/loadout/loadout_uniform.dm

@@ -89,3 +89,6 @@
 	display_name = "retro science officer's uniform"
 	allowed_roles = RESEARCH_ROLES
 	path = /obj/item/clothing/under/retro/science
+
+/datum/gear/suit/unathi/officer_uniform
+	allowed_roles = SECURITY_ROLES

mods/loadout_items/README.md

@@ -4,6 +4,7 @@
 - https://github.com/SierraBay/SierraBay12/pull/1562
 - https://github.com/SierraBay/SierraBay12/pull/1643
 - https://github.com/SierraBay/SierraBay12/pull/1650
+- https://github.com/SierraBay/SierraBay12/pull/1761
 <!--
   Ссылки на PRы, связанные с модом:
   - Создание
@@ -68,6 +69,9 @@ ID мода: LOADOUT_ITEMS
 - `maps\torch\icons\obj\obj_accessories_solgov.dmi`
 - `maps\torch\icons\mob\unathi\onmob_accessories_solgov_unathi.dmi`
 - `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`
 
 <!--
   Будь то немодульный файл или модульный файл, который не содержится в папке,

mods/loadout_items/_loadout_items.dme

@@ -6,6 +6,7 @@
 #include "code/armor.dm"
 #include "code/cloak.dm"
 #include "code/gloves.dm"
+#include "code/head.dm"
 #include "code/shoes.dm"
 #include "code/general.dm"
 #include "code/suits.dm"

mods/loadout_items/code/head.dm

@@ -0,0 +1,39 @@
+// Unathi garnmaents
+
+/obj/item/clothing/head/cap/sec
+	name = "big security cap"
+	desc = "A security cap. This one pretty big."
+	icon = 'mods/loadout_items/icons/obj_head.dmi'
+	item_icons = list(slot_wear_suit_str = 'mods/loadout_items/icons/onmob_head.dmi')
+	sprite_sheets = list(
+		SPECIES_UNATHI = 'mods/loadout_items/icons/onmob_head.dmi'
+	)
+	icon_state = "unathi_seccap"
+	item_state = "unathi_seccap"
+	species_restricted = list(SPECIES_UNATHI)
+	flags_inv = BLOCKHEADHAIR
+
+/obj/item/clothing/head/cap/desert
+	name = "Suncap"
+	desc = "A big suncap designed for use in the desert. Unathi use it to withstand scorhing heat rays when \"Burning Mother\" at it's zenith, something that their heads cannot handle. This one features foldable flaps to keep back of the neck protected. It's too big to fit anyone, but unathi."
+	icon = 'mods/loadout_items/icons/obj_head.dmi'
+	item_icons = list(slot_wear_suit_str = 'mods/loadout_items/icons/onmob_head.dmi')
+	sprite_sheets = list(
+		SPECIES_UNATHI = 'mods/loadout_items/icons/onmob_head.dmi'
+	)
+	icon_state = "unathi_suncap"
+	item_state = "unathi_suncap"
+	flags_inv = HIDEEARS|BLOCKHEADHAIR
+	var/icon_state_up = "unathi_suncap_u"
+	species_restricted  = list(SPECIES_UNATHI)
+	body_parts_covered = HEAD
+
+/obj/item/clothing/head/cap/desert/attack_self(mob/user as mob)
+	if(icon_state == initial(icon_state))
+		icon_state = icon_state_up
+		item_state = icon_state_up
+		to_chat(user, "You raise the ear flaps on the Suncap.")
+	else
+		icon_state = initial(icon_state)
+		item_state = initial(icon_state)
+		to_chat(user, "You lower the ear flaps on the Suncap.")

mods/loadout_items/code/lists/suits.dm

@@ -45,3 +45,18 @@
 	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
+	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)

mods/loadout_items/code/lists/uniforms.dm

@@ -20,6 +20,19 @@
 	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)
+
 /datum/gear/uniform/avalon
 	display_name = "avalon outfit selection"
 	path = /obj/item/clothing/under/avalon

mods/loadout_items/code/lists/xenowear.dm

@@ -1,6 +1,43 @@
 // Alien clothing.
 
 // Unathi clothing
+
+/datum/gear/suit/unathi/officer_uniform
+	display_name = "(Unathi) large security uniform"
+	path = /obj/item/clothing/under/security/officer
+	cost = 1
+	slot = slot_w_uniform
+
+/datum/gear/suit/unathi/desert_uniform
+	display_name = "(Unathi) desert uniform"
+	path = /obj/item/clothing/under/security/desert
+	cost = 1
+	slot = slot_w_uniform
+
+/datum/gear/suit/unathi/paramedic_uniform
+	display_name = "(Unathi) first responder uniform"
+	path = /obj/item/clothing/under/medic/paramedic
+	cost = 1
+	slot = slot_w_uniform
+
+/datum/gear/suit/unathi/security_cap
+	display_name = "(Unathi) big security cap"
+	path = /obj/item/clothing/head/cap/sec
+	cost = 1
+	slot = slot_head
+
+/datum/gear/suit/unathi/desert_cap
+	display_name = "(Unathi) suncap"
+	path = /obj/item/clothing/head/cap/desert
+	cost = 1
+	slot = slot_head
+
+/datum/gear/suit/unathi/security_jacket
+	display_name = "(Unathi) security jacket"
+	path = /obj/item/clothing/suit/storage/security
+	cost = 1
+	slot = slot_wear_suit
+
 /datum/gear/suit/unathi/footwraps
 	display_name = "(Unathi) big footwraps"
 	path = /obj/item/clothing/shoes/loadout_unathi

mods/loadout_items/code/suits.dm

@@ -161,3 +161,44 @@
 	item_icons = list(slot_head_str = 'maps/sierra/icons/mob/onmob/onmob_suit.dmi')
 	icon_state = "black_kimono"
 	item_state = "black_kimono"
+
+// First responder jacket
+
+/obj/item/clothing/suit/storage/toggle/fr_jacket/highvis
+	name = "first responder jacket"
+	icon = 'mods/loadout_items/icons/obj_suit.dmi'
+	item_icons = list(slot_wear_suit_str = 'mods/loadout_items/icons/onmob_suit.dmi')
+
+/obj/item/clothing/suit/storage/toggle/fr_jacket/highvis/New()
+	. = ..()
+	sprite_sheets[SPECIES_UNATHI] = 'mods/loadout_items/icons/unathi/onmob_suit_unathi.dmi'
+
+// Unathi garments
+
+/obj/item/clothing/suit/storage/security
+	name = "Big Security Jacket"
+	desc = "A pretty big jacket with deep pockets, favored by unathi mercenaries. It's too big to fit anyone, but unathi."
+	icon = 'mods/loadout_items/icons/obj_suit.dmi'
+	item_icons = list(slot_wear_suit_str = 'mods/loadout_items/icons/onmob_suit.dmi')
+	sprite_sheets = list(
+		SPECIES_UNATHI = 'mods/loadout_items/icons/onmob_suit.dmi'
+	)
+	icon_state = "unathi_secjacket"
+	item_state = "unsecjacket"
+
+	species_restricted = list(SPECIES_UNATHI)
+	w_class = ITEM_SIZE_NORMAL
+	allowed = list(
+		/obj/item/gun,
+		/obj/item/ammo_magazine,
+		/obj/item/ammo_casing,
+		/obj/item/melee/baton,
+		/obj/item/handcuffs,
+		/obj/item/tank/oxygen_emergency,
+		/obj/item/tank/oxygen_emergency_extended,
+		/obj/item/tank/nitrogen_emergency
+	)
+	siemens_coefficient = 0.9
+	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
+
+

mods/loadout_items/code/uniforms.dm

@@ -96,6 +96,69 @@
 	icon_state = "blueshift"
 	item_state = "blueshift"
 
+/obj/item/clothing/under/scg_expeditonary
+	name = "Expeditionary Corps uniform"
+	desc = "The utility uniform of the SCG Expeditionary Corps, made from biohazard resistant material. This one has silver trim."
+	icon = 'maps/torch/icons/obj/obj_under_solgov.dmi'
+	item_icons = list(slot_w_uniform_str = 'maps/torch/icons/mob/onmob_under_solgov.dmi')
+	icon_state = "blackutility_crew"
+	item_state = "bl_suit"
+	worn_state = "blackutility_crew"
+	sprite_sheets = list(
+		SPECIES_UNATHI = 'maps/torch/icons/mob/unathi/onmob_under_solgov_unathi.dmi'
+	)
+	siemens_coefficient = 0.8
+	gender_icons = 1
+
+/obj/item/clothing/under/scg_expeditonary/officer
+	name = "Expeditionary Corps officer's uniform"
+	desc = "The utility uniform of the SCG Expeditionary Corps, made from biohazard resistant material. This one has gold trim."
+	icon_state = "blackutility_com"
+	worn_state = "blackutility_com"
+
+// Unathi garnments
+
+/obj/item/clothing/under/medic/paramedic
+	name = "first responder uniform"
+	desc = "Light and bulky paramedic jumpsuit with bright markings. It's too big to fit anyone, but unathi."
+	icon = 'mods/loadout_items/icons/obj_under.dmi'
+	item_icons = list(slot_w_uniform_str = 'mods/loadout_items/icons/onmob_under.dmi')
+	sprite_sheets = list(
+		SPECIES_UNATHI = 'mods/loadout_items/icons/onmob_under.dmi'
+	)
+	species_restricted  = list(SPECIES_UNATHI)
+	icon_state = "unathi_paramedic"
+	item_state = "unathi_paramedic"
+	worn_state = "unathi_paramedic"
+
+/obj/item/clothing/under/security/desert
+	name = "desert jumpsuit"
+	desc = "A bulky and light jumpsuit designed for use in the desert. Unathi use it to withstand scorhing heat rays when \"Burning Mother\" at it's zenith, something that their scales cannot handle. It's too big to fit anyone, but unathi."
+	icon = 'mods/loadout_items/icons/obj_under.dmi'
+	item_icons = list(slot_w_uniform_str = 'mods/loadout_items/icons/onmob_under.dmi')
+	sprite_sheets = list(
+		SPECIES_UNATHI = 'mods/loadout_items/icons/onmob_under.dmi'
+	)
+	species_restricted  = list(SPECIES_UNATHI)
+	icon_state = "desertuniform"
+	item_state = "desertuniform"
+	worn_state = "desertuniform"
+	rolled_sleeves = 0  //0 = unrolled, 1 = rolled, -1 = cannot be toggled
+
+/obj/item/clothing/under/security/officer
+	name = "large security uniform"
+	desc = "An aftermarket modification of a regular desert jumpsuit, favored by unathi mercenaries. This one provides a bit more physical protection as if unathi ever needed that. It's too big to fit anyone, but unathi."
+	icon = 'mods/loadout_items/icons/obj_under.dmi'
+	item_icons = list(slot_w_uniform_str = 'mods/loadout_items/icons/onmob_under.dmi')
+	sprite_sheets = list(
+		SPECIES_UNATHI = 'mods/loadout_items/icons/onmob_under.dmi'
+	)
+	species_restricted  = list(SPECIES_UNATHI)
+	icon_state = "unsecuniform"
+	item_state = "unsecuniform"
+	worn_state = "unsecuniform"
+	rolled_sleeves = 0  //0 = unrolled, 1 = rolled, -1 = cannot be toggled
+
 // Avalon
 
 /obj/item/clothing/under/avalon