Dripshield - sprite touchups, mild armor value poking (#24170)

* dripwoken

* the noggin will hold

* better key

---------

Co-authored-by: Hatterhat <[email protected]>

modular_skyrat/modules/blueshield/code/clothing.dm

@@ -21,8 +21,8 @@
 	worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/ears.dmi'
 	icon_state = "bshield_headset"
 	worn_icon_state = "bshield_headset"
-	keyslot = new /obj/item/encryptionkey/heads/blueshield
-	keyslot2 = new /obj/item/encryptionkey/headset_cent
+	keyslot = /obj/item/encryptionkey/heads/blueshield
+	keyslot2 = /obj/item/encryptionkey/headset_cent
 
 /obj/item/radio/headset/headset_bs/alt
 	icon_state = "bshield_headset_alt"
@@ -39,16 +39,9 @@
 	icon = 'modular_skyrat/master_files/icons/obj/clothing/head/plasmaman_hats.dmi'
 	worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/head/plasmaman_head.dmi'
 	icon_state = "bs_envirohelm"
-	armor_type = /datum/armor/helmet_plasmaman_blueshield
-
-/datum/armor/helmet_plasmaman_blueshield
-	melee = 30
-	bullet = 20
-	laser = 20
-	energy = 20
-	bomb = 25
-	bio = 100
-	fire = 100
+	armor_type = /datum/armor/head_helmet/plasmaman/blueshield
+
+/datum/armor/head_helmet/plasmaman/blueshield
 	acid = 90
 
 /obj/item/clothing/under/plasmaman/blueshield
@@ -77,15 +70,10 @@
 	greyscale_colors = "#3A4E7D#DEB63D"
 	//alternate_worn_icon_digi = 'modular_skyrat/icons/mob/head_muzzled.dmi'
 	icon_state = "beret_badge_police"
-	armor_type = /datum/armor/beret_blueshield
+	armor_type = /datum/armor/head_helmet/blueshield
 	supports_variations_flags = CLOTHING_SNOUTED_VARIATION_NO_NEW_ICON
 
-/datum/armor/beret_blueshield
-	melee = 35
-	bullet = 25
-	laser = 25
-	energy = 15
-	bomb = 25
+/datum/armor/head_helmet/blueshield
 	fire = 75
 	acid = 75
 
@@ -132,13 +120,30 @@
 	desc = "A tight-fitting kevlar-lined vest with a blue badge on the chest of it."
 	icon_state = "blueshieldarmor"
 	body_parts_covered = CHEST
-	armor_type = /datum/armor/vest_blueshield
-
-/datum/armor/vest_blueshield
-	melee = 35
-	bullet = 25
-	laser = 25
-	energy = 25
+	armor_type = /datum/armor/suit_armor/blueshield
+	uses_advanced_reskins = TRUE
+	unique_reskin = list(
+		"Slim" = list(
+			RESKIN_ICON = 'modular_skyrat/master_files/icons/obj/clothing/suits/armor.dmi',
+			RESKIN_ICON_STATE = "blueshieldarmor",
+			RESKIN_WORN_ICON = 'modular_skyrat/master_files/icons/mob/clothing/suits/armor.dmi',
+			RESKIN_WORN_ICON_STATE = "blueshieldarmor",
+		),
+		"Marine" = list(
+			RESKIN_ICON = 'modular_skyrat/master_files/icons/obj/clothing/suits/armor.dmi',
+			RESKIN_ICON_STATE = "bs_marine",
+			RESKIN_WORN_ICON = 'modular_skyrat/master_files/icons/mob/clothing/suits/armor.dmi',
+			RESKIN_WORN_ICON_STATE = "bs_marine",
+		),
+		"Bulky" = list(
+			RESKIN_ICON = 'modular_skyrat/master_files/icons/obj/clothing/suits/armor.dmi',
+			RESKIN_ICON_STATE = "vest_black",
+			RESKIN_WORN_ICON = 'modular_skyrat/master_files/icons/mob/clothing/suits/armor.dmi',
+			RESKIN_WORN_ICON_STATE = "vest_black",
+		),
+	)
+
+/datum/armor/suit_armor/blueshield
 	bomb = 30
 	fire = 75
 	acid = 75
@@ -148,6 +153,7 @@
 	desc = "An expensive kevlar-lined jacket with a golden badge on the chest and \"NT\" emblazoned on the back. It weighs surprisingly little, despite how heavy it looks."
 	icon_state = "blueshield"
 	body_parts_covered = CHEST|ARMS
+	unique_reskin = null
 
 /obj/item/clothing/suit/armor/vest/blueshield/jacket/Initialize(mapload)
 	. = ..()
@@ -159,16 +165,7 @@
 	desc = "A comfy kevlar-lined coat with blue highlights, fit to keep the blueshield armored and warm."
 	hoodtype = /obj/item/clothing/head/hooded/winterhood/skyrat/blueshield
 	allowed = list(/obj/item/melee/baton/security/loaded)
-	armor_type = /datum/armor/wintercoat_blueshield
-
-/datum/armor/wintercoat_blueshield
-	melee = 35
-	bullet = 25
-	laser = 25
-	energy = 25
-	bomb = 30
-	fire = 75
-	acid = 75
+	armor_type = /datum/armor/suit_armor/blueshield
 
 /obj/item/clothing/suit/hooded/wintercoat/skyrat/blueshield/Initialize(mapload)
 	. = ..()
@@ -177,13 +174,4 @@
 /obj/item/clothing/head/hooded/winterhood/skyrat/blueshield
 	icon_state = "hood_blueshield"
 	desc = "A comfy kevlar-lined hood to go with the comfy kevlar-lined coat."
-	armor_type = /datum/armor/winterhood_blueshield
-
-/datum/armor/winterhood_blueshield
-	melee = 35
-	bullet = 25
-	laser = 25
-	energy = 15
-	bomb = 25
-	fire = 75
-	acid = 75
+	armor_type = /datum/armor/suit_armor/blueshield

modular_skyrat/modules/blueshield/code/encryptionkey.dm

@@ -1,5 +1,6 @@
 /obj/item/encryptionkey/heads/blueshield
 	name = "\proper the blueshield's encryption key"
-	icon = 'modular_skyrat/modules/blueshield/icons/radio.dmi'
-	icon_state = "bshield_cypherkey"
+	icon_state = "cypherkey_centcom"
 	channels = list(RADIO_CHANNEL_COMMAND = 1, RADIO_CHANNEL_SECURITY = 1)
+	greyscale_config = /datum/greyscale_config/encryptionkey_centcom
+	greyscale_colors = "#1d2657#dca01b"