Fix various issues (#1650)

bugfix: Пофикшены отсутствующие иконки таярских постеров. Пофикшена иконка капитанского револьвера. 
tweak: ГБС и Адхеранты получили возможность быть стюардами
imageadd: Добавил экипировку из Синей смены.

maps/sierra/items/guns.dm

@@ -1,5 +1,12 @@
 /obj/item/gun/projectile/revolver/medium/captain
-	desc = "A shiny al-Maliki & Mosley Autococker automatic revolver, with black accents. Marketed as the 'Revolver for the Modern Era'. Uses .357 magnum rounds. This one has 'To the Captain of NSV Sierra' engraved."
+	name = "\improper Final Argument"
+	icon = 'maps/sierra/icons/obj/uniques.dmi' // SIERRA TODO: Заменить на спрайт Вольфора, дорисовав анимацию.
+	icon_state = "mosley"
+	desc = "A shiny al-Maliki & Mosley Autococker automatic revolver, with black accents. Marketed as the 'Revolver for the Modern Era'. This one has 'To the Captain of NSV Sierra' engraved."
+	fire_delay = 5.7 //Autorevolver. Also synced with the animation
+	fire_anim = "mosley_fire"
+	origin_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 2)
+	starts_loaded = 0 //Nobody keeps ballistic weapons loaded
 
 /obj/item/gun/energy/stunrevolver/secure/nanotrasen
 	name = "corporate stun revolver"

maps/sierra/job/_job_defines.dm

@@ -3,9 +3,9 @@
 
 #define SILICON_JOBS /datum/job/ai, /datum/job/cyborg
 
-#define ADHERENT_JOBS /datum/job/ai, /datum/job/cyborg, /datum/job/assistant, /datum/job/janitor, /datum/job/engineer_trainee, /datum/job/cook, /datum/job/cargo_tech, /datum/job/scientist_assistant, /datum/job/doctor_trainee, /datum/job/engineer, /datum/job/mining, /datum/job/cargo_assistant, /datum/job/roboticist, /datum/job/chemist, /datum/job/bartender, /datum/job/explorer_engineer
+#define ADHERENT_JOBS /datum/job/ai, /datum/job/cyborg, /datum/job/assistant, /datum/job/janitor, /datum/job/engineer_trainee, /datum/job/cook, /datum/job/cargo_tech, /datum/job/scientist_assistant, /datum/job/doctor_trainee, /datum/job/engineer, /datum/job/mining, /datum/job/cargo_assistant, /datum/job/roboticist, /datum/job/chemist, /datum/job/bartender, /datum/job/steward, /datum/job/explorer_engineer
 
-#define NABBER_JOBS /datum/job/ai, /datum/job/cyborg, /datum/job/janitor, /datum/job/scientist_assistant, /datum/job/chemist, /datum/job/roboticist, /datum/job/cargo_assistant, /datum/job/cook, /datum/job/engineer_trainee, /datum/job/doctor_trainee, /datum/job/bartender
+#define NABBER_JOBS /datum/job/ai, /datum/job/cyborg, /datum/job/janitor, /datum/job/scientist_assistant, /datum/job/chemist, /datum/job/roboticist, /datum/job/cargo_assistant, /datum/job/cook, /datum/job/engineer_trainee, /datum/job/doctor_trainee, /datum/job/bartender, /datum/job/steward
 
 #define SKRELL_BLACKLISTED_JOBS /datum/job/hos, /datum/job/hop, /datum/job/cmo, /datum/job/iaa, /datum/job/psychiatrist,/datum/job/captain
 

maps/sierra/loadout/loadout_suit.dm

@@ -59,7 +59,7 @@
 	allowed_roles = STERILE_ROLES
 
 /datum/gear/suit/labcoat_corp_si
-	display_name = "labcoat, NT or Hephaestus"
+	display_name = "Corporate labcoat"
 	path = /obj/item/clothing/suit/storage/toggle/labcoat/science
 	allowed_roles = RESEARCH_ROLES
 	allowed_branches = list(/datum/mil_branch/employee, /datum/mil_branch/contractor)
@@ -69,6 +69,7 @@
 	var/labcoatsi = list()
 	labcoatsi += /obj/item/clothing/suit/storage/toggle/labcoat/science/nanotrasen
 	labcoatsi += /obj/item/clothing/suit/storage/toggle/labcoat/science/heph
+	labcoatsi += /obj/item/clothing/suit/storage/toggle/labcoat/science/xynergy
 	gear_tweaks += new/datum/gear_tweak/path/specified_types_list(labcoatsi)
 
 /datum/gear/suit/labcoat_dais

maps/sierra/loadout/loadout_tactical.dm

