many fixes

code/__DEFINES/weather.dm

@@ -7,6 +7,8 @@
 #define PROB_WEATHER_LV624 30
 #define PROB_WEATHER_NEW_VARADERO 100
 #define PROB_WEATHER_LV759 100
+#define PROB_WEATHER_POINT_LOMA 100
+
 
 #define WEATHER_TYPE_NO_WEATHER 0
 #define WEATHER_TYPE_SNOW 1

code/datums/weather/weather_events/usasf_point_loma.dm

@@ -1,2 +1,17 @@
-/datum/weather_event/point_loma/heat/heatwave
-	name = "heat wave"
+/datum/weather_event/point_loma/heat
+	name = "High Heat"
+	display_name = "High Heat"
+	length = 15 MINUTES // 15 minutes long, happens every 15 minutes
+	cleaning = FALSE
+
+	effect_message = "It is unbelievably hot. You can't wait to get indoors."
+
+/datum/weather_event/point_loma/heat/heat_wave
+	name = "High Heat Extra"
+	display_name = "Heat Wave"
+	length = 15 MINUTES
+	cleaning = FALSE
+
+	effect_message = "It is unbelievably, unbearably, hot. You are drowning in your own sweat, and you start to feel a little lightheaded"
+	damage_per_tick = 1
+	damage_type = BURN

code/datums/weather/weather_map_holders/usasf_point_loma.dm

@@ -1,15 +1,20 @@
-/datum/weather_ss_map_holder/usasf_point_loma
-	name = "New Varadero Map Holder"
+/datum/weather_ss_map_holder/point_loma
+	name = "Point_Loma Map Holder"
+
 
 	min_time_between_events = 15 MINUTES
 	no_weather_turf_icon_state = "strata_clearsky"
 
+	warn_time = 0 SECONDS //No time between warning and effect
+
 	potential_weather_events = list(
-		/datum/weather_event/heatwave
+		/datum/weather_event/point_loma/heat,
+		/datum/weather_event/point_loma/heat/heat_wave,
 	)
 
-/datum/weather_ss_map_holder/usasf_point_loma/should_affect_area(area/A)
-	return !CEILING_IS_PROTECTED(A.ceiling, CEILING_METAL)
+/datum/weather_ss_map_holder/point_loma/should_affect_area(area/A)
+	return !CEILING_IS_PROTECTED(A.ceiling, CEILING_GLASS)
+
+/datum/weather_ss_map_holder/point_loma/should_start_event()
+	return prob(PROB_WEATHER_POINT_LOMA) //100%
 
-/datum/weather_ss_map_holder/usasf_point_loma/should_start_event()
-	return prob(PROB_WEATHER_NEW_VARADERO)

code/modules/gear_presets/corpses.dm

@@ -1933,9 +1933,10 @@
 	flags = EQUIPMENT_PRESET_STUB
 
 /datum/equipment_preset/corpse/point_loma/alphatech // ToDO:
-	name = "Survivor - Alpha-Tech Corporate Liaison"
-	job_title = JOB_ALPHATECH_CL
-	assignment = JOB_ALPHATECH_CL
+	name = "Corpse - AlphaTech"
+	job_title = JOB_ALPHATECH_EMPLOYEE
+	faction = FACTION_ALPHATECH
+	assignment = JOB_ALPHATECH_EMPLOYEE
 	languages = list(LANGUAGE_ENGLISH, LANGUAGE_CHINESE, LANGUAGE_JAPANESE, LANGUAGE_RUSSIAN)
 	skills = /datum/skills/civilian/survivor/manager // ToDO: Check what manager skills actually are
 	paygrades = list(PAY_SHORT_ATHC1 = JOB_PLAYTIME_TIER_0)
@@ -1978,7 +1979,21 @@
 	xenovictim = TRUE
 
 /datum/equipment_preset/corpse/point_loma/usasf
-	name = "Corpse - Burst - USASF"
+	name = "Corpse - USASF"
+	//job_title = JOB_SURVIVOR
+	skills = /datum/skills/military/survivor/usasf
+	languages = list(LANGUAGE_ENGLISH)
+	idtype = /obj/item/card/id/dogtag/usasf
+	faction = FACTION_SURVIVOR
+	faction_group = list(FACTION_MARINE, FACTION_SURVIVOR)
+	origin_override = ORIGIN_USASF
+	paygrades = list(PAY_SHORT_NE3 = JOB_PLAYTIME_TIER_0)
+	job_title  = JOB_USASF_CREW
+	access = list(
+		ACCESS_CIVILIAN_PUBLIC,
+		ACCESS_CIVILIAN_ENGINEERING,
+		ACCESS_CIVILIAN_LOGISTICS,
+	)
 
 /datum/equipment_preset/corpse/point_loma/usasf/load_gear(mob/living/carbon/human/new_human)
 	new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/sof/survivor_usasf, WEAR_L_EAR)
@@ -2037,7 +2052,6 @@
 			var/obj/item/clothing/accessory/ranks/navy/special/brassard/patch_SP = new()
 			new_human.equip_to_slot_or_del(uniform, WEAR_BODY)
 			uniform.attach_accessory(new_human,patch_SP)
-
 			new_human.equip_to_slot_or_del(new /obj/item/clothing/head/beret/navy, WEAR_HEAD)
 		if(4) // Pilot
 			new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/pilot, WEAR_BODY)

code/modules/gear_presets/survivors/usasf_point_loma/alpha_tech_survivors.dm

@@ -84,11 +84,10 @@
 	new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/alphatech, WEAR_L_EAR)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/latex(new_human), WEAR_HANDS)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/white(new_human), WEAR_FEET)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/labcoat), WEAR_JACKET)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/labcoat, WEAR_JACKET)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/science(new_human), WEAR_EYES)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/surgical(new_human), WEAR_FACE)
 	new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/tox(new_human), WEAR_BACK)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/green(new_human), WEAR_FEET)
 	new_human.equip_to_slot_or_del(new /obj/item/paper/research_notes/unique/tier_three(new_human), WEAR_IN_JACKET)
 	new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/medical/full(new_human), WEAR_R_STORE)
 

code/modules/gear_presets/survivors/usasf_point_loma/usasf_survivors.dm

@@ -435,7 +435,7 @@
 	flags = EQUIPMENT_PRESET_START_OF_ROUND
 
 /datum/equipment_preset/synth/usasf/load_gear(mob/living/carbon/human/preset_human)
-	preset_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/army/usasf, WEAR_BODY)
+	preset_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/navy, WEAR_BODY)
 	preset_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/droppouch(preset_human), WEAR_ACCESSORY)
 	preset_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/satchel/chestrig(preset_human), WEAR_BACK)
 	preset_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/light/synvest(preset_human), WEAR_JACKET)