Merge pull request #5768 from Ryan180602/arcticshield

Assorted blackshield armour visuals

code/game/objects/structures/crates_lockers/closets/wardrobe.dm

@@ -269,6 +269,8 @@
 	new /obj/item/clothing/accessory/job/cape/blackshield/tan(src)
 	new /obj/item/clothing/accessory/job/cape/blackshield/camo(src)
 	new /obj/item/clothing/accessory/job/cape/blackshield/camo(src)
+	new /obj/item/clothing/accessory/job/cape/blackshield/whitecamo(src)
+	new /obj/item/clothing/accessory/job/cape/blackshield/whitecamo(src)
 	new /obj/item/clothing/mask/balaclava(src)
 	new /obj/item/clothing/mask/balaclava(src)
 	new /obj/item/clothing/mask/balaclava(src)

code/modules/clothing/accessories/accessory.dm

@@ -471,6 +471,11 @@
 	desc = "A simple, durable cloak for protecting you in any weather conditions! This one comes in a tactical camo pattern."
 	icon_state = "blackshieldcloak_camo"
 
+/obj/item/clothing/accessory/job/cape/blackshield/whitecamo
+	name = "white camo Blackshield cloak"
+	desc = "A simple, durable cloak for protecting you in any weather conditions! This one comes in an urban tactical camo pattern."
+	icon_state = "blackshieldcloak_whitecamo"
+
 /obj/item/clothing/accessory/cape/sergeant_cape
 	name = "Sergeants mantle"
 	desc = "A shoulder-mantlee made from black and silver fabric, denoting the position of Sergeant. Allows for identification at a glance."

code/modules/clothing/head/helmet.dm

@@ -230,7 +230,7 @@
 /obj/item/clothing/head/helmet/ballistic
 	name = "ballistic helmet"
 	desc = "Standard military gear. Protects the head from impacts and shrapnel."
-	icon_state = "helmet_mil"
+	icon_state = "helmet_black"
 	armor_list = list(melee = 7, bullet = 10, energy = 5, bomb = 30, bio = 0, rad = 0)
 
 /obj/item/clothing/head/helmet/ballistic/verb/toggle_style()
@@ -243,7 +243,7 @@
 
 	var/mob/M = usr
 	var/list/options = list()
-	options["Baseline"] = "helmet_mil_alt"
+	options["Baseline"] = "helmet_black"
 	options["Green"] = "helmet_green"
 	options["Tan"] = "helmet_tan"
 
@@ -319,7 +319,7 @@
 	name = "blackshield helmet"
 	desc = "Standard military gear. Protects the head from impacts and shrapnel.\
 			This one bears the IFF stripes of the Blackshield."
-	icon_state = "helmet_mil_alt"
+	icon_state = "helmet_mil"
 
 /obj/item/clothing/head/helmet/ballistic/militia/toggle_style()
 	set name = "Adjust Style"
@@ -331,10 +331,14 @@
 
 	var/mob/M = usr
 	var/list/options = list()
-	options["Blackshield Colours"] = "helmet_mil_alt"
-	options["Desert Combat"] = "helmet_tan_mil"
+	options["Default Blackshield Combat"] = "helmet_mil"
+	options["Default Blackshield Combat - Anthromorphic"] = "helmet_mil_anthro"
+	options["Desert Blackshield Combat"] = "helmet_tan_mil"
+	options["Desert Blackshield Combat - Anthromorphic"] = "helmet_tan_mil_anthro"
 	options["Woodlands Blackshield Combat"] = "helmet_green_mil"
-	options["Anthromorphic Blackshield Helmet"] = "helmet_mil_anthro"
+	options["Woodlands Blackshield Combat - Anthromorphic"] = "helmet_green_mil_anthro"
+	options["Urban Blackshield Combat"] = "helmet_white_mil"
+	options["Urban Blackshield Combat - Anthromorphic"] = "helmet_white_mil_anthro"
 
 	var/choice = input(M,"What kind of style do you want?","Adjust Style") as null|anything in options
 
@@ -344,7 +348,7 @@
 		update_icon()
 		update_wear_icon()
 		usr.update_action_buttons()
-		return 1
+		return TRUE
 
 /obj/item/clothing/head/helmet/ballistic/militia/sergeant
 	name = "sergeant's ballistic gorget"
