Brown Pants medal, red captain reward, and slight sprite fixes to alt…

… coloured captain gear. (#4860)

* the medal, update reward, fix bluecap, add redcap

* fixes satchels

* raises two coats one pixel

* new method as requested

code/WorkInProgress/rewardsLocker.dm

@@ -76,7 +76,8 @@
 				M.desc = "A fancy designer bag made out of space snake leather and encrusted with plastic expertly made to look like gold. (Base Item: [prev3])"
 				activator.set_clothing_icon_dirty()
 				M.wear_layer = MOB_BACK_LAYER_SATCHEL
-			else
+
+			else if (activator.back.icon_state == "capbackpack_blue")
 				var/obj/item/storage/backpack/M = activator.back
 				var/prev3 = M.name
 				M.icon = 'icons/obj/items/storage.dmi'
@@ -92,6 +93,22 @@
 				activator.set_clothing_icon_dirty()
 				M.wear_layer = MOB_BACK_LAYER_SATCHEL
 
+			else
+				var/obj/item/storage/backpack/M = activator.back
+				var/prev3 = M.name
+				M.icon = 'icons/obj/items/storage.dmi'
+				M.inhand_image_icon = 'icons/mob/inhand/hand_general.dmi'
+				if (M.inhand_image) M.inhand_image.icon = 'icons/mob/inhand/hand_general.dmi'
+				M.wear_image_icon = 'icons/mob/back.dmi'
+				if (M.wear_image) M.wear_image.icon = 'icons/mob/back.dmi'
+				M.icon_state = "capsatchel_red"
+				M.item_state = "capbackpack_red"
+				M.name = "Captains Satchel"
+				M.real_name = "Captains Satchel"
+				M.desc = "A fancy designer bag made out of rare red space snake leather and encrusted with plastic expertly made to look like gold. (Base Item: [prev3])"
+				activator.set_clothing_icon_dirty()
+
+
 		else if (istype(activator.back, /obj/item/storage/backpack))
 			var/obj/item/storage/backpack/M = activator.back
 			var/prev3 = M.name
@@ -639,14 +656,23 @@
 			if (H.belt)
 				var/obj/item/M = H.belt
 				if (istype(M, /obj/item/katana_sheath/captain))
-					if (M.item_state == "scabbard-cap1")
+					if (M.item_state == "scabbard-cap1" || M.item_state == "red_scabbard-cap1")
 						qdel(M)
 						H.equip_if_possible(new /obj/item/katana_sheath/captain/blue(H), H.slot_belt)
 						succ = TRUE
 
 			if (H.back)
+				if (istype(H.back, /obj/item/storage/backpack/satchel/captain) || (H.back.icon_state == "capsatchel" || H.back.icon_state == "capsatchel_red"))
+					var/obj/item/storage/backpack/satchel/captain/M = activator.back
+					var/prev = M.name
+					M.icon_state = "capsatchel_blue"
+					M.item_state = "capsatchel_blue"
+					M.desc = "A fancy designer bag made out of rare blue space snake leather and encrusted with plastic expertly made to look like gold. (Base Item: [prev])"
+					H.set_clothing_icon_dirty()
+					succ = TRUE
+
 				if (istype(H.back, /obj/item/storage/backpack/captain))
-					if (H.back.icon_state == "capbackpack")
+					if (H.back.icon_state == "capbackpack" || H.back.icon_state == "capbackpack_red")
 						var/obj/item/storage/backpack/captain/M = activator.back
 						var/prev = M.name
 						M.icon_state = "capbackpack_blue"
@@ -655,14 +681,6 @@
 						H.set_clothing_icon_dirty()
 						succ = TRUE
 
-				if (istype(H.back, /obj/item/storage/backpack/satchel/captain)|| H.back.icon_state == "capsatchel")
-					var/obj/item/storage/backpack/satchel/captain/M = activator.back
-					var/prev = M.name
-					M.icon_state = "capsatchel_blue"
-					M.item_state = "capsatchel_blue"
-					M.desc = "A fancy designer bag made out of rare blue space snake leather and encrusted with plastic expertly made to look like gold. (Base Item: [prev])"
-					H.set_clothing_icon_dirty()
-					succ = TRUE
 
 			if (!succ)
 				boutput(activator, "<span class='alert'>Unable to redeem... What kind of fake captain are you!?</span>")
@@ -671,41 +689,47 @@
 			boutput(activator, "<span class='alert'>Unable to redeem... Only humans can redeem this.</span>")
 			return FALSE
 
-
-// I don't like this being tied to Nero
-// but please use it for a different medal!!!!!
-/*
+//red captain medal, after all this time!
 /datum/achievementReward/centcom_administrator
 	title = "(Skin Set) CENTCOM Administrator Uniform"
-	desc = "Will change the skin of captain hats, captain armor/spacesuits and captain uniforms."
-	required_medal = "Nero" //nero for now, only a suggestion, please replace if anyone has better ideas for this ty <3
+	desc = "Will change the skin of captain hats, captain armor/spacesuits, cap backpacks, sabres and captain uniforms."
+	required_medal = "Brown Pants" //Red shirt, brown pants.
 	once_per_round = 0
 
 	rewardActivate(var/mob/activator)
 		if (ishuman(activator))
 			var/mob/living/carbon/human/H = activator
-
+			var/succ = 0
 			if (H.w_uniform)
 				var/obj/item/clothing/M = H.w_uniform
 				if (istype(M, /obj/item/clothing/under/rank/captain))
 					var/prev = M.name
 					M.name = "administrator's uniform"
 					M.desc = "A uniform specifically for CENTCOM administrators. (Base Item: [prev])"
-					if (istype(M, /obj/item/clothing/under/rank/captain/dress))
+					if (istype(M, /obj/item/clothing/under/rank/captain/fancy))
+						M.icon_state = "captain-fancy-red"
+						M.item_state = "captain-fancy-red"
+					else if (istype(M, /obj/item/clothing/under/rank/captain/dress))
 						M.icon_state = "captain-dress-red"
 						M.item_state = "captain-dress-red"
 					else
 						M.icon_state = "captain-red"
 						M.item_state = "captain-red"
 					H.set_clothing_icon_dirty()
+					succ = TRUE
 
 				else if (istype(M, /obj/item/clothing/under/suit/captain))
 					var/prev = M.name
-					M.name = "administrator's uniform"
+					M.name = "\improper Administator's suit"
 					M.desc = "A uniform specifically for CENTCOM administrators. (Base Item: [prev])"
-					M.icon_state = "suit-capR"
-					M.item_state = "suit-capR"
+					if (istype(M, /obj/item/clothing/under/suit/captain/dress))
+						M.icon_state = "suit-capR-dress"
+						M.item_state = "suit-capR-dress"
+					else
+						M.icon_state = "suit-capR"
+						M.item_state = "suit-capR"
 					H.set_clothing_icon_dirty()
+					succ = TRUE
 
 			if (H.wear_suit)
 				var/obj/item/clothing/M = H.wear_suit
@@ -716,13 +740,14 @@
 					M.name = "administrator's armor"
 					M.desc = "A suit of protective formal armor. It is made specifically for CENTCOM administrators. (Base Item: [prev])"
 					H.set_clothing_icon_dirty()
+					succ = TRUE
 
 				if (istype(M, /obj/item/clothing/suit/armor/capcoat))
 					var/prev = M.name
 					M.icon_state = "centcoat-red"
 					M.item_state = "centcoat-red"
-					M.name = "commander's coat"
-					M.real_name = "commander's coat"
+					M.name = "administrator's coat"
+					M.real_name = "administrator's coat"
 					M.desc = "A luxorious formal coat. It is specifically made for CENTCOM administrators.(Base Item: [prev])"
 					H.set_clothing_icon_dirty()
 					succ = TRUE
@@ -734,18 +759,63 @@
 					M.name = "administrator's space suit"
 					M.desc = "A suit that protects against low pressure environments. It is made specifically for CENTCOM administrators. (Base Item: [prev])"
 					H.set_clothing_icon_dirty()
+					succ = TRUE
 
 			if (H.head)
 				var/obj/item/clothing/M = H.head
 				if (istype(M, /obj/item/clothing/head/caphat))
 					var/prev = M.name
 					M.icon_state = "centcom-red"
 					M.item_state = "centcom-red"
-					M.name = "CENTCOM hat"
+					M.name = "administrator's hat"
 					M.desc = "A fancy hat specifically for CENTCOM administrators. (Base Item: [prev])"
 					H.set_clothing_icon_dirty()
-		return
-*/
+					succ = TRUE
+
+				else if (istype(M, /obj/item/clothing/head/helmet/space/captain))
+					var/prev = M.name
+					M.name = "administrator's space helmet"
+					M.desc = "Helps protect against vacuum. Comes in a fasionable red befitting a admninistrator. (Base Item: [prev])"
+					M.icon_state = "space-captain-red"
+					M.item_state = "space-captain-red"
+					H.set_clothing_icon_dirty()
+					succ = TRUE
+
+			if (H.belt)
+				var/obj/item/M = H.belt
+				if (istype(M, /obj/item/katana_sheath/captain))
+					if (M.item_state == "scabbard-cap1" || M.item_state == "blue_scabbard-cap1")
+						qdel(M)
+						H.equip_if_possible(new /obj/item/katana_sheath/captain/red(H), H.slot_belt)
+						succ = TRUE
+
+			if (H.back)
+				if (istype(H.back, /obj/item/storage/backpack/satchel/captain) || (H.back.icon_state == "capsatchel" || H.back.icon_state == "capsatchel_blue"))
+					var/obj/item/storage/backpack/satchel/captain/M = activator.back
+					var/prev = M.name
+					M.icon_state = "capsatchel_red"
+					M.item_state = "capsatchel_red"
+					M.desc = "A fancy designer bag made out of rare red space snake leather and encrusted with plastic expertly made to look like gold. (Base Item: [prev])"
+					H.set_clothing_icon_dirty()
+					succ = TRUE
+
+				if (istype(H.back, /obj/item/storage/backpack/captain))
+					if (H.back.icon_state == "capbackpack" || H.back.icon_state == "capbackpack_blue")
+						var/obj/item/storage/backpack/captain/M = activator.back
+						var/prev = M.name
+						M.icon_state = "capbackpack_red"
+						M.item_state = "capbackpack_red"
+						M.desc = "A fancy designer bag made out of rare red space snake leather and encrusted with plastic expertly made to look like gold. (Base Item: [prev])"
+						H.set_clothing_icon_dirty()
+						succ = TRUE
+
+
+			if (!succ)
+				boutput(activator, "<span class='alert'>Unable to redeem... What kind of fake captain are you!?</span>")
+			return succ
+		else
+			boutput(activator, "<span class='alert'>Unable to redeem... Only humans can redeem this.</span>")
+			return FALSE
 
 /datum/achievementReward/ai_malf
 	title = "(AI Skin) Malfunction"

code/obj/item/misc_weapons.dm

@@ -1313,7 +1313,7 @@
 		ih_sheath_state = "blue_scabbard-cap0"
 		sword_path = /obj/item/katana/captain/blue
 
-	red //not used yet but should be used if a medal is ever made for the red cap stuff
+	red //for brown pants medal reward
 		icon_state = "red_cap_sword_scabbard"
 		item_state = "red_scabbard-cap1"
 

code/obj/machinery/nuclearbomb.dm

@@ -191,6 +191,9 @@
 					timer_modifier = src.timer_modifier_disk
 					user.visible_message("<span class='alert'><b>[user]</b> inserts [W.name], extending the bomb's timer by [src.timer_modifier_disk / 10] seconds!</span>")
 
+					if (user.mind && user.mind.assigned_role == "Captain") //the fat frog did it!
+						user.unlock_medal("Brown Pants", 1)
+
 				playsound(src.loc, "sound/machines/ping.ogg", 100, 0)
 				logTheThing("bombing", user, null, "inserted [W.name] into [src] at [log_loc(src)], modifying the timer by [timer_modifier / 10] seconds.")
 				user.u_equip(W)