Merge branch 'master' into naaka-polishening-1

DopplerShift13 · Sep 20, 2024 · e056243 · e056243
2 parents 16d61f7 + 000b62b
commit e056243
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 0 deletions.
diff --git a/modular_doppler/modular_cosmetics/GAGS/icons/mob/neck.dmi b/modular_doppler/modular_cosmetics/GAGS/icons/mob/neck.dmi
diff --git a/modular_doppler/modular_cosmetics/GAGS/icons/obj/neck.dmi b/modular_doppler/modular_cosmetics/GAGS/icons/obj/neck.dmi
diff --git a/modular_doppler/modular_cosmetics/code/head/hats.dm b/modular_doppler/modular_cosmetics/code/head/hats.dm
@@ -5,13 +5,15 @@
 /obj/item/clothing/head/beret/medical/chemist
 	name = "chemist beret"
 	desc = "Not acid-proof!"
+	icon_state = "beret_badge"
 	greyscale_config = /datum/greyscale_config/beret_badge
 	greyscale_config_worn = /datum/greyscale_config/beret_badge/worn
 	greyscale_colors = "#FFFFFF#D15B1B"
 
 /obj/item/clothing/head/beret/medical/virologist
 	name = "virologist beret"
 	desc = "Sneezing in this expensive hat would be a waste of a good beret."
+	icon_state = "beret_badge"
 	greyscale_config = /datum/greyscale_config/beret_badge
 	greyscale_config_worn = /datum/greyscale_config/beret_badge/worn
 	greyscale_colors = "#FFFFFF#198019"