@@ -406,13 +410,19 @@
 
 	var/mob/M = usr
 	var/list/options = list()
-	options["Standard fullhelm"] = ""
-	options["Tan fullhelm"] = "_tan"
-	options["Green fullhelm"] = "_green"
-	options["Grey hooded fullhelm"] = "_gp"
-	options["Green hooeded fullhelm"] = "_grp"
-	options["Tan hooded fullhelm"] = "_tp"
-	options["Camo hooded fullhelm"] = "_cp"
+	options["Default Blackshield Combat"] = ""
+	options["Default Blackshield Combat - Anthromorphic"] = "_anthro"
+	options["Desert Blackshield Combat"] = "_tan"
+	options["Desert Blackshield Combat - Anthromorphic"] = "_tan_anthro"
+	options["Woodlands Blackshield Combat"] = "_green"
+	options["Woodlands Blackshield Combat - Anthromorphic"] = "_green_anthro"
+	options["Urban Blackshield Combat"] = "_white"
+	options["Urban Blackshield Combat - Anthromorphic"] = "_white_anthro"
+	options["Default Blackshield Combat - Hooded"] = "_gp"
+	options["Desert Blackshield Combat - Hooded"] = "_tp"
+	options["Woodlands Blackshield Combat - Hooded"] = "_grp"
+	options["Camo Blackshield Combat - Hooded"] = "_cp"
+	options["Urban Camo Combat - Hooded"] = "_wp"
 	var/choice = input(M,"What kind of style do you want?","Adjust Style") as null|anything in options
 
 	if(src && choice && !M.incapacitated() && Adjacent(M))
@@ -422,6 +432,24 @@
 		item_state = base
 		item_state_slots = null
 		to_chat(M, "You adjust to the [choice].")
+
+		var/list/anthro = list(
+			"_anthro",
+			"_tan_anthro",
+			"_green_anthro",
+			"_white_anthro"
+		)
+		if (options[choice] in anthro)
+			if (src.name == "blackshield full helm")
+				light_overlay = "bsfullhelm_anthro_light"
+			else
+				light_overlay = "corpsmanfullhelm_anthro_light"
+		else
+			if (src.name == "blackshield full helm")
+				light_overlay = "bsfullhelm_light"
+			else
+				light_overlay = "corpsmanfullhelm_light"
+
 		update_icon()
 		update_wear_icon()
 		usr.update_action_buttons()
@@ -460,13 +488,19 @@
 
 	var/mob/M = usr
 	var/list/options = list()
-	options["Standard fullhelm"] = ""
-	options["Tan fullhelm"] = "_tan"
-	options["Green fullhelm"] = "_green"
-	options["Grey hooded fullhelm"] = "_gp"
-	options["Green hooeded fullhelm"] = "_grp"
-	options["Tan hooded fullhelm"] = "_tp"
-	options["Camo hooded fullhelm"] = "_cp"
+	options["Default Blackshield Combat"] = ""
+	options["Default Blackshield Combat - Anthromorphic"] = "_anthro"
+	options["Desert Blackshield Combat"] = "_tan"
+	options["Desert Blackshield Combat - Anthromorphic"] = "_tan_anthro"
+	options["Woodlands Blackshield Combat"] = "_green"
+	options["Woodlands Blackshield Combat - Anthromorphic"] = "_green_anthro"
+	options["Urban Blackshield Combat"] = "_white"
+	options["Urban Blackshield Combat - Anthromorphic"] = "_white_anthro"
+	options["Default Blackshield Combat - Hooded"] = "_gp"
+	options["Desert Blackshield Combat - Hooded"] = "_tp"
+	options["Woodlands Blackshield Combat - Hooded"] = "_grp"
+	options["Camo Blackshield Combat - Hooded"] = "_cp"
+	options["Urban Camo Combat - Hooded"] = "_wp"
 	var/choice = input(M,"What kind of style do you want?","Adjust Style") as null|anything in options
 
 	if(src && choice && !M.incapacitated() && Adjacent(M))
@@ -476,6 +510,18 @@
 		item_state = base
 		item_state_slots = null
 		to_chat(M, "You adjust to the [choice].")
