Shuttle update: Part Three: The Merchants Invest (#7591)

This is part 3 of the work of the big shuttle update started by Poze (#5771, description not up to date.) with more to come as that pr is split up into more manageable chunks. (Previous part: #7457)

code/game/objects/structures/crates_lockers/crates.dm

@@ -676,14 +676,13 @@
 		"trashcart" = "trashcartopen",
 		"critter" = "critteropen",
 		"largemetal" = "largemetalopen",
-		"medicalcrate" = "medicalcrateopen"
+		"medicalcrate" = "medicalcrateopen",
+		"tcflcrate" = "tcflcrateopen"
 	)
 
 
-/obj/structure/closet/crate/loot/Initialize(mapload, var/_rarity = 1, var/_quantity = 10)
+/obj/structure/closet/crate/loot/Initialize(mapload)
 	. = ..()
-	rarity = _rarity
-	quantity = _quantity
 
 	spawntypes = list(
 		"1" = STOCK_RARE_PROB * rarity,

code/game/objects/structures/mirror.dm

@@ -140,7 +140,7 @@
 
 /obj/structure/mirror/merchant/attack_hand(var/mob/living/carbon/human/user)
 	if(istype(get_area(src),/area/merchant_station))
-		if(istype(user) && user.mind && user.mind.assigned_role == "Merchant" && user.species.name != "Vox")
+		if(istype(user) && user.mind && (user.mind.assigned_role == "Merchant" || user.mind.assigned_role == "Merchants Assistant")  && user.species.name != "Vox")
 			var/choice = input("Do you wish to become a Vox? This is not reversible.") as null|anything in list("No","Yes")
 			if(choice == "Yes")
 				user.set_species("Vox")