Merge branch 'master' of https://github.com/cmss13-devs/cmss13 into C…

…BRN2

code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm

@@ -148,6 +148,7 @@
 
 		list("MISCELLANEOUS", -1, null, null, null),
 		list("Ballistic goggles", round(scale * 10), /obj/item/clothing/glasses/mgoggles, VENDOR_ITEM_REGULAR),
+		list("M1A1 Ballistic goggles", round(scale * 10), /obj/item/clothing/glasses/mgoggles/v2, VENDOR_ITEM_REGULAR),
 		list("Prescription ballistic goggles", round(scale * 10), /obj/item/clothing/glasses/mgoggles/prescription, VENDOR_ITEM_REGULAR),
 		list("Marine RPG glasses", round(scale * 10), /obj/item/clothing/glasses/regular, VENDOR_ITEM_REGULAR),
 		list("M5 Integrated Gas Mask", round(scale * 10), /obj/item/prop/helmetgarb/helmet_gasmask, VENDOR_ITEM_REGULAR),

code/modules/client/preferences_gear.dm

@@ -62,6 +62,10 @@ var/global/list/gear_datums_by_name = list()
 	display_name = "Ballistic goggles, orange"
 	path = /obj/item/clothing/glasses/mgoggles/orange
 
+/datum/gear/eyewear/goggles2
+	display_name = "Ballistic goggles, M1A1"
+	path = /obj/item/clothing/glasses/mgoggles/v2
+
 /datum/gear/eyewear/bimex_shades
 	display_name = "BiMex personal shades"
 	path = /obj/item/clothing/glasses/sunglasses/big

code/modules/clothing/glasses/glasses.dm

@@ -411,6 +411,13 @@
 	active_icon_state = "mgogglesorg_down"
 	inactive_icon_state = "mgogglesorg"
 
+/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"
+	active_icon_state = "mgoggles2_down"
+	inactive_icon_state = "mgoggles2"
+
 /obj/item/clothing/glasses/mgoggles/on_enter_storage(obj/item/storage/internal/S)
 	..()
 

code/modules/clothing/head/head.dm

@@ -242,6 +242,7 @@
 						/obj/item/clothing/glasses/mgoggles/prescription = HAT_GARB_RELAY_ICON_STATE,
 						/obj/item/clothing/glasses/mgoggles/black = HAT_GARB_RELAY_ICON_STATE,
 						/obj/item/clothing/glasses/mgoggles/orange = HAT_GARB_RELAY_ICON_STATE,
+						/obj/item/clothing/glasses/mgoggles/v2 = HAT_GARB_RELAY_ICON_STATE,
 						/obj/item/prop/helmetgarb/helmet_nvg = HAT_GARB_RELAY_ICON_STATE,
 						/obj/item/prop/helmetgarb/helmet_nvg/cosmetic = HAT_GARB_RELAY_ICON_STATE,
 						/obj/item/prop/helmetgarb/helmet_nvg/marsoc = HAT_GARB_RELAY_ICON_STATE,

code/modules/clothing/head/helmet.dm

@@ -246,6 +246,7 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list(
 
 	// EYEWEAR
 	/obj/item/clothing/glasses/mgoggles = HELMET_GARB_RELAY_ICON_STATE,
+	/obj/item/clothing/glasses/mgoggles/v2 = HELMET_GARB_RELAY_ICON_STATE,
 	/obj/item/clothing/glasses/mgoggles/prescription = HELMET_GARB_RELAY_ICON_STATE,
 	/obj/item/clothing/glasses/mgoggles/black = HELMET_GARB_RELAY_ICON_STATE,
 	/obj/item/clothing/glasses/mgoggles/orange = HELMET_GARB_RELAY_ICON_STATE,

html/changelogs/archive/2023-10.yml

@@ -84,3 +84,32 @@
 2023-10-06:
   blackdragonTOW:
   - bugfix: fixed spider dead sprite to not have white space (is transparent instead)
+2023-10-08:
+  Kivts:
+  - rscadd: You can partially protect yourself from flu and other disease by wearing
+      a mask and other PPE. Doesnt affect Black Goo.
+  Steelpoint:
+  - rscadd: Black and white beret's have been added as loadout options for all characters
+      as headwear.
+  - rscadd: More cosmetic options are on offer for Synthetics. Includes white and
+      black berets, standard or darker engineering and mp uniforms and all camo options
+      for the poncho.
+  - rscadd: The Synth Councillor and Synth Utility uniforms can now roll their sleeves.
+  blackdragonTOW:
+  - spellcheck: Altered inconsistent dropship ammo names
+  irRegularGuy646:
+  - rscadd: Added new "M1A1" ballistic goggle reskin
+  kiVts:
+  - rscadd: Spades can now remove botany plants.
+  - rscadd: Plants now globally take more water to grow.
+  - code_imp: removed all mention of lighting in botany trays.
+  - bugfix: Research computer no longer shows "for" for every simulation result.
+  realforest2001:
+  - rscadd: Added a Do Not Disturb feature for MOST phones. (Overwatch and a couple
+      others excluded).
+  spartanbobby:
+  - maptweak: Fixes floating Cameras and Light in the maint tunnels north of south
+      of brig
+  - maptweak: Fixes incorrect Shower tiles in maint shower north of engineering
+  - maptweak: Fixes incorrect area in maint south of VC bunk
+  - maptweak: Removes Piano from USS Almayer upper lifeboat area