+
+		var/list/anthro = list(
+			"_anthro",
+			"_tan_anthro",
+			"_green_anthro",
+			"_white_anthro"
+		)
+		if (options[choice] in anthro)
+			light_overlay = "bsfullhelm_anthro_light"
+		else
+			light_overlay = "bsfullhelm_light"
+
 		update_icon()
 		update_wear_icon()
 		usr.update_action_buttons()
@@ -1810,9 +1856,10 @@
 
 	var/mob/M = usr
 	var/list/options = list()
-	options["maska dark camo"] = "maska_bs"
-	options["maska forest camo"] = "maska_bs_green"
-	options["maska red rock camo"] = "maska_bs_tan"
+	options["Default Blackshield Combat"] = "maska_bs"
+	options["Woodlands Blackshield Combat"] = "maska_bs_green"
+	options["Desert Blackshield Combat"] = "maska_bs_tan"
+	options["Urban Blackshield Combat"] = "maska_bs_white"
 
 	var/choice = input(M,"What kind of style do you want?","Adjust Style") as null|anything in options
 

code/modules/clothing/suits/armor.dm

@@ -894,8 +894,10 @@
 
 	var/mob/M = usr
 	var/list/options = list()
-	options["Blackshield Colours"] = "flakvest_mil"
+	options["Default Blackshield Combat"] = "flakvest_mil"
 	options["Woodlands Blackshield Combat"] = "flakvest_green_mil"
+	options["Desert Blackshield Combat"] = "flakvest_tan_mil"
+	options["Urban Blackshield Combat"] = "flakvest_white_mil"
 
 	var/choice = input(M,"What kind of style do you want?","Adjust Style") as null|anything in options
 
@@ -928,8 +930,10 @@
 
 	var/mob/M = usr
 	var/list/options = list()
-	options["Blackshield Colours"] = "flakvest_mil_fullbody"
+	options["Default Blackshield Combat"] = "flakvest_mil_fullbody"
 	options["Woodlands Blackshield Combat"] = "flakvest_green_mil_fullbody"
+	options["Desert Blackshield Combat"] = "flakvest_tan_mil_fullbody"
+	options["Urban Blackshield Combat"] = "flakvest_white_mil_fullbody"
 
 	var/choice = input(M,"What kind of style do you want?","Adjust Style") as null|anything in options
 
@@ -951,6 +955,32 @@
 	slowdown = 0.1 //faster than standard due to being fancier.
 	armor_list = list(melee = 9, bullet = 12, energy = 10, bomb = 50, bio = 0, rad = 0)
 
+/obj/item/clothing/suit/armor/flakvest/commander/toggle_style()
+	set name = "Adjust Style"
+	set category = "Object"
+	set src in usr
+
+	if(!isliving(loc))
+		return
+
+	var/mob/M = usr
+	var/list/options = list()
+	options["Default Blackshield Combat"] = "flakvest_mil"
+	options["Woodlands Blackshield Combat"] = "flakvest_green_mil"
+	options["Desert Blackshield Combat"] = "flakvest_tan_mil"
+	options["Urban Blackshield Combat"] = "flakvest_white_mil"
+
+	var/choice = input(M,"What kind of style do you want?","Adjust Style") as null|anything in options
+
+	if(src && choice && !M.incapacitated() && Adjacent(M))
+		icon_state = options[choice]
+		item_state = options[choice]
+		to_chat(M, "You adjusted your attire's style into [choice] mode.")
+		update_icon()
+		update_wear_icon()
+		usr.update_action_buttons()
+		return TRUE
+
 /obj/item/clothing/suit/armor/flakvest/commander/full
 	name = "advanced full body flak vest" //
 	desc = "An armored, padded vest that's seen many long tours and is suited for heavy-duty operations. \
@@ -980,9 +1010,10 @@
 
 	var/mob/M = usr
 	var/list/options = list()
-	options["Blackshield Black"] = "commander_mil_fullbody"
-	options["Woodland Green"] = "commander_green_fullbody"
-	options["Desert Tan"] = "commander_tan_fullbody"
+	options["Default Blackshield Combat"] = "commander_mil_fullbody"
+	options["Woodlands Blackshield Combat"] = "commander_green_fullbody"
+	options["Desert Blackshield Combat"] = "commander_tan_fullbody"
+	options["Urban Blackshield Combat"] = "commander_white_fullbody"
 
 	var/choice = input(M,"What kind of style do you want?","Adjust Style") as null|anything in options
 