@@ -8,6 +8,7 @@
 
 /datum/gear/tactical/helm_covers
 	allowed_roles = ARMORED_ROLES
+
 /datum/gear/tactical/security_belt
 	display_name = "security belt"
 	path = /obj/item/storage/belt/security
@@ -19,6 +20,16 @@
 	allowed_roles += /datum/job/iaa
 	..()
 
+/datum/gear/tactical/holster/New()
+	..()
+	var/holsters = list()
+	holsters += /obj/item/clothing/accessory/storage/holster
+	holsters += /obj/item/clothing/accessory/storage/holster/armpit
+	holsters += /obj/item/clothing/accessory/storage/holster/hip
+	holsters += /obj/item/clothing/accessory/storage/holster/thigh
+	holsters += /obj/item/clothing/accessory/storage/holster/waist
+	gear_tweaks += new/datum/gear_tweak/path/specified_types_list(holsters)
+
 /*
 /datum/gear/tactical/pcarrier_press
 	display_name = "journalist's plate carrier"
@@ -41,8 +52,90 @@
 	uniforms +=	/obj/item/clothing/under/rank/security/navyblue/alt
 	gear_tweaks += new/datum/gear_tweak/path/specified_types_list(uniforms)
 
-/datum/gear/tactical/camo_inf
-	display_name = "camo uniform - colorable"
-	path = /obj/item/clothing/under/grayson
-	slot = slot_w_uniform
-	flags = GEAR_HAS_COLOR_SELECTION
+/datum/gear/tactical/bloodpatch
+	display_name = "blood patch selection"
+	path = /obj/item/clothing/accessory/armor_tag
+	allowed_roles = ARMORED_ROLES
+
+/datum/gear/tactical/bloodpatch/New()
+	..()
+	var/blatch = list()
+	blatch["O+ blood patch"] = /obj/item/clothing/accessory/armor_tag/opos
+	blatch["O- blood patch"] = /obj/item/clothing/accessory/armor_tag/oneg
+	blatch["A+ blood patch"] = /obj/item/clothing/accessory/armor_tag/apos
+	blatch["A- blood patch"] = /obj/item/clothing/accessory/armor_tag/aneg
+	blatch["B+ blood patch"] = /obj/item/clothing/accessory/armor_tag/bpos
+	blatch["B- blood patch"] = /obj/item/clothing/accessory/armor_tag/bneg
+	blatch["AB+ blood patch"] = /obj/item/clothing/accessory/armor_tag/abpos
+	blatch["AB- blood patch"] = /obj/item/clothing/accessory/armor_tag/abneg
+	gear_tweaks += new/datum/gear_tweak/path(blatch)
+
+
+/datum/gear/tactical/armor_pouches
+	display_name = "armor pouches selection"
+	path = /obj/item/clothing/accessory/storage/pouches
+	allowed_roles = ARMORED_ROLES
+	cost = 3
+
+/datum/gear/tactical/armor_pouches/New()
+	..()
+	var/pouches = list()
+	pouches["tan storage pouches"] = /obj/item/clothing/accessory/storage/pouches/tan
+	pouches["navy storage pouches"] = /obj/item/clothing/accessory/storage/pouches/navy
+	pouches["green storage pouches"] = /obj/item/clothing/accessory/storage/pouches/green
+	pouches["blue storage pouches"] = /obj/item/clothing/accessory/storage/pouches/blue
+	pouches["black storage pouches"] = /obj/item/clothing/accessory/storage/pouches
+	gear_tweaks += new/datum/gear_tweak/path(pouches)
+
+/datum/gear/tactical/large_pouches
+	display_name = "large armor pouches selection"
+	path = /obj/item/clothing/accessory/storage/pouches/large
+	allowed_roles = ARMORED_ROLES
+	cost = 6
+
+/datum/gear/tactical/large_pouches/New()
+	..()
+	var/lpouches = list()
+	lpouches["large tan storage pouches"] = /obj/item/clothing/accessory/storage/pouches/large/tan
+	lpouches["large navy storage pouches"] = /obj/item/clothing/accessory/storage/pouches/large/navy
+	lpouches["large green storage pouches"] = /obj/item/clothing/accessory/storage/pouches/large/green
+	lpouches["large blue storage pouches"] = /obj/item/clothing/accessory/storage/pouches/large/blue
+	lpouches["large black storage pouches"] = /obj/item/clothing/accessory/storage/pouches/large
+	gear_tweaks += new/datum/gear_tweak/path(lpouches)
+
+
+/datum/gear/tactical/armor_deco
+	display_name = "armor tags selection"
+	path = /obj/item/clothing/accessory/armor_tag
+	allowed_roles = ARMORED_ROLES
+
+/datum/gear/tactical/armor_deco/New()
+	..()
+	var/atags = list()
+	atags["NTSF tag"] = /obj/item/clothing/accessory/armor_tag/nt
+	atags["PCRC tag"] = /obj/item/clothing/accessory/armor_tag/pcrc
+	atags["SAARE tag"] = /obj/item/clothing/accessory/armor_tag/saare
+//	atags["SCP tag"] = /obj/item/clothing/accessory/armor_tag/scp
+//	atags["ZPCI tag"] = /obj/item/clothing/accessory/armor_tag/zpci
+	gear_tweaks += new/datum/gear_tweak/path(atags)
+
+/datum/gear/tactical/press_tag
+	display_name = "Press tag"
+	path = /obj/item/clothing/accessory/armor_tag/press
+
+/datum/gear/tactical/pcarrier
+	display_name = "empty plate carriers selection"
+	path = /obj/item/clothing/suit/armor/pcarrier
+	cost = 1
+	slot = slot_wear_suit
+	allowed_roles = ARMORED_ROLES
+
+/datum/gear/tactical/pcarrier/New()
+	..()
+	var/armor = list()
+	armor["black plate carrier"]	= /obj/item/clothing/suit/armor/pcarrier
+	armor["blue plate carrier"] 	= /obj/item/clothing/suit/armor/pcarrier/blue
+	armor["navy plate carrier"] 	= /obj/item/clothing/suit/armor/pcarrier/navy
+	armor["green plate carrier"] 	= /obj/item/clothing/suit/armor/pcarrier/green
+	armor["tan plate carrier"] 		= /obj/item/clothing/suit/armor/pcarrier/tan
+	gear_tweaks += new/datum/gear_tweak/path(armor)

maps/sierra/loadout/loadout_uniform.dm

@@ -69,3 +69,23 @@
 	shirts += /obj/item/clothing/under/suit_jacket/burgundy
 	shirts += /obj/item/clothing/under/suit_jacket/checkered
 	gear_tweaks += new/datum/gear_tweak/path/specified_types_list(shirts)
+
+/datum/gear/uniform/retro_security
+	display_name = "retro security officer's uniform"
+	allowed_roles = SECURITY_ROLES
+	path = /obj/item/clothing/under/retro/security
+
+/datum/gear/uniform/retro_medical
+	display_name = "retro medical officer's uniform"
+	allowed_roles = STERILE_ROLES
+	path = /obj/item/clothing/under/retro/medical
+
+/datum/gear/uniform/retro_engineering
+	display_name = "retro engineering uniform"
+	allowed_roles = TECHNICAL_ROLES
+	path = /obj/item/clothing/under/retro/engineering
+
+/datum/gear/uniform/retro_science
+	display_name = "retro science officer's uniform"
+	allowed_roles = RESEARCH_ROLES
+	path = /obj/item/clothing/under/retro/science

maps/sierra/structures/closets/security.dm

@@ -170,6 +170,35 @@
 		/obj/item/clothing/glasses/hud/security
 	)
 
+/obj/structure/closet/secure_closet/security/sierra/science
+	name = "research guard locker"
+	req_access = list(access_security)
+	closet_appearance = /singleton/closet_appearance/secure_closet/sierra/security
+
+/obj/structure/closet/secure_closet/security/sierra/science/WillContain()
+	return list(
+		new/datum/atom_creator/weighted(list(/obj/item/storage/backpack, /obj/item/storage/backpack/satchel)),
+		new/datum/atom_creator/simple(/obj/item/storage/backpack/dufflebag, 50),
+		/obj/item/clothing/suit/armor/vest/blueshift,
+		/obj/item/clothing/head/helmet/nt/blueshift,
+		/obj/item/device/radio/headset/headset_sec,
+		/obj/item/storage/belt/holster/security,
+		/obj/item/device/flash,
+		/obj/item/reagent_containers/spray/pepper,
+		/obj/item/grenade/chem_grenade/teargas,
+		/obj/item/melee/baton/loaded,
+		/obj/item/clothing/glasses/hud/security/prot/sunglasses,
+		/obj/item/taperoll/police,
+		/obj/item/device/hailer,
+		/obj/item/clothing/accessory/storage/black_vest,
+		/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()
 	return list(
 		/obj/item/clothing/under/color/orange,

mods/loadout_items/README.md

@@ -3,6 +3,7 @@
 
 - https://github.com/SierraBay/SierraBay12/pull/1562
 - https://github.com/SierraBay/SierraBay12/pull/1643
+- https://github.com/SierraBay/SierraBay12/pull/1650
 <!--
   Ссылки на PRы, связанные с модом:
   - Создание

mods/loadout_items/_loadout_items.dme

@@ -3,6 +3,7 @@
 
 #include "_loadout_items.dm"
 #include "code/accessory.dm"
+#include "code/armor.dm"
 #include "code/cloak.dm"
 #include "code/gloves.dm"
 #include "code/shoes.dm"

mods/loadout_items/code/armor.dm

@@ -0,0 +1,13 @@
+/obj/item/clothing/head/helmet/nt/blueshift
+	name = "research division security helmet"
+	desc = "A helmet with 'RESEARCH DIVISION SECURITY' printed on the back in red lettering."
+	icon = 'mods/loadout_items/icons/obj_head.dmi'
+	item_icons = list(slot_head_str = 'mods/loadout_items/icons/onmob_head.dmi')
+	icon_state = "blueshift_helm"
+
+/obj/item/clothing/suit/armor/vest/blueshift
+	name = "research division armored vest"
+	desc = "A synthetic armor vest. This one is marked with a hazard markings and 'RESEARCH DIVISION SECURITY' tag."
+	icon = 'mods/loadout_items/icons/obj_suit.dmi'
+	item_icons = list(slot_wear_suit_str = 'mods/loadout_items/icons/onmob_suit.dmi')
+	icon_state = "blueshift_armor"

mods/loadout_items/code/lists/tactical.dm

@@ -0,0 +1 @@
+// SIERRA TODO: Move here stuff from Infinity Pack

mods/loadout_items/code/lists/uniforms.dm

@@ -13,3 +13,9 @@
 	pmc["SCP utility uniform"]	= /obj/item/clothing/under/scp_uniform
 	pmc["ZPCI utility uniform"]	= /obj/item/clothing/under/zpci_uniform
 	gear_tweaks += new/datum/gear_tweak/path(pmc)
+
+/datum/gear/tactical/colorable_camo
+	display_name = "camo uniform - colorable"
+	path = /obj/item/clothing/under/gray_camo
+	slot = slot_w_uniform
+	flags = GEAR_HAS_COLOR_SELECTION

mods/loadout_items/code/uniforms.dm

@@ -30,3 +30,66 @@
 	gender_icons = 1
 
 // SIERRA TO DO: Cleanup icons from unused loadout
+
+/obj/item/clothing/under/gray_camo
+	name = "camo uniform"
+	desc = "It's camo unifrom made of a slightly sturdier material than standard jumpsuits, to allow for good protection and military style."
+	icon = 'mods/loadout_items/icons/obj_under.dmi'
+	item_icons = list(slot_w_uniform_str = 'mods/loadout_items/icons/onmob_under.dmi')
+	icon_state = "gray_camo"
+	item_state = "gray_camo"
+	worn_state = "gray_camo"
+
+/obj/item/clothing/under/retro/security
+	desc = "A retro corporate security jumpsuit. Although it provides same protection as modern jumpsuits do, wearing this almost feels like being wrapped in tarp."
+	name = "retro security officer's 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 = "retro_sec"
+	item_state = "retro_sec"
+	siemens_coefficient = 0.9
+	armor = list(
+		melee = ARMOR_MELEE_SMALL
+		)
+
+/obj/item/clothing/under/retro/medical
+	desc = "A biologically resistant retro medical uniform with high-vis reflective stripes."
+	name = "retro medical officer's 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 = "retro_med"
+	item_state = "retro_med"
+	permeability_coefficient = 0.50
+	armor = list(
+		bio = ARMOR_BIO_MINOR
+		)
+
+/obj/item/clothing/under/retro/engineering
+	desc = "A faded grimy engineering jumpsuit and overall combo. It craves for being soiled with oil, dust, and grit this damn instant."
+	name = "retro engineering 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 = "retro_eng"
+	item_state = "retro_eng"
+	armor = list(
+		rad = ARMOR_RAD_MINOR
+		)
+
+/obj/item/clothing/under/retro/science
+	desc = "A faded polo and set of brown slacks with distinctive pink stripes. What a ridiculous tie."
+	name = "retro science officer's 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 = "retro_sci"
+	item_state = "retro_sci"
+	armor = list(
+		bio = ARMOR_BIO_MINOR
+		)
+
+/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"

mods/tajara/code/posters.dm

@@ -92,6 +92,7 @@
 	poster_type = /singleton/poster/tjpost/tposter_22
 
 /singleton/poster/tjpost
+	icon = 'mods/tajara/icons/posters.dmi'
 	icon_state = "tposter"
 	name = "Liberation day"
 	desc = "A memorable photo, which depicted how the soldiers of the Kaytam clan raise their flag \