DangerRevolution · DangerRevolution · Mar 6, 2026 · Mar 6, 2026 · Mar 6, 2026 · Mar 6, 2026
diff --git a/code/__DEFINES/__game.dm b/code/__DEFINES/__game.dm
@@ -42,6 +42,7 @@
 #define MAP_NEW_VARADERO "New Varadero"//ice colony underground but as its own map
 #define MAP_TYRARGO_RIFT "Tyrargo Rift"
 #define MAP_WHITE_ANTRE_RESEARCH_FACILITY "White Antre Research Facility"
+#define MAP_USASF_POINT_LOMA "USASF Point Loma"
 #define MAP_CHINOOK "Chinook 91 GSO" //admin level
 #define MAP_ROSTOCK "SSV Rostock" //UPP Warship
 #define MAP_HUNTERSHIP "Hunter Ship"
@@ -427,6 +428,9 @@
 #define WALL_UPP_BASE "uppwall"
 #define WALL_ANCIENT_BASE "ancient_stone"
 #define WALL_RUNEDSTONE "runedstone"
+#define WALL_NEW_VARADERO "new_varadero"
+#define WALL_NEW_VARADERO_REINFORCED "new_varadero_r"
+#define WALL_CONCRETE "concrete"
 
 //Defines for dropship weapon gimbals
 #define GIMBAL_LEFT -1

diff --git a/code/__DEFINES/job.dm b/code/__DEFINES/job.dm
@@ -15,6 +15,7 @@
 #define SQUAD_FORECON "FORECON"
 #define SQUAD_SOLAR "Solar Devils"
 #define SQUAD_ARMY "US Army"
+#define SQUAD_USASF "US Aerospace Forces"
 
 // Job name defines
 #define JOB_SQUAD_MARINE "Rifleman"
@@ -317,6 +318,14 @@ GLOBAL_LIST_INIT(job_command_roles, JOB_COMMAND_ROLES_LIST)
 #define JOB_HC_DEPUTY_DIRECTOR "HC Deputy Director"
 #define JOB_HC_DIRECTOR "HC Director"
 
+// -- ALPHA-TECH HARDWARE CORPORATION --//
+
+#define JOB_ALPHATECH_CL "Alpha-Tech Corporate Liaison"
+#define JOB_ALPHATECH_SCIENTIST "Alpha-Tech Corporate Scientist"
+#define JOB_ALPHATECH_RESEARCH_DIRECTOR "Alpha-Tech Research Director"
+#define JOB_ALPHATECH_CHIEF_ENGINEER "Alpha-Tech Chief Engineer"
+#define JOB_ALPHATECH_EMPLOYEE "Alpha-Tech Employee"
+
 //---- Contractors ----//
 #define JOB_CONTRACTOR "VAIPO Mercenary"
 #define JOB_CONTRACTOR_ST "VAIPO Mercenary"
@@ -391,6 +400,22 @@ GLOBAL_LIST_INIT(job_command_roles, JOB_COMMAND_ROLES_LIST)
 
 #define JOB_ARMY_LIST list(JOB_ARMY_TROOPER, JOB_ARMY_ENGI, JOB_ARMY_MEDIC, JOB_ARMY_MARKSMAN, JOB_ARMY_SMARTGUNNER, JOB_ARMY_SNCO, JOB_ARMY_CO, JOB_ARMY_TANK, JOB_ARMY_SYN)
 
+//--US Aerospace Forces (USASF)--//
+#define JOB_USASF_ENLISTED "USASF Enlisted"
+#define JOB_USASF_CREW "USASF Ground Crew"
+#define JOB_USASF_CHAPLAIN "USASF Chaplain"
+#define JOB_USASF_HANGARTECH "USASF Hangar Technician"
+#define JOB_USASF_CARGOTECH "USASF Cargo Technician"
+#define JOB_USASF_NURSE "USASF Medical Nurse"
+#define JOB_USASF_DOCTOR "USASF Doctor"
+#define JOB_USASF_PILOT "USASF Pilot"
+#define JOB_USASF_SECURITY_DEFENDER "USASF Security Police"
+#define JOB_USASF_OFFICER "USASF Officer"
+#define JOB_USASF_CO "USASF Aerospace Base Commander"
+#define JOB_USASF_SYNTHETIC "USASF Synthetic"
+
+#define JOB_USASF_LIST list(JOB_USASF_CREW, JOB_USASF_CHAPLAIN, JOB_USASF_HANGARTECH, JOB_USASF_CARGOTECH, JOB_USASF_NURSE, JOB_USASF_DOCTOR, JOB_USASF_PILOT, JOB_USASF_SECURITY_POLICE, JOB_USASF_OFFICER, JOB_USASF_CO, JOB_USASF_SYNTHETIC)
+
 
 //-------- UPP --------//
 #define JOB_UPP	"UPP Ryadovoy"

