тфрк

SierraBay · Dec 24, 2023 · f4bf41a · f4bf41a
1 parent 5858026
commit f4bf41a
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 5 deletions.
diff --git a/maps/sierra/loadout/loadout_tactical.dm b/maps/sierra/loadout/loadout_tactical.dm
@@ -50,7 +50,6 @@
 	uniforms +=	/obj/item/clothing/under/rank/security/corp/alt
 	uniforms +=	/obj/item/clothing/under/rank/security/navyblue
 	uniforms +=	/obj/item/clothing/under/rank/security/navyblue/alt
-	uniforms +=	/obj/item/clothing/under/rank/security/corp/blueshift
 	gear_tweaks += new/datum/gear_tweak/path/specified_types_list(uniforms)
 
 /datum/gear/tactical/bloodpatch

diff --git a/maps/sierra/structures/closets/security.dm b/maps/sierra/structures/closets/security.dm
@@ -191,11 +191,12 @@
 		/obj/item/taperoll/police,
 		/obj/item/device/hailer,
 		/obj/item/clothing/accessory/storage/black_vest,
-		/obj/item/clothing/under/rank/security/corp/blueshift,
+		/obj/item/clothing/under/blueshift_uniform,
 		/obj/item/gun/energy/taser,
 		/obj/item/device/holowarrant,
 	)
 
+/obj/structure/closet/secure_closet/security/sierra/science/WillContain()
 	return MERGE_ASSOCS_WITH_NUM_VALUES(..(), list(/obj/item/device/encryptionkey/headset_sci))
 
 /obj/structure/closet/secure_closet/brig/WillContain()

diff --git a/mods/loadout_items/README.md b/mods/loadout_items/README.md
@@ -65,7 +65,6 @@ ID мода: LOADOUT_ITEMS
 ### Используемые файлы, не содержащиеся в модпаке
 
 - `maps\sierra\loadout\loadout_gloves.dm`
-- `maps\sierra\loadout\loadout_uniform.dm`
 - `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`

diff --git a/mods/loadout_items/code/uniforms.dm b/mods/loadout_items/code/uniforms.dm
@@ -86,11 +86,10 @@
 		bio = ARMOR_BIO_MINOR
 		)
 
-/obj/item/clothing/under/rank/security/corp/blueshift
+/obj/item/clothing/under/blueshift_uniform
 	desc = "Blue shirt with robust jeans from robust materials. Still standard issue equipment for long clam blue shifts."
 	name = "research division security uniform"
 	icon = 'mods/loadout_items/icons/obj_under.dmi'
 	item_icons = list(slot_w_uniform_str = 'mods/loadout_items/icons/onmob_under.dmi')
 	icon_state = "blueshift"
 	item_state = "blueshift"
-	worn_state = "blueshift"
diff --git a/mods/loadout_items/icons/onmob_under.dmi b/mods/loadout_items/icons/onmob_under.dmi