fix checks

_maps/RandomRuins/IceRuins/icemoon_surface_engioutpost.dmm

@@ -6,7 +6,7 @@
 /turf/open/floor/plating/snowed/smoothed/icemoon,
 /area/ruin)
 "ac" = (
-/obj/effect/mob_spawn/human/engineer/rig,
+/obj/effect/mob_spawn/human/engineer,
 /turf/open/floor/plating/snowed/smoothed/icemoon,
 /area/overmap_encounter/planetoid/ice/explored)
 "ad" = (
@@ -1211,7 +1211,7 @@
 /turf/open/floor/plating/ice/icemoon,
 /area/overmap_encounter/planetoid/ice/explored)
 "cU" = (
-/obj/effect/mob_spawn/human/engineer/rig,
+/obj/effect/mob_spawn/human/engineer,
 /obj/structure/cable{
 	icon_state = "4-8"
 	},

_maps/RandomRuins/JungleRuins/jungle_abandoned_library.dmm

@@ -1564,7 +1564,7 @@
 /obj/effect/mob_spawn/human/corpse/assistant{
 	oxy_damage = 200;
 	name = "Dungeon Master";
-	outfit = /datum/outfit/job/curator/dungeonmaster;
+	outfit = /datum/outfit/job/curator;
 	backpack_contents = null
 	},
 /obj/effect/decal/cleanable/blood,

code/modules/clothing/head/berets.dm

@@ -97,7 +97,7 @@
 	icon_state = "beret_officer"
 
 /obj/item/clothing/head/beret/sec/brig_phys
-	desc = "A beret made out of black reinforced fabric with  lue cross emblazoned on it. Denotes security's personal medic."
+	desc = "A beret made out of black reinforced fabric with a lue cross emblazoned on it. Denotes security's personal medic."
 	icon_state = "beret_brigphys"
 
 //Engineering

code/modules/clothing/head/jobs.dm

@@ -156,10 +156,9 @@
 
 /obj/item/clothing/head/cowboy/sec/minutemen
 	name = "colonial minutmen officer's slouch hat"
-	desc = "A commanding slouch hat adorned with a offier's badge, used by the Colonial Minutemen."
+	desc = "A commanding slouch hat adorned with a officer's badge, used by the Colonial Minutemen."
 	icon_state = "minuteman_officer_hat"
 
-
 /obj/item/clothing/head/cowboy/sec/roumain
 	name = "hunter's hat"
 	desc = "A fancy hat with a nice feather. The way it covers your eyes makes you feel like a badass."

code/modules/clothing/outfits/ert/minutemen_ert.dm

@@ -20,6 +20,7 @@
 
 	ears = /obj/item/radio/headset/minutemen/alt/captain
 	back = /obj/item/storage/backpack/satchel/sec/cmm
+	head = /obj/item/clothing/head/beret/command
 
 /datum/outfit/job/minutemen/ert/bard
 	name = "ERT - Minuteman (BARD)"
@@ -80,12 +81,13 @@
 /datum/outfit/job/minutemen/ert/inspector
 	name = "ERT - Inspector (Minutemen GOLD)"
 
-	head = null
+	head = /obj/item/clothing/head/cowboy/sec/minutemen
 	mask = null
 	belt = /obj/item/clipboard
 	glasses = /obj/item/clothing/glasses/sunglasses
 	uniform = /obj/item/clothing/under/rank/command/minutemen
 	suit = /obj/item/clothing/suit/toggle/lawyer/minutemen
+	suit_store = null
 	ears = /obj/item/radio/headset/minutemen/alt/captain
 	back = /obj/item/storage/backpack/satchel/leather
 	id = /obj/item/card/id/silver
@@ -98,13 +100,13 @@
 
 	head = null
 	suit = /obj/item/clothing/suit/space/hardsuit/security/independent/minutemen
-	belt = /obj/item/storage/belt/military/minutemen/p16
-	suit_store = /obj/item/gun/ballistic/automatic/assault/p16/minutemen
+
 /datum/outfit/job/minutemen/ert/pirate_hunter/leader
 	name = "ERT - Minutemen Sergeant (Pirate Hunter)"
 
 	uniform = /obj/item/clothing/under/rank/command/minutemen
 	ears = /obj/item/radio/headset/minutemen/alt/captain
 	belt = /obj/item/storage/belt/military/minutemen/gal
 	suit_store = /obj/item/gun/ballistic/automatic/gal
+
 	backpack_contents = list(/obj/item/ammo_box/magazine/gal=4)

code/modules/clothing/outfits/factions/independent.dm

@@ -2,19 +2,20 @@
 	name = "Independent - Base Outfit"
 	faction_icon = "bg_independent"
 
+	uniform = /obj/item/clothing/under/utility
 	box = /obj/item/storage/box/survival
 	id = /obj/item/card/id
 
+	r_pocket = /obj/item/storage/wallet
+
 // Assistant
 
 /datum/outfit/job/independent/assistant
 	name = "Independent - Assistant"
 	jobtype = /datum/job/assistant
 	job_icon = "assistant"
 
-	uniform = /obj/item/clothing/under/utility
 	shoes = /obj/item/clothing/shoes/sneakers/black
-	belt = /obj/item/storage/wallet
 
 /datum/outfit/job/independent/assistant/waiter
 	name = "Independent - Assistant (Waiter)"
@@ -61,7 +62,7 @@
 	uniform = /obj/item/clothing/under/rank/medical/chemist
 	shoes = /obj/item/clothing/shoes/sneakers/white
 	accessory = /obj/item/clothing/neck/scarf/orange
-	r_pocket = /obj/item/reagent_containers/pill/floorpill
+	l_pocket = /obj/item/reagent_containers/pill/floorpill
 	belt = /obj/item/reagent_scanner
 	backpack_contents = list(/obj/item/book/manual/wiki/chemistry=1)
 
@@ -145,6 +146,7 @@
 	dcoat = /obj/item/clothing/suit/hooded/wintercoat/captain
 	shoes = /obj/item/clothing/shoes/sneakers/brown
 	head = /obj/item/clothing/head/hopcap
+
 	backpack_contents = list(/obj/item/storage/box/ids=1,\
 		/obj/item/melee/classic_baton/telescopic=1, /obj/item/modular_computer/tablet/preset/advanced = 1)
 
@@ -191,7 +193,6 @@
 	head = /obj/item/clothing/head/beret/sec/hos
 	glasses = /obj/item/clothing/glasses/hud/security/sunglasses
 	suit_store = null
-	r_pocket = /obj/item/assembly/flash/handheld
 	l_pocket = /obj/item/restraints/handcuffs
 	backpack_contents = list(/obj/item/melee/classic_baton=1)
 
@@ -236,7 +237,6 @@
 	dcoat = /obj/item/clothing/suit/hooded/wintercoat/security
 	shoes = /obj/item/clothing/shoes/jackboots
 	l_pocket = /obj/item/restraints/handcuffs
-	r_pocket = /obj/item/assembly/flash/handheld
 	backpack_contents = null
 
 	backpack = /obj/item/storage/backpack/security
@@ -256,7 +256,6 @@
 	glasses = /obj/item/clothing/glasses/hud/security/sunglasses
 	head = /obj/item/clothing/head/cowboy/sec
 
-
 /datum/outfit/job/independent/security/pirate
 	name = "Independent - Security Officer (Pirate)"
 
@@ -286,13 +285,14 @@
 
 	belt = /obj/item/storage/belt/utility/full/engi
 	l_pocket = /obj/item/storage/wallet
+	gloves = /obj/item/clothing/gloves/color/yellow
 	ears = /obj/item/radio/headset/headset_eng
 	uniform = /obj/item/clothing/under/rank/engineering/engineer
 	alt_uniform = /obj/item/clothing/under/rank/engineering/engineer/hazard
 	dcoat = /obj/item/clothing/suit/hooded/wintercoat/engineering
 	shoes = /obj/item/clothing/shoes/workboots
 	head = /obj/item/clothing/head/hardhat/dblue
-	r_pocket = /obj/item/t_scanner
+	l_pocket = /obj/item/t_scanner
 
 	backpack = /obj/item/storage/backpack/industrial
 	satchel = /obj/item/storage/backpack/satchel/eng
@@ -306,7 +306,7 @@
 	name = "Independent - Engineer (Salvager)"
 
 	belt = null
-	r_pocket = null
+	l_pocket = null
 
 /datum/outfit/job/independent/engineer/pirate
 	name = "Independent - Engineer (Pirate)"
@@ -315,14 +315,13 @@
 	head = /obj/item/clothing/head/bandana
 	shoes = /obj/item/clothing/shoes/jackboots
 
-
 /datum/outfit/job/independent/engineer/pirate/jupiter
 	name = "Independent - Engineer (Nodesman)" // technically, this is part of SEC, but we have jackshit for SEC
 
 	uniform = /obj/item/clothing/under/utility
 	head = /obj/item/clothing/head/soft/black
 	shoes = /obj/item/clothing/shoes/combat
-	r_pocket = /obj/item/kitchen/knife/combat/survival
+	l_pocket = /obj/item/kitchen/knife/combat/survival
 	gloves = /obj/item/clothing/gloves/combat
 
 	implants = list(/obj/item/implant/radio)
@@ -342,7 +341,6 @@
 	gloves = /obj/item/clothing/gloves/color/black
 	head = /obj/item/clothing/head/warden
 	glasses = /obj/item/clothing/glasses/hud/security
-	r_pocket = /obj/item/assembly/flash/handheld
 	l_pocket = /obj/item/restraints/handcuffs
 	suit_store = null
 	backpack_contents = list(/obj/item/melee/classic_baton)
@@ -428,7 +426,7 @@
 	ears = /obj/item/radio/headset/headset_eng
 	uniform = /obj/item/clothing/under/rank/engineering/engineer/hazard
 	dcoat = /obj/item/clothing/suit/hooded/wintercoat/engineering
-	r_pocket = /obj/item/analyzer
+	l_pocket = /obj/item/analyzer
 
 	backpack = /obj/item/storage/backpack/industrial
 	satchel = /obj/item/storage/backpack/satchel/eng
@@ -536,7 +534,7 @@
 	uniform = /obj/item/clothing/under/rank/cargo/miner
 	suit = /obj/item/clothing/suit/hazardvest
 	dcoat = /obj/item/clothing/suit/hooded/wintercoat/miner
-	r_pocket = /obj/item/storage/bag/ore
+	l_pocket = /obj/item/storage/bag/ore
 	backpack_contents = list(
 		/obj/item/flashlight/seclite=1,\
 		/obj/item/kitchen/knife/combat/survival=1,\
@@ -616,7 +614,7 @@
 	backpack_contents = list(/obj/item/storage/box/syringes=1, /obj/item/storage/box/drinkingglasses = 1)
 	ears = /obj/item/radio/headset/headset_med
 	suit = /obj/item/clothing/suit/toggle/labcoat
-	r_pocket = /obj/item/reagent_containers/food/drinks/shaker
+	l_pocket = /obj/item/reagent_containers/food/drinks/shaker
 	belt = /obj/item/storage/belt
 	gloves = /obj/item/clothing/gloves/color/latex/nitrile
 	uniform = /obj/item/clothing/under/suit/black
@@ -633,8 +631,7 @@
 	suit = /obj/item/clothing/suit/toggle/lawyer
 	shoes = /obj/item/clothing/shoes/laceup
 	l_hand = /obj/item/storage/briefcase/lawyer
-	l_pocket = /obj/item/laser_pointer
-	r_pocket = /obj/item/clothing/accessory/lawyers_badge
+	l_pocket = /obj/item/clothing/accessory/lawyers_badge
 
 	chameleon_extras = /obj/item/stamp/law
 
@@ -649,8 +646,7 @@
 	ears = /obj/item/radio/headset/headset_srv
 	uniform = /obj/item/clothing/under/rank/civilian/curator
 	l_hand = /obj/item/storage/bag/books
-	r_pocket = /obj/item/key/displaycase
-	l_pocket = /obj/item/laser_pointer
+	l_pocket = /obj/item/key/displaycase
 	accessory = /obj/item/clothing/accessory/pocketprotector/full
 	backpack_contents = list(
 		/obj/item/choice_beacon/hero = 1,
@@ -789,7 +785,6 @@
 	gloves = /obj/item/clothing/gloves/color/black
 	head = /obj/item/clothing/head/fedora/det_hat
 	l_pocket = /obj/item/toy/crayon/white
-	r_pocket = /obj/item/lighter
 	backpack_contents = list(/obj/item/storage/box/evidence=1,\
 		/obj/item/detective_scanner=1,\
 		/obj/item/melee/classic_baton=1)

code/modules/clothing/under/jobs/security.dm

@@ -85,26 +85,26 @@
 // Brig Physician //
 /obj/item/clothing/under/rank/security/brig_phys
 	name = "brig physician jumpsuit"
-	desc = "A lightly armored jumpsuit worn by Nanotrasen's Asset Protection Medical Corps."
+	desc = "A lightly armored jumpsuit, worn by practitioners entrusted to the care of prisoners around the frontier."
 	icon_state = "brig_phys"
 
 /obj/item/clothing/under/rank/security/brig_phys/skirt
 	name = "brig physician jumpskirt"
-	desc = "A lightly armored jumpsuit worn by Nanotrasen's Asset Protection Medical Corps."
+	desc = "A lightly armored jumpskirt, worn by practitioners entrusted to the care of prisoners around the frontier."
 	icon_state = "brig_phys_skirt"
 	body_parts_covered = CHEST|GROIN|ARMS
 	can_adjust = FALSE
 	supports_variations = DIGITIGRADE_VARIATION_NO_NEW_ICON
 
 /obj/item/clothing/under/rank/security/brig_phys/nt
 	name = "security medic's uniform"
-	desc = "A lightly armored uniform worn by medics ensuring the health of prisoners."
+	desc = "A lightly armored uniform worn by members of Nanotrasen's Asset Protection Medical Corps."
 	icon_state = "rbrig_phys"
 	item_state = "r_suit"
 
 /obj/item/clothing/under/rank/security/brig_phys/nt/skirt
 	name = "security medic's uniform"
-	desc = "A lightly armored uniform, with a skirt, worn by medics ensuring the health of prisoners."
+	desc = "A lightly armored uniform, with a skirt, worn by members of Nanotrasen's Asset Protection Medical Corps."
 	icon_state = "rbrig_phys_skirt"
 	body_parts_covered = CHEST|GROIN|ARMS
 	supports_variations = DIGITIGRADE_VARIATION_NO_NEW_ICON
@@ -129,30 +129,18 @@
 
 /obj/item/clothing/under/rank/security/warden/nt
 	name = "warden's red security suit"
-	desc = "A formal security suit for officers complete with Nanotrasen belt buckle."
+	desc = "A formal security suit for wardens, complete with Nanotrasen belt buckle."
 	icon_state = "rwarden"
 	item_state = "r_suit"
 
 /obj/item/clothing/under/rank/security/warden/nt/skirt
 	name = "warden's red suitskirt"
-	desc = "A formal security suitskirt for officers complete with Nanotrasen belt buckle."
+	desc = "A formal security suitskirt for wardens, complete with Nanotrasen belt buckle."
 	icon_state = "rwarden_skirt"
 	item_state = "r_suit"
 	body_parts_covered = CHEST|GROIN|ARMS
 	supports_variations = DIGITIGRADE_VARIATION_NO_NEW_ICON
 
-/obj/item/clothing/under/rank/security/head_of_security/nt
-	name = "red head of security's jumpsuit"
-	icon_state = "rhos"
-	item_state = "r_suit"
-
-/obj/item/clothing/under/rank/security/head_of_security/nt/skirt
-	name = "head of security's red jumpskirt"
-	desc = "A security jumpskirt decorated for those few with the dedication to achieve the position of Head of Security."
-	icon_state = "rhos_skirt"
-	body_parts_covered = CHEST|GROIN|ARMS
-	supports_variations = DIGITIGRADE_VARIATION_NO_NEW_ICON
-
 // Head of Security //
 /obj/item/clothing/under/rank/security/head_of_security
 	name = "head of security's jumpsuit"
@@ -186,6 +174,18 @@
 	body_parts_covered = CHEST|GROIN|ARMS
 	supports_variations = DIGITIGRADE_VARIATION_NO_NEW_ICON
 
+/obj/item/clothing/under/rank/security/head_of_security/nt
+	name = "red head of security's jumpsuit"
+	icon_state = "rhos"
+	item_state = "r_suit"
+
+/obj/item/clothing/under/rank/security/head_of_security/nt/skirt
+	name = "head of security's red jumpskirt"
+	desc = "A security jumpskirt decorated for those few with the dedication to achieve the position of Head of Security."
+	icon_state = "rhos_skirt"
+	body_parts_covered = CHEST|GROIN|ARMS
+	supports_variations = DIGITIGRADE_VARIATION_NO_NEW_ICON
+
 /obj/item/clothing/under/rank/security/head_of_security/parade
 	name = "head of security's parade uniform"
 	desc = "A male head of security's luxury-wear, for special occasions."
@@ -201,7 +201,7 @@
 // Prisoner //
 /obj/item/clothing/under/rank/prisoner
 	name = "prison jumpsuit"
-	desc = "It's standardised Nanotrasen prisoner-wear. Its suit sensors are stuck in the \"Fully On\" position."
+	desc = "It's standardised prisoner-wear. Its suit sensors are stuck in the \"Fully On\" position."
 	icon = 'icons/obj/clothing/under/security.dmi'
 	icon_state = "prisoner"
 	item_state = "o_suit"
@@ -212,7 +212,7 @@
 
 /obj/item/clothing/under/rank/prisoner/skirt
 	name = "prison jumpskirt"
-	desc = "It's standardised Nanotrasen prisoner-wear. Its suit sensors are stuck in the \"Fully On\" position."
+	desc = "It's standardised prisoner-wear. Its suit sensors are stuck in the \"Fully On\" position."
 	icon_state = "prisoner_skirt"
 	item_state = "o_suit"
 	body_parts_covered = CHEST|GROIN|ARMS
@@ -221,12 +221,12 @@
 
 /obj/item/clothing/under/rank/prisoner/protected_custody
 	name = "protected custody jumpsuit"
-	desc = "It's standardised Nanotrasen prisoner-wear worn by those in protected custody. Its suit sensors are stuck in the \"Fully On\" position."
+	desc = "It's standardised prisoner-wear worn by those in protected custody. Its suit sensors are stuck in the \"Fully On\" position."
 	icon_state = "protected_custody"
 
 /obj/item/clothing/under/rank/prisoner/protected_custody/skirt
 	name = "protected custody jumpskirt"
-	desc = "It's standardised Nanotrasen prisoner-wear worn by those in protected custody. Its suit sensors are stuck in the \"Fully On\" position."
+	desc = "It's standardised prisoner-wear worn by those in protected custody. Its suit sensors are stuck in the \"Fully On\" position."
 	icon_state = "protected_custody_skirt"
 	supports_variations = DIGITIGRADE_VARIATION_NO_NEW_ICON
 
@@ -254,7 +254,7 @@
 
 /obj/item/clothing/under/rank/security/officer/mallcop
 	name = "NT mall cop uniform"
-	desc = "The radio and badge are sewn on, what a crappy knock off. Secway not included."
+	desc = "The radio and badge are sewn on. What a crappy knock off! Secway not included."
 	icon_state = "mallcop"
 	can_adjust = FALSE
 
@@ -293,14 +293,16 @@
 
 /obj/item/clothing/under/rank/security/officer/frontier
 	name = "\improper Frontiersmen uniform"
-	desc = "Worn by members of the Frontiersmen pirate fleet. It's less comfortable than it looks."
+	desc = "Worn by members of the Frontiersmen pirate fleet. It's very uncomfortable to move around in."
 	icon_state = "frontier"
 	item_state = "gy_suit"
 
 /obj/item/clothing/under/rank/security/officer/frontier/officer
 	name = "\improper Frontiersmen officer's uniform"
+	desc = "Worn by officers of the Frontiersmen pirate fleet. It's less comfortable than it looks."
 	icon_state = "frontier_officer"
 
 /obj/item/clothing/under/rank/security/officer/frontier/admiral
 	name = "\improper Frontiersmen admiral's uniform"
+	desc = "Worn by admirals of the Frontiersmen pirate fleet. It's the only Frontiersman uniform that isn't mass produced."
 	icon_state = "frontier_admiral"