diff --git a/code/__DEFINES/minimap.dm b/code/__DEFINES/minimap.dm
@@ -84,6 +84,7 @@ GLOBAL_LIST_INIT(all_minimap_flags, bitfield2list(MINIMAP_FLAG_ALL))
 #define MINIMAP_SQUAD_FOXTROT "#fe7b2e"
 #define MINIMAP_SQUAD_SOF "#400000"
 #define MINIMAP_SQUAD_ARMY "#349c30"
+#define MINIMAP_SQUAD_USASF "#000080"
 #define MINIMAP_SQUAD_INTEL "#053818"
 
 //Prison
@@ -110,6 +111,9 @@ GLOBAL_LIST_INIT(all_minimap_flags, bitfield2list(MINIMAP_FLAG_ALL))
 #define MINIMAP_AREA_OOB "#3a3a3a"
 #define MINIMAP_AREA_COMMS "#00b3ffe7"
 
+// Point Loma
+#define MINIMAP_AREA_CARGO "#9B8F75"
+
 // Ceiling colors
 #define MINIMAP_CEILING_TIER_GLASS "#b2e6f19a"
 #define MINIMAP_CEILING_TIER_1 "#606060a2"

diff --git a/code/__DEFINES/mode.dm b/code/__DEFINES/mode.dm
@@ -259,6 +259,7 @@ DEFINE_BITFIELD(whitelist_status, list(
 #define FACTION_IASF "Imperial Armed Space Force"
 #define FACTION_PAP "People's Armed Police"
 #define FACTION_HYPERDYNE "Hyperdyne Corporation"
+#define FACTION_ALPHATECH "Alpha-Tech Hardware Corporation"
 #define FACTION_WY_DEATHSQUAD "WY Death Squad"
 #define FACTION_MERCENARY "Mercenary"
 #define FACTION_FREELANCER "Freelancer"
@@ -295,6 +296,7 @@ DEFINE_BITFIELD(whitelist_status, list(
 #define FACTION_LIST_UPP list(FACTION_UPP)
 #define FACTION_LIST_CLF list(FACTION_CLF)
 #define FACTION_LIST_TWE list(FACTION_TWE, FACTION_IASF)
+#define FACTION_LIST_ALPHATECH list(FACTION_ALPHATECH)
 #define FACTION_LIST_FREELANCER list(FACTION_FREELANCER)
 #define FACTION_LIST_CONTRACTOR list(FACTION_CONTRACTOR)
 #define FACTION_LIST_MERCENARY list(FACTION_MERCENARY)

diff --git a/code/__DEFINES/origins.dm b/code/__DEFINES/origins.dm
@@ -30,3 +30,9 @@
 
 // CMB
 #define ORIGIN_CMB "The Colonial Marshal Bureau"
+
+//Alpha_Tech
+#define ORIGIN_ALPHATECH "Alpha-Tech Hardware Corporation"
+
+//USASF
+#define ORIGIN_USASF "US Aerospace Forces"
diff --git a/code/__DEFINES/paygrade_defs/alphatech.dm b/code/__DEFINES/paygrade_defs/alphatech.dm
@@ -0,0 +1,8 @@
+// Alpha-Tech Hardware Corporation
+
+#define PAY_SHORT_ATHC1 "ATHC1"
+#define PAY_SHORT_ATHC2 "ATHC2"
+#define PAY_SHORT_ATHC3 "ATHC3"
+#define PAY_SHORT_ATHC_SCI "ATHC SCI"
+#define PAY_SHORT_ATHC_SCI_RD "ATHC RD"
+#define PAY_SHORT_ATHC_ENG_CE "ATHC CE"
diff --git a/code/__DEFINES/radio.dm b/code/__DEFINES/radio.dm
@@ -68,6 +68,10 @@
 
 #define RADIO_CHANNEL_HYPERDYNE "Hyperdyne"
 
+//AlphaTech Comms
+
+#define RADIO_CHANNEL_ALPHATECH "Alpha-Tech"
+
 //Listening Devices
 #define RADIO_CHANNEL_BUG_A "Listening Device A"
 #define RADIO_CHANNEL_BUG_B "Listening Device B"

diff --git a/code/__DEFINES/weather.dm b/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

diff --git a/code/_globalvars/lists/mapping_globals.dm b/code/_globalvars/lists/mapping_globals.dm
@@ -11,6 +11,7 @@ GLOBAL_LIST_EMPTY(xeno_spawns)
 GLOBAL_LIST_EMPTY(xeno_hive_spawns)
 GLOBAL_LIST_EMPTY(survivor_spawns_by_priority)
 GLOBAL_LIST_EMPTY(corpse_spawns)
+GLOBAL_LIST_EMPTY(special_corpse_spawns)
 
 GLOBAL_LIST_EMPTY(yautja_spawnpoints)
 GLOBAL_LIST_EMPTY(mainship_yautja_teleports)

diff --git a/code/_onclick/hud/yautja.dm b/code/_onclick/hud/yautja.dm
@@ -24,3 +24,6 @@
 		hud_used = new /datum/hud/human/yautja(src, ui_datum, ui_color, ui_alpha)
 	else
 		hud_used = new /datum/hud/human/yautja(src)
+
+/mob/living/carbon/human/yautja/dead
+	anchored = TRUE
diff --git a/code/controllers/subsystem/communications.dm b/code/controllers/subsystem/communications.dm
@@ -123,6 +123,9 @@ Radiochat range: 1441 to 1489 (most devices refuse to be tune to other frequency
 
 #define HDC_FREQ 1331
 
+//AlphaTech channels (1350-1399) - yes this takes half the number above but I don't care
+#define APHC_FREQ 1350
+
 //General Radio
 #define MIN_FREQ 1460 // ------------------------------------------------------
 #define PUB_FREQ 1461
@@ -135,6 +138,7 @@ Radiochat range: 1441 to 1489 (most devices refuse to be tune to other frequency
 #define CBRN_FREQ 1474
 #define FORECON_FREQ 1475
 #define ARMY_FREQ 1476
+#define USASF_FREQ 1477
 
 //Ship department channels
 #define SENTRY_FREQ 1480
@@ -196,6 +200,7 @@ GLOBAL_LIST_INIT(radiochannels, list(
 	SQUAD_MARINE_5 = ECHO_FREQ,
 	SQUAD_MARINE_CRYO = CRYO_FREQ,
 	SQUAD_SOF = SOF_FREQ,
+	SQUAD_USASF = USASF_FREQ,
 	SQUAD_CBRN = CBRN_FREQ,
 	SQUAD_FORECON = FORECON_FREQ,
 	SQUAD_SOLAR = SOF_FREQ,
@@ -264,7 +269,7 @@ GLOBAL_LIST_INIT(radiochannels, list(
 #define DEPT_FREQS list(COMM_FREQ, MED_FREQ, ENG_FREQ, SEC_FREQ, SENTRY_FREQ, ALPHA_FREQ, BRAVO_FREQ, CHARLIE_FREQ, DELTA_FREQ, ECHO_FREQ, CRYO_FREQ, REQ_FREQ, JTAC_FREQ, INTEL_FREQ, WY_FREQ)
 
 //Bonus frequencies for special survivor factions
-#define SURVIVOR_FREQS list(SOF_FREQ, ARMY_FREQ)
+#define SURVIVOR_FREQS list(SOF_FREQ, ARMY_FREQ, USASF_FREQ)
 
 #define TRANSMISSION_WIRE 0
 #define TRANSMISSION_RADIO 1
@@ -325,6 +330,7 @@ SUBSYSTEM_DEF(radio)
 		"[VAI_FREQ]" = "vairadio",
 		"[RMC_FREQ]" = "rmcradio",
 		"[ARMY_FREQ]" = "armyradio",
+		"[USASF_FREQ]" = "usasfradio",
 		"[CIA_FREQ]" = "ciaradio",
 		"[CMB_FREQ]" = "cmbradio",
 		"[ALPHA_FREQ]" = "alpharadio",

diff --git a/code/datums/factions/alphatech.dm b/code/datums/factions/alphatech.dm
@@ -0,0 +1,5 @@
+/datum/faction/alphatech
+	name = "Alpha-Tech Hardware Corporation"
+	faction_tag = FACTION_ALPHATECH
+
+// ToDO:
diff --git a/code/datums/factions/uscm.dm b/code/datums/factions/uscm.dm
@@ -71,6 +71,29 @@
 				marine_rk = "co_army"
 			if(JOB_ARMY_SYN)
 				marine_rk = "syn_army"
+			// USASF
+			if(JOB_USASF_CO)
+				marine_rk = "co_usasf"
+			if(JOB_USASF_PILOT)
+				marine_rk = "po_usasf"
+			if(JOB_USASF_OFFICER)
+				marine_rk = "so_usasf"
+			if(JOB_USASF_DOCTOR)
+				marine_rk = "doc_usasf"
+			if(JOB_USASF_NURSE)
+				marine_rk = "nurse_usasf"
+			if(JOB_USASF_SECURITY_DEFENDER)
+				marine_rk = "mp_usasf"
+			if(JOB_USASF_HANGARTECH)
+				marine_rk = "mt_usasf"
+			if(JOB_USASF_CARGOTECH)
+				marine_rk = "ct_usasf"
+			if(JOB_USASF_CHAPLAIN)
+				marine_rk = "chap_usasf"
+			if(JOB_USASF_CREW)
+				marine_rk = "crew_usasf"
+			if(JOB_USASF_SYNTHETIC)
+				marine_rk = "syn_usasf"
 		if(squad.squad_leader == current_human)
 			switch(squad.squad_type)
 				if("Squad")
@@ -151,6 +174,29 @@
 				marine_rk = "co_army"
 			if(JOB_ARMY_SYN)
 				marine_rk = "syn_army"
+			// USASF
+			if(JOB_USASF_CO)
+				marine_rk = "co_usasf"
+			if(JOB_USASF_PILOT)
+				marine_rk = "po_usasf"
+			if(JOB_USASF_OFFICER)
+				marine_rk = "so_usasf"
+			if(JOB_USASF_DOCTOR)
+				marine_rk = "doc_usasf"
+			if(JOB_USASF_NURSE)
+				marine_rk = "nurse_usasf"
+			if(JOB_USASF_SECURITY_DEFENDER)
+				marine_rk = "mp_usasf"
+			if(JOB_USASF_HANGARTECH)
+				marine_rk = "mt_usasf"
+			if(JOB_USASF_CARGOTECH)
+				marine_rk = "ct_usasf"
+			if(JOB_USASF_CHAPLAIN)
+				marine_rk = "chap_usasf"
+			if(JOB_USASF_CREW)
+				marine_rk = "crew_usasf"
+			if(JOB_USASF_SYNTHETIC)
+				marine_rk = "syn_usasf"
 			if(JOB_INTEL)
 				marine_rk = "io"
 			if(JOB_CAS_PILOT)

diff --git a/code/datums/origin/alphatech.dm b/code/datums/origin/alphatech.dm
@@ -0,0 +1,3 @@
+/datum/origin/alphatech
+	name = ORIGIN_ALPHATECH
+	desc = "You were born, and then decided to work for the Alpha-Tech Hardware Corporation"
diff --git a/code/datums/origin/uscm.dm b/code/datums/origin/uscm.dm
@@ -60,3 +60,8 @@
 /datum/origin/uscm/convict/smuggling
 	name = ORIGIN_USCM_CONVICT_SMUGGLING
 	desc = "Where you were born is irrelevant, as far as anyone is concerned you were convicted for smuggling (and likely some piracy) and offered a way out: the USCM."
+
+/datum/origin/uscm/usasf
+	name = ORIGIN_USASF
+	desc = "You were born, and then you enlisted in the USASF."
+
diff --git a/code/datums/paygrades/factions/alphatech/alpha_tech.dm b/code/datums/paygrades/factions/alphatech/alpha_tech.dm
@@ -0,0 +1,43 @@
+// ToDO:
+
+/datum/paygrade/alphatech_ranks
+	name = "AlphaTech Paygrade"
+	pay_multiplier = 1
+	default_faction = FACTION_ALPHATECH
+
+/datum/paygrade/alphatech_ranks/alphatech_1
+	name = "Employee"
+	prefix = "Employ."
+	paygrade = PAY_SHORT_ATHC1
+	ranking = 0
+
+/datum/paygrade/alphatech_ranks/alphatech_sci
+	name = "Scientist"
+	prefix = "Sci."
+	paygrade = PAY_SHORT_ATHC_SCI
+	ranking = 1
+
+
+/datum/paygrade/alphatech_ranks/alphatech_2
+	name = "Executive"
+	prefix = "Exec."
+	paygrade = PAY_SHORT_ATHC2
+	ranking = 1
+
+/datum/paygrade/alphatech_ranks/alphatech_3
+	name = "Overseer"
+	prefix = "Over."
+	paygrade = PAY_SHORT_ATHC3
+	ranking = 2
+
+/datum/paygrade/alphatech_ranks/alphatech_CE
+	name = "Chief Engineer"
+	prefix = "CE."
+	paygrade = PAY_SHORT_ATHC_ENG_CE
+	ranking = 3
+
+/datum/paygrade/alphatech_ranks/alphatech_RD
+	name = "Research Director"
+	prefix = "RD."
+	paygrade = PAY_SHORT_ATHC_SCI_RD
+	ranking = 3
diff --git a/code/datums/paygrades/factions/alphatech/security.dm b/code/datums/paygrades/factions/alphatech/security.dm
@@ -0,0 +1 @@
+// ToDO:
diff --git a/code/datums/skills/forecon.dm b/code/datums/skills/forecon.dm
@@ -181,3 +181,71 @@ MILITARY SURVIVORS
 		SKILL_JTAC = SKILL_JTAC_EXPERT,
 		SKILL_LEADERSHIP = SKILL_LEAD_EXPERT,
 	)
+
+/datum/skills/military/survivor/usasf
+	name = "USASF Ground Crew"
+	skills = list(
+		SKILL_ENGINEER = SKILL_ENGINEER_TRAINED,
+		SKILL_CONSTRUCTION = SKILL_ENGINEER_TRAINED,
+		SKILL_FIREMAN = SKILL_FIREMAN_TRAINED,
+		SKILL_FIREARMS = SKILL_FIREARMS_TRAINED,
+		SKILL_MEDICAL = SKILL_MEDICAL_TRAINED,
+		SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED,
+		SKILL_VEHICLE = SKILL_VEHICLE_SMALL,
+		SKILL_JTAC = SKILL_JTAC_BEGINNER,
+		SKILL_POWERLOADER = SKILL_POWERLOADER_MASTER,
+		SKILL_DOMESTIC = SKILL_DOMESTIC_MASTER,
+		SKILL_FIREMAN = SKILL_FIREMAN_TRAINED,
+	)
+
+/datum/skills/military/survivor/usasf/technician
+	name = "USASF Technician"
+	additional_skills = list (
+		SKILL_ENGINEER = SKILL_ENGINEER_ENGI,
+		SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI,
+		SKILL_JTAC = SKILL_JTAC_TRAINED,
+		SKILL_POWERLOADER = SKILL_POWERLOADER_MAX,
+	)
+
+/datum/skills/military/survivor/usasf/security
+	name = "USASF Security Defender"
+	additional_skills = list (
+		SKILL_JTAC = SKILL_JTAC_TRAINED,
+		SKILL_FIREARM = SKILL_FIREARMS_SKILLED,
+		SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED,
+		SKILL_CQC = SKILL_CQC_SKILLED,
+		SKILL_POLICE = SKILL_POLICE_SKILLED,
+		SKILL_FIREMAN = SKILL_FIREMAN_SKILLED,
+		SKILL_LEADERSHIP = SKILL_LEAD_SKILLED,
+	)
+
+/datum/skills/military/survivor/usasf/medical
+	name = "USASF Medical Staff"
+	additional_skills = list (
+		SKILL_SURGERY = SKILL_SURGERY_TRAINED,
+		SKILL_MEDICAL = SKILL_MEDICAL_DOCTOR,
+	)
+
+/datum/skills/military/survivor/usasf/officer
+	name = "USASF Officer"
+	additional_skills = list (
+		SKILL_JTAC = SKILL_JTAC_TRAINED,
+		SKILL_FIREARM = SKILL_FIREARMS_SKILLED,
+		SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED,
+		SKILL_CQC = SKILL_CQC_SKILLED,
+		SKILL_POLICE = SKILL_POLICE_SKILLED,
+		SKILL_FIREMAN = SKILL_FIREMAN_SKILLED,
+		SKILL_LEADERSHIP = SKILL_LEAD_EXPERT,
+		SKILL_LEAD = SKILL_LEAD_EXPERT,
+		SKILL_INTEL = SKILL_INTEL_TRAINED,
+	)
+
+/datum/skills/military/survivor/usasf/pilot
+	name = "USASF Pilot"
+	additional_skills = list (
+		SKILL_JTAC = SKILL_JTAC_EXPERT,
+		SKILL_FIREARM = SKILL_FIREARMS_SKILLED,
+		SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED,
+		SKILL_PILOT = SKILL_PILOT_EXPERT,
+		SKILL_INTEL = SKILL_INTEL_TRAINED,
+	)