Merge branch 'master' into tac-refactor

cmss13-devs · Oct 10, 2023 · 07c80b3 · 07c80b3
2 parents c4e6028 + 1c51714
commit 07c80b3
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 2 deletions.
diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm
@@ -142,7 +142,7 @@
 
 /obj/item/clothing/glasses/science/prescription
 	name = "prescription reagent scanner HUD goggles"
-	desc = "These goggles are probably of use to someone who isn't holding a rifle and actively seeking to lower their combat life expectancy. Contains prescription lenses." 
+	desc = "These goggles are probably of use to someone who isn't holding a rifle and actively seeking to lower their combat life expectancy. Contains prescription lenses."
 	prescription = TRUE
 
 /obj/item/clothing/glasses/science/get_examine_text(mob/user)
@@ -414,7 +414,7 @@
 /obj/item/clothing/glasses/mgoggles/v2
 	name = "M1A1 marine ballistic goggles"
 	desc = "Newer issue USCM goggles. While commonly found mounted atop M10 pattern helmets, they are also capable of preventing insects, dust, and other things from getting into one's eyes. This version has larger lenses."
-	icon_state = "mgoggles2_down"
+	icon_state = "mgoggles2"
 	active_icon_state = "mgoggles2_down"
 	inactive_icon_state = "mgoggles2"
 

diff --git a/html/changelogs/AutoChangeLog-pr-4613.yml b/html/changelogs/AutoChangeLog-pr-4613.yml
@@ -0,0 +1,4 @@
+author: "irRegularGuy646"
+delete-after: True
+changes:
+  - bugfix: "fixed new goggle's on helmet sprite"
diff --git a/icons/mob/humans/onmob/eyes.dmi b/icons/mob/humans/onmob/eyes.dmi
diff --git a/icons/mob/humans/onmob/helmet_garb.dmi b/icons/mob/humans/onmob/helmet_garb.dmi
diff --git a/icons/mob/humans/onmob/mask.dmi b/icons/mob/humans/onmob/mask.dmi