more fixes

code/datums/weather/weather_map_holders/usasf_point_loma.dm

@@ -3,7 +3,6 @@
 
 
 	min_time_between_events = 15 MINUTES
-	no_weather_turf_icon_state = "strata_clearsky"
 
 	warn_time = 0 SECONDS //No time between warning and effect
 

code/modules/gear_presets/corpses.dm

@@ -1980,7 +1980,6 @@
 
 /datum/equipment_preset/corpse/point_loma/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

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

@@ -130,21 +130,21 @@
 		if (2)
 			new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/smartpistol/full, WEAR_WAIST)
 		if (3)
-			new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/wy/mod88, WEAR_L_HAND)
+			new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/wy/mod88, WEAR_WAIST)
 		if (4)
 			new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m44/full, WEAR_WAIST)
 		if (5)
-			new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/wy/vp78, WEAR_L_HAND)
+			new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/wy/vp78, WEAR_WAIST)
 		if (6)
-			new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/m1911, WEAR_L_HAND)
+			new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/m1911, WEAR_WAIST)
 		if (7)
 			new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m10/full, WEAR_WAIST)
 
 /datum/equipment_preset/survivor/usasf/proc/spawn_security_primary(mob/living/carbon/human/new_human)
 	var/spawn_security_primary = rand(1,2)
 	switch(spawn_security_primary)
 		if (1)
-			new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/shotgun/combat/riot, WEAR_R_HAND)
+			new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/shotgun/combat, WEAR_R_HAND)
 			new_human.equip_to_slot_or_del(new /obj/item/storage/belt/shotgun/full, WEAR_WAIST)
 		if (2)
 			new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m39/full, WEAR_WAIST)
@@ -215,7 +215,7 @@
 	paygrades = list(PAY_SHORT_NO1 = JOB_PLAYTIME_TIER_0, PAY_SHORT_NO2 = JOB_PLAYTIME_TIER_1)
 	flags = EQUIPMENT_PRESET_START_OF_ROUND
 
-/datum/equipment_preset/survivor/usasf/crew/chaplain/duty/load_gear(mob/living/carbon/human/new_human)
+/datum/equipment_preset/survivor/usasf/crew/duty/chaplain/load_gear(mob/living/carbon/human/new_human)
 	..()
 	spawn_pouch(new_human)
 	spawn_food(new_human)
@@ -307,6 +307,7 @@
 	spawn_pouch(new_human)
 	spawn_food(new_human)
 	spawn_usasf_weapon(new_human)
+	spawn_armour(new_human)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/surg_vest/equipped, WEAR_ACCESSORY)
 	new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular, WEAR_R_HAND)
 
@@ -401,11 +402,6 @@
 	..()
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/pilot, WEAR_BODY)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/pilot/novisor, WEAR_HEAD)
-	spawn_backpack(new_human)
-	spawn_armour(new_human)
-	spawn_pouch(new_human)
-	spawn_food(new_human)
-	spawn_usasf_weapon(new_human)
 
 /datum/equipment_preset/survivor/usasf/crew/officer/co
 	name = "Survivor - USASF Aerospace Base Commander"
@@ -417,13 +413,8 @@
 
 /datum/equipment_preset/survivor/usasf/crew/officer/co/load_gear(mob/living/carbon/human/new_human)
 	..()
-	spawn_security_primary(new_human)
-	spawn_backpack(new_human)
-	spawn_armour(new_human)
-	spawn_pouch(new_human)
-	spawn_food(new_human)
-	new_human.equip_to_slot_or_del (new /obj/item/device/binoculars/range/designator, WEAR_IN_BACK)
-	new_human.equip_if_possible(new /obj/item/storage/belt/gun/mateba/mtr6m/full, WEAR_WAIST)
+	new_human.equip_to_slot_or_del (new /obj/item/device/binoculars/range/designator, WEAR_R_HAND)
+	new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/mateba/mtr6m/full, WEAR_L_HAND)
 
 /datum/equipment_preset/synth/usasf // only thing that needs to be parented to something else
 	name = "Survivor - USASF Synthetic"

maps/map_files/USASF_Point_Loma/USASF_Point_Loma.dmm

@@ -31757,10 +31757,6 @@
 	},
 /turf/open/floor/corsat/squares,
 /area/point_loma/research_facility/hallway/east)
-"bMT" = (
-/obj/structure/machinery/power/apc/fully_broken/no_cell/west,
-/turf/open/floor/plating/burnt_platingdmg3,
-/area/point_loma/research_facility/dorms)
 "bMU" = (
 /turf/closed/wall/new_varadero/reinforced/hull,
 /area/point_loma/airbase/interior/cargo/lower)
@@ -41919,7 +41915,7 @@
 "cvo" = (
 /obj/structure/machinery/power/apc/no_power/east,
 /turf/open/floor/corsat/squares,
-/area/point_loma/research_facility/hallway/north)
+/area/point_loma/airbase/mining_colony/interior/engineering/communications/two)
 "cvp" = (
 /obj/structure/surface/table/woodentable/poor,
 /obj/effect/landmark/objective_landmark/science,
@@ -101681,7 +101677,7 @@ cdE
 cdE
 cdE
 cdE
-bMT
+bpi
 aFk
 aFk
 bqf