@@ -993,7 +1024,7 @@
 		update_icon()
 		update_wear_icon()
 		usr.update_action_buttons()
-		return 1
+		return TRUE
 
 /*
  * Heavy Armor Types
@@ -1263,9 +1294,10 @@
 
 	var/mob/M = usr
 	var/list/options = list()
-	options["Blackshield Colours"] = "platecarrier_mil"
-	options["Desert Combat"] = "platecarrier_tan_mil"
+	options["Default Blackshield Combat"] = "platecarrier_mil"
+	options["Desert Blackshield Combat"] = "platecarrier_tan_mil"
 	options["Woodlands Blackshield Combat"] = "platecarrier_green_mil"
+	options["Urban Blackshield Combat"] = "platecarrier_white_mil"
 
 	var/choice = input(M,"What kind of style do you want?","Adjust Style") as null|anything in options
 
@@ -1297,9 +1329,10 @@
 
 	var/mob/M = usr
 	var/list/options = list()
-	options["Blackshield Colours"] = "platecarrier_mil_fullbody"
-	options["Desert Combat"] = "platecarrier_tan_mil_fullbody"
+	options["Default Blackshield Combat"] = "platecarrier_mil_fullbody"
+	options["Desert Blackshield Combat"] = "platecarrier_tan_mil_fullbody"
 	options["Woodlands Blackshield Combat"] = "platecarrier_green_mil_fullbody"
+	options["Urban Blackshield Combat"] = "platecarrier_white_mil_fullbody"
 
 	var/choice = input(M,"What kind of style do you want?","Adjust Style") as null|anything in options
 
@@ -1329,9 +1362,10 @@
 
 	var/mob/M = usr
 	var/list/options = list()
-	options["Blackshield Colours"] = "platecarrier_corpsman"
-	options["Desert Combat"] = "platecarrier_tan_corpsman"
+	options["Default Blackshield Combat"] = "platecarrier_corpsman"
+	options["Desert Blackshield Combat"] = "platecarrier_tan_corpsman"
 	options["Woodlands Blackshield Combat"] = "platecarrier_green_corpsman"
+	options["Urban Blackshield Combat"] = "platecarrier_white_corpsman"
 
 	var/choice = input(M,"What kind of style do you want?","Adjust Style") as null|anything in options
 
@@ -1363,9 +1397,10 @@
 
 	var/mob/M = usr
 	var/list/options = list()
-	options["Blackshield Colours"] = "platecarrier_corpsman_fullbody"
-	options["Desert Combat"] = "platecarrier_tan_corpsman_fullbody"
+	options["Blackshield Blackshield Combat"] = "platecarrier_corpsman_fullbody"
+	options["Desert Blackshield Combat"] = "platecarrier_tan_corpsman_fullbody"
 	options["Woodlands Blackshield Combat"] = "platecarrier_green_corpsman_fullbody"
+	options["Urban Blackshield Combat"] = "platecarrier_white_corpsman_fullbody"
 
 	var/choice = input(M,"What kind of style do you want?","Adjust Style") as null|anything in options
 
@@ -1529,11 +1564,12 @@
 
 	var/mob/M = usr
 	var/list/options = list()
-	options["Blackshield Colours"] = "commander_mil"
-	options["Desert Combat"] = "commander_tan"
-	options["Woodlands Combat"] = "commander_green"
-	options["BC Cloaked Greatcoat"] = "mc_coat_cloak"
-	options["BC Greatcoat"] = "mc_coat"
+	options["Default Blackshield Combat"] = "commander_mil"
+	options["Desert Blackshield Combat"] = "commander_tan"
+	options["Woodlands Blackshield Combat"] = "commander_green"
+	options["Urban Blackshield Combat"] = "commander_white"
+	options["Cloaked BlackshieldGreatcoat"] = "mc_coat_cloak"
+	options["Blackshield Greatcoat"] = "mc_coat"
 
 	var/choice = input(M,"What kind of style do you want?","Adjust Style") as null|anything in options
 
@@ -1544,7 +1580,7 @@
 		update_icon()
 		update_wear_icon()
 		usr.update_action_buttons()
-		return 1
+		return TRUE
 
 /obj/item/clothing/suit/storage/armor/militia_overcoat // Pockets for your hands on the cold.
 	name = "blackshield armored overcoat"