Merge pull request #1241 from Citadel-Station-13/upstream-merge-27708

[MIRROR] Small outfit refactor
2017-06-05 23:07:02 -05:00
parent 0158eded16 a8fe8fd1aa
commit 0b196930bb
2 changed files with 6 additions and 2 deletions
@@ -594,7 +594,8 @@ GLOBAL_PROTECT(AdminProcCallCount)
 	var/list/paths = subtypesof(/datum/outfit) - typesof(/datum/outfit/job)
 	for(var/path in paths)
 		var/datum/outfit/O = path //not much to initalize here but whatever
-		outfits[initial(O.name)] = path
+		if(initial(O.can_be_admin_equipped))
+			outfits[initial(O.name)] = path


 	var/dresscode = input("Select dress for [M]", "Robust quick dress shop") as null|anything in outfits
@@ -609,7 +610,8 @@ GLOBAL_PROTECT(AdminProcCallCount)
 		var/list/job_outfits = list()
 		for(var/path in job_paths)
 			var/datum/outfit/O = path
-			job_outfits[initial(O.name)] = path
+			if(initial(O.can_be_admin_equipped))
+				job_outfits[initial(O.name)] = path

 		dresscode = input("Select job equipment", "Robust quick dress shop") as null|anything in job_outfits
 		dresscode = job_outfits[dresscode]