Merge remote-tracking branch 'cmss13-devs/master' into guh

code/datums/weather/weather_events/long.dm

@@ -0,0 +1,48 @@
+// Weather events for Big Red
+/datum/weather_event/dust/infinite
+	name = "Duststorm (Infinite)"
+	length = INFINITY
+
+/datum/weather_event/sand/infinite
+	name = "Sandstorm (Infinite)"
+	length = INFINITY
+
+/datum/weather_event/rock/infinite
+	name = "Rockstorm (Infinite)"
+	length = INFINITY
+
+// Weather events for Chances Claim
+/datum/weather_event/light_rain/lv522/infinite
+	name = "LV522 Light Rain (Infinite)"
+	length = INFINITY
+
+// Weather events for LV624
+/datum/weather_event/light_rain/infinite
+	name = "Light Rain (Infinite)"
+	length = INFINITY
+
+/datum/weather_event/heavy_rain/infinite
+	name = "Heavy Rain (Infinite)"
+	length = INFINITY
+
+// Weather events for New Varadero
+/datum/weather_event/light_rain/varadero/infinite
+	name = "Tropical Storm (Infinite)"
+	length = INFINITY
+
+/datum/weather_event/monsoon/infinite
+	name = "Monsoon Warning (Infinite)"
+	length = INFINITY
+
+// Weather events for Sorokyne
+/datum/weather_event/snow/infinite
+	name = "Snow (Infinite)"
+	length = INFINITY
+
+/datum/weather_event/snowstorm/infinite
+	name = "Snowstorm (Infinite)"
+	length = INFINITY
+
+/datum/weather_event/blizzard/infinite
+	name = "Blizzard (Infinite)"
+	length = INFINITY

code/datums/weather/weather_events/lv522_chances_claim.dm

@@ -1,4 +1,6 @@
 /datum/weather_event/light_rain/lv522
+	name = "LV522 Light Rain"
+	display_name = "Light Rain"
 	length = 3 MINUTES
 	lightning_chance = 4
 

code/datums/weather/weather_events/new_varadero.dm

@@ -1,22 +1,13 @@
-/datum/weather_event/light_rain
+/datum/weather_event/light_rain/varadero
 	name = "Tropical Storm"
 	display_name = "Tropical Storm"
 	length = 4 MINUTES
-	fullscreen_type = /atom/movable/screen/fullscreen/weather/low
 
-	turf_overlay_icon_state = "strata_storm"
 	turf_overlay_alpha = 40
 
-	effect_message = null
-	damage_per_tick = 0
-
 	has_process = TRUE
 	lightning_chance = 1
 
-	ambience = 'sound/ambience/rainforest.ogg'
-
-	fire_smothering_strength = 1
-
 /datum/weather_event/monsoon
 	name = "Monsoon Warning"
 	display_name = "Monsoon Warning"

code/datums/weather/weather_map_holders/new_varadero.dm

@@ -5,7 +5,7 @@
 	no_weather_turf_icon_state = "strata_clearsky"
 
 	potential_weather_events = list(
-		/datum/weather_event/light_rain,
+		/datum/weather_event/light_rain/varadero,
 		/datum/weather_event/monsoon,
 	)
 

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

@@ -140,7 +140,7 @@
 		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),
+		list("M10 Helmet Camouflage Wrap", round(scale * 10), /obj/item/prop/helmetgarb/camocover, VENDOR_ITEM_REGULAR),
 		list("M10 Helmet Netting", round(scale * 10), /obj/item/prop/helmetgarb/netting, VENDOR_ITEM_REGULAR),
 		list("M10 Helmet Rain Cover", round(scale * 10), /obj/item/prop/helmetgarb/raincover, VENDOR_ITEM_REGULAR),
 		list("Firearm Lubricant", round(scale * 15), /obj/item/prop/helmetgarb/gunoil, VENDOR_ITEM_REGULAR),
@@ -444,8 +444,9 @@
 		list("Machete Scabbard (Full)", round(scale * 5), /obj/item/storage/large_holster/machete/full, VENDOR_ITEM_REGULAR),
 		list("Binoculars", round(scale * 1), /obj/item/device/binoculars, VENDOR_ITEM_REGULAR),
 		list("AN/PSQ-55 Sentry Console", round(scale * 1), /obj/item/device/sentry_computer, VENDOR_ITEM_REGULAR),
-		list("Spare PDT/L Battle Buddy Kit", round(scale * 3), /obj/item/storage/box/pdt_kit, VENDOR_ITEM_REGULAR),
+		list("Spare PDT/L Battle Buddy Kit", round(scale * 3), /obj/item/storage/box/pdt_kit/advanced, VENDOR_ITEM_REGULAR),
 		list("Rail Flashlight", round(scale * 5), /obj/item/attachable/flashlight, VENDOR_ITEM_REGULAR),
+		list("M5 'Night Raider' bayonet", round(scale * 5), /obj/item/attachable/bayonet, VENDOR_ITEM_REGULAR),
 		)
 
 /obj/structure/machinery/cm_vending/sorted/cargo_guns/squad/upp
