test runner

code/__DEFINES/__game.dm

@@ -41,6 +41,7 @@
 #define MAP_LV759_HYBRISA_PROSPERA "LV-759 Hybrisa Prospera" // Highpop Only
 #define MAP_NEW_VARADERO "New Varadero"//ice colony underground but as its own map
 #define MAP_TYRARGO_RIFT "Tyrargo Rift"
+#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"
@@ -428,6 +429,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

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"
@@ -297,6 +298,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"
@@ -370,6 +379,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_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"

code/__DEFINES/minimap.dm

@@ -80,6 +80,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
@@ -106,6 +107,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"

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"
@@ -290,6 +291,7 @@ DEFINE_BITFIELD(whitelist_status, list(
 #define FACTION_LIST_ERT_ALL list(FACTION_PMC, FACTION_WY_DEATHSQUAD, FACTION_WY, FACTION_CLF, FACTION_CONTRACTOR, FACTION_UPP, FACTION_FREELANCER, FACTION_MERCENARY, FACTION_DUTCH, FACTION_MILITARY_CASTE, FACTION_HEFA, FACTION_GLADIATOR, FACTION_PIRATE, FACTION_PIZZA, FACTION_SOUTO, FACTION_MARSHAL, FACTION_TWE, FACTION_HUNTED, FACTION_HUNTED_CLF, FACTION_HUNTED_UPP, FACTION_HUNTED_TWE, FACTION_HUNTED_MERC, FACTION_HUNTED_PMC, FACTION_HUNTED_MISC)
 #define FACTION_LIST_WY list(FACTION_PMC, FACTION_HUNTED_PMC, FACTION_WY_DEATHSQUAD, FACTION_WY)
 #define FACTION_LIST_HYPERDYNE list(FACTION_HYPERDYNE)
+#define FACTION_LIST_ALPHATECH list(FACTION_ALPHATECH)
 #define FACTION_LIST_UPP list(FACTION_UPP, FACTION_HUNTED_UPP)
 #define FACTION_LIST_CLF list(FACTION_CLF, FACTION_HUNTED_CLF)
 #define FACTION_LIST_TWE list(FACTION_TWE, FACTION_HUNTED_TWE, FACTION_IASF)

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"

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"

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"

code/__DEFINES/shuttles.dm

@@ -25,6 +25,7 @@
 #define SHUTTLE_HEIGHT_TOO_LARGE "height too large"
 #define SHUTTLE_ALREADY_DOCKED "we are already docked"
 #define SHUTTLE_SOMEONE_ELSE_DOCKED "someone else docked"
+#define SHUTTLE_DOCK_DISABLED "docking port unresponsive"
 
 //Launching Shuttles to CentCom - used for escape shuttle code
 #define NOLAUNCH -1

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/__HELPERS/unsorted.dm

@@ -850,7 +850,10 @@ GLOBAL_DATUM(action_purple_power_up, /image)
 	for(var/i in 1 to numticks)
 		sleep(delayfraction)
 		time_remaining -= delayfraction
-		if(!istype(busy_user) || has_target && !istype(target)) // Checks if busy_user exists and is not dead and if the target exists and is not destroyed
+		if(QDELETED(busy_user) || !istype(busy_user)) // Checks if busy_user exists
+			. = FALSE
+			break
+		if(has_target && (QDELETED(target) || !istype(target))) // Checks if the target exists and is not destroyed
 			. = FALSE
 			break
 		if(user_flags & INTERRUPT_DIFF_LOC && busy_user.loc != user_orig_loc || \

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)

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

code/controllers/subsystem/communications.dm

@@ -121,6 +121,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
@@ -133,6 +136,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
@@ -192,6 +196,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,
@@ -260,7 +265,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
@@ -321,6 +326,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",