@@ -502,8 +503,9 @@
 		list("Roller Bed", round(scale * 2), /obj/item/roller, VENDOR_ITEM_REGULAR),
 		list("Machete Scabbard (Full)", round(scale * 5), /obj/item/storage/large_holster/machete/full, VENDOR_ITEM_REGULAR),
 		list("Binoculars", round(scale * 1), /obj/item/device/binoculars, VENDOR_ITEM_REGULAR),
-		list("Spare PDT/L Battle Buddy Kit", round(scale * 3), /obj/item/storage/box/pdt_kit, VENDOR_ITEM_REGULAR),
+		list("Spare PDT/L Battle Buddy Kit", round(scale * 3), /obj/item/storage/box/pdt_kit/advanced, VENDOR_ITEM_REGULAR),
 		list("Rail Flashlight", round(scale * 5), /obj/item/attachable/flashlight, VENDOR_ITEM_REGULAR),
+		list("Type 80 Bayonet", round(scale * 5), /obj/item/attachable/bayonet/upp, null, VENDOR_ITEM_REGULAR),
 
 		list("CLOTHING", -1, null, null),
 		list("Cap", round(scale * 5), /obj/item/clothing/head/uppcap, VENDOR_ITEM_REGULAR),
@@ -563,8 +565,9 @@
 		list("Roller Bed", round(scale * 2), /obj/item/roller, VENDOR_ITEM_REGULAR),
 		list("Machete Scabbard (Full)", round(scale * 5), /obj/item/storage/large_holster/machete/full, VENDOR_ITEM_REGULAR),
 		list("Binoculars", round(scale * 1), /obj/item/device/binoculars, VENDOR_ITEM_REGULAR),
-		list("Spare PDT/L Battle Buddy Kit", round(scale * 3), /obj/item/storage/box/pdt_kit, VENDOR_ITEM_REGULAR),
+		list("Spare PDT/L Battle Buddy Kit", round(scale * 3), /obj/item/storage/box/pdt_kit/advanced, VENDOR_ITEM_REGULAR),
 		list("Rail Flashlight", round(scale * 5), /obj/item/attachable/flashlight, VENDOR_ITEM_REGULAR),
+		list("M5 'Night Raider' bayonet", round(scale * 5), /obj/item/attachable/bayonet, VENDOR_ITEM_REGULAR),
 
 		list("CLOTHING", -1, null, null),
 		list("Poncho (green)", round(scale * 10), /obj/item/clothing/accessory/poncho/green, VENDOR_ITEM_REGULAR),

code/game/objects/items/props/helmetgarb.dm

@@ -52,6 +52,15 @@
 	desc = "The standard M10 combat helmet is already water-resistant at depths of up to 10 meters. This makes the top potentially water-proof. At least it's something."
 	icon_state = "raincover"
 
+/obj/item/prop/helmetgarb/camocover
+	name = "camocover"
+	desc = "A cover that goes over the top of an M10 pattern helmet to camoflauge it without needing the use of paints."
+	icon_state = "camocover"
+
+/obj/item/prop/helmetgarb/camocover/Initialize(mapload, ...)
+	. = ..()
+	select_gamemode_skin(/obj/item/prop/helmetgarb/camocover)
+
 /obj/item/prop/helmetgarb/rabbitsfoot
 	name = "Rabbit's Foot"
 	desc = "Lucky for you, but not the rabbit, didn't really do it much good."

code/modules/clothing/head/helmet.dm

@@ -283,6 +283,7 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list(
 	/obj/item/prop/helmetgarb/cartridge = "cartridge",
 	/obj/item/prop/helmetgarb/prescription_bottle = "prescription_bottle",
 	/obj/item/prop/helmetgarb/raincover = "raincover",
+	/obj/item/prop/helmetgarb/camocover = "camocover",
 	/obj/item/prop/helmetgarb/rabbitsfoot = "rabbitsfoot",
 	/obj/item/prop/helmetgarb/rosary = "helmet_rosary", // This one was already in the game for some reason, but never had an object
 	/obj/item/prop/helmetgarb/lucky_feather = "lucky_feather",

colonialmarines.dme

@@ -677,6 +677,7 @@
 #include "code\datums\weather\weather_map_holder.dm"
 #include "code\datums\weather\weather_events\big_red.dm"
 #include "code\datums\weather\weather_events\faction_clash.dm"
+#include "code\datums\weather\weather_events\long.dm"
 #include "code\datums\weather\weather_events\lv522_chances_claim.dm"
 #include "code\datums\weather\weather_events\lv624.dm"
 #include "code\datums\weather\weather_events\new_varadero.dm"

html/changelogs/archive/2024-08.yml

@@ -104,3 +104,14 @@
   - rscadd: Added something
   private-tristan:
   - rscadd: ports TG strip menu
+2024-08-26:
+  sunofang:
+  - admin: Added infinite weather options.
+2024-08-27:
+  Max-023:
+  - rscadd: Helmet cover item, added to the squad prep vendor
+  - imageadd: Helmet cover sprites
+  Meatstuff882:
+  - rscadd: 'The utility vendor now has knives in it.
+
+      :cl:'