surv presets v1 + corpse spawners v0.2

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/controllers/subsystem/communications.dm

@@ -120,6 +120,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
@@ -132,6 +135,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

code/game/objects/effects/landmarks/corpsespawner.dm

@@ -396,3 +396,19 @@
 /obj/effect/landmark/corpsespawner/tyrargo/us_army_medic/burst
 	name = "Corpse - Burst - US Army - Trooper"
 	equip_path = /datum/equipment_preset/corpse/tyrargo/us_army_medic/burst
+
+/obj/effect/landmark/corpsespawner/point_loma/alphatech
+	name = "Corpse - AlphaTech"
+	equip_path = /datum/equipment_preset/corpse/point_loma/alphatech
+
+/obj/effect/landmark/corpsespawner/point_loma/alphatech/burst
+	name = "Corpse - AlphaTech - Burst"
+	equip_path = /datum/equipment_preset/corpse/point_loma/alphatech/burst
+
+/obj/effect/landmark/corpsespawner/point_loma/usasf
+	name = "Corpse - USASF"
+	equip_path = /datum/equipment_preset/corpse/point_loma/usasf
+
+/obj/effect/landmark/corpsespawner/point_loma/usasf/burst
+	name = "Corpse - USASF - Burst"
+	equip_path = /datum/equipment_preset/corpse/point_loma/usasf/burst

code/game/objects/items/devices/radio/encryptionkey.dm

@@ -221,6 +221,10 @@
 	name = "\improper Army Radio Encryption Key"
 	channels = list(SQUAD_SOF = TRUE, RADIO_CHANNEL_COLONY = TRUE)
 
+/obj/item/device/encryptionkey/soc/usasf
+	name = "\improper USASF Radio Encryption Key"
+	channels = list(SQUAD_SOF = TRUE, RADIO_CHANNEL_COLONY = TRUE)
+
 //ERT, PMC
 
 /obj/item/device/encryptionkey/dutch
@@ -355,6 +359,11 @@
 	name = "\improper Colonial Marshal Bureau Radio Encryption Key"
 	icon_state = "cmb_key"
 	channels = list(RADIO_CHANNEL_COMMAND = TRUE, RADIO_CHANNEL_MEDSCI = TRUE, RADIO_CHANNEL_INTEL = TRUE, RADIO_CHANNEL_ALMAYER = TRUE, RADIO_CHANNEL_COLONY = TRUE)
+
+/obj/item/device/encryptionkey/alphatech
+	name = "\improper Alpha-Tech Hardware Corporation Encryption Key"
+	channels = list(RADIO_CHANNEL_COLONY = TRUE, RADIO_CHANNEL_ALPHATECH = TRUE)
+
 /// Used by the Mortar Crew in WO game mode - intently has no squad radio access
 /obj/item/device/encryptionkey/mortar
 	name = "\improper Mortar Crew Radio Encryption Key"

code/game/objects/items/devices/radio/headset.dm

@@ -1464,6 +1464,24 @@
 	has_hud = TRUE
 	hud_type = MOB_HUD_FACTION_MARINE
 
+/obj/item/device/radio/headset/almayer/sof/survivor_usasf
+	name = "US Aerospace Force headset"
+	desc = "Issued to Aerospacemen and women"
+	icon_state = "soc_headset"
+	frequency = USASF_FREQ
+	initial_keys = list(/obj/item/device/encryptionkey/soc/usasf)
+	volume = RADIO_VOLUME_QUIET
+	has_hud = TRUE
+	hud_type = MOB_HUD_FACTION_MARINE
+
+/obj/item/device/radio/headset/distress/alphatech
+	name = "Alpha-Tech Hardware Corporation Headset" // toDO: Fix!
+	desc = "A special headset used by Alpha-Tech Hardware employees, Channels are as follows: :g - public, :v - marine command, :n - engineering, :m - medbay, :u - requisitions, :j - JTAC, :t - intel."
+	frequency = APHC_FREQ
+	icon_state = "vai_headset"
+	initial_keys = list(/obj/item/device/encryptionkey/almayer, /obj/item/device/encryptionkey/alphatech)
+	has_hud = FALSE //toDO: Fix!
+
 /obj/item/device/radio/headset/almayer/mcom/vc
 	name = "marine vehicle crew radio headset"
 	desc = "Used by USCM vehicle crew, features a non-standard brace. Channels are as follows: :v - marine command, :n - engineering, :m - medbay, :u - requisitions."

code/modules/clothing/under/marine_uniform.dm

@@ -418,6 +418,11 @@
 		WEAR_BODY = 'icons/mob/humans/onmob/clothing/uniforms/uniforms_by_faction/UA.dmi',
 	)
 
+/obj/item/clothing/under/marine/army/usasf //parented to army for simplicity
+	name = "USASF Uniform"
+	desc = "Standard-issue USASF Ground Crew uniform. Lightly protected."
+	icon_state = "usasf_formal"
+
 /obj/item/clothing/under/marine/officer
 	name = "marine officer uniform"
 	desc = "Softer than silk. Lighter than feather. More protective than Kevlar. Fancier than a regular jumpsuit, too. It has shards of light Kevlar to help protect against stabbing weapons and bullets."

code/modules/gear_presets/corpses.dm

@@ -1926,3 +1926,22 @@
 /datum/equipment_preset/corpse/tyrargo/us_army_medic/burst
 	name = "Corpse - Burst - US Army - Medic"
 	xenovictim = TRUE
+
+// USASF Point Loma //
+
+/datum/equipment_preset/corpse/point_loma
+	flags = EQUIPMENT_PRESET_STUB
+
+/datum/equipment_preset/corpse/point_loma/alphatech // ToDO:
+	name  = "Corpse - AlphaTech"
+
+/datum/equipment_preset/corpse/point_loma/alphatech/burst
+	name = "Corpse - Burst - Alphatech"
+	xenovictim = TRUE
+
+/datum/equipment_preset/corpse/point_loma/usasf
+	name = "Corpse - Burst - USASF"
+
+/datum/equipment_preset/corpse/point_loma/usasf/burst
+	name = "Corpse - Burst - USASF"
+	xenovictim = TRUE

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

@@ -9,63 +9,124 @@
 	faction = FACTION_ALPHATECH
 	faction_group = list(FACTION_ALPHATECH, FACTION_SURVIVOR)
 	origin_override = ORIGIN_ALPHATECH
+	flags = EQUIPMENT_PRESET_STUB
 
 	access = list(ACCESS_CIVILIAN_PUBLIC)
 
 	minimap_icon = "surv"
 	minimap_background = "background_civilian"
 	survivor_variant = CORPORATE_SURVIVOR
 
+/datum/equipment_preset/survivor/alphatech/load_gear(mob/living/carbon/human/new_human)
+	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/shoes/black, WEAR_FEET)
+
 /datum/equipment_preset/survivor/alphatech/corporate
-	name = "Alpha-Tech Corporate Liaison"
+	name = "Survivor - Alpha-Tech Corporate Liaison"
 	job_title = JOB_ALPHATECH_CL
 	assignment = JOB_ALPHATECH_CL
 	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, PAY_SHORT_ATHC2 = JOB_PLAYTIME_TIER_1, PAY_SHORT_ATHC3 = JOB_PLAYTIME_TIER_2)
+	flags = EQUIPMENT_PRESET_START_OF_ROUND
 
+/datum/equipment_preset/survivor/alphatech/corporate/load_gear(mob/living/carbon/human/new_human)
+	..()
+	var/random_clothing = rand(1,6)
+	var/random_suit = rand (1,2)
+	switch(random_clothing)
+		if (1)
+			new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/black, WEAR_BODY)
+		if (2)
+			new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/blue, WEAR_BODY)
+		if (3)
+			new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/brown, WEAR_BODY)
+		if (4)
+			new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/corporate_formal, WEAR_BODY)
+		if (5)
+			new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/field, WEAR_BODY)
+		if (6)
+			new_human.equip_to_slot_or_del(new /obj/item/clothing/under/sl_suit, WEAR_BODY)
+	switch(random_suit)
+		if (1)
+			new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/bomber, WEAR_JACKET)
+		if (2)
+			new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/jacket/marine/vest, WEAR_JACKET)
+		if (3)
+			new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/bomber, WEAR_JACKET)
+		if (4)
+			new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/windbreaker/windbreaker_brown, WEAR_JACKET)
+	new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/lockable(new_human), WEAR_BACK)
 
+// /datum/equipment_preset/survivor/alphatech/chief_engineer
+// 	name = "Alpha-Tech Mining Colony Chief Engineer"
+// 	job_title = JOB_ALPHATECH_CHIEF_ENGINEER
+// 	assignment = JOB_ALPHATECH_CHIEF_ENGINEER
+// 	languages = list(LANGUAGE_ENGLISH, LANGUAGE_CHINESE)
+// 	paygrades = list(PAY_SHORT_ATHC_ENG_CE = JOB_PLAYTIME_TIER_0)
+// 	skills = /datum/skills/civilian/survivor/engineer // ToDO: Consider making this a CO-like Civ Engineer
+// 	survivor_variant = ENGINEERING_SURVIVOR
 
-/datum/equipment_preset/survivor/alphatech/corporate/chief_engineer
-	name = "Alpha-Tech Mining Colony Chief Engineer"
-	job_title = JOB_ALPHATECH_CHIEF_ENGINEER
-	assignment = JOB_ALPHATECH_CHIEF_ENGINEER
-	languages = list(LANGUAGE_ENGLISH, LANGUAGE_CHINESE)
-	paygrades = list(PAY_SHORT_ATHC_ENG_CE = JOB_PLAYTIME_TIER_0)
-	skills = /datum/skills/civilian/survivor/engineer // ToDO: Consider making this a CO-like Civ Engineer
-	survivor_variant = ENGINEERING_SURVIVOR
 
 /datum/equipment_preset/survivor/alphatech/scientist
-	name = "Alpha-Tech Scientist"
+	name = "Survivor - Alpha-Tech Scientist"
 	job_title = JOB_ALPHATECH_SCIENTIST
 	assignment = JOB_ALPHATECH_SCIENTIST
 	languages = list(LANGUAGE_CHINESE)
 	skills = /datum/skills/civilian/survivor/scientist
 	paygrades = list(PAY_SHORT_CCMOA = JOB_PLAYTIME_TIER_0, PAY_SHORT_CCMOC = JOB_PLAYTIME_TIER_1)
 	survivor_variant = SCIENTIST_SURVIVOR
+	flags = EQUIPMENT_PRESET_START_OF_ROUND
 
-/datum/equipment_preset/survivor/alphatech/scientist/research_director
-	name = "Alpha-Tech Research Director"
-	job_title = JOB_ALPHATECH_RESEARCH_DIRECTOR // ToDO: Consider making this a CO-like Civ role
-	assignment = JOB_ALPHATECH_RESEARCH_DIRECTOR
-	paygrades = list(PAY_SHORT_ATHC_SCI_RD = JOB_PLAYTIME_TIER_0)
-	languages = list(LANGUAGE_CHINESE, LANGUAGE_ENGLISH)
-	survivor_variant = SCIENTIST_SURVIVOR
+/datum/equipment_preset/survivor/alphatech/scientist/load_gear(mob/living/carbon/human/new_human) // ToDO: Uncopypaste this
+	..()
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/virologist(new_human), WEAR_BODY)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/labcoat/virologist(new_human), WEAR_JACKET)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/green(new_human), WEAR_HANDS)
+	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/clothing/glasses/science(new_human), WEAR_EYES)
+	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)
+
+// /datum/equipment_preset/survivor/alphatech/scientist/research_director
+// 	name = "Alpha-Tech Research Director"
+// 	job_title = JOB_ALPHATECH_RESEARCH_DIRECTOR // ToDO: Consider making this a CO-like Civ role
+// 	assignment = JOB_ALPHATECH_RESEARCH_DIRECTOR
+// 	paygrades = list(PAY_SHORT_ATHC_SCI_RD = JOB_PLAYTIME_TIER_0)
+// 	languages = list(LANGUAGE_CHINESE, LANGUAGE_ENGLISH)
+// 	survivor_variant = SCIENTIST_SURVIVOR
 
 /datum/equipment_preset/survivor/alphatech/miner
-	name = "Alpha-Tech Mining Contractor"
+	name = "Survivor - Alpha-Tech Mining Contractor"
 	job_title = JOB_ALPHATECH_EMPLOYEE
 	assignment = JOB_ALPHATECH_EMPLOYEE
 	languages = list(LANGUAGE_CHINESE)
 	skills = /datum/skills/civilian/survivor/miner // ToDO: Make this an Engineer-type
 	paygrades = list(PAY_SHORT_CIV = JOB_PLAYTIME_TIER_0)
 	survivor_variant = CIVILIAN_SURVIVOR
+	flags = EQUIPMENT_PRESET_START_OF_ROUND
 
-/datum/equipment_preset/survivor/alphatech/off_duty
-	name = "Alpha-Tech Hardware Corporation Employee"
-	job_title = JOB_ALPHATECH_EMPLOYEE
-	assignment = JOB_ALPHATECH_EMPLOYEE
-	languages = list(LANGUAGE_CHINESE)
-	skills = /datum/skills/military/survivor/usasf/pilot
-	paygrades = list(PAY_SHORT_CIV = JOB_PLAYTIME_TIER_0)
-	survivor_variant = CIVILIAN_SURVIVOR
+/datum/equipment_preset/survivor/alphatech/miner/load_gear(mob/living/carbon/human/new_human) // TODO: Uncopypaste this
+	..()
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/blue(new_human), WEAR_BODY)
+	new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/eng(new_human), WEAR_BACK)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/hazardvest/yellow(new_human), WEAR_JACKET)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots(new_human), WEAR_FEET)
+	new_human.equip_to_slot_or_del(new /obj/item/tool/pickaxe(new_human), WEAR_R_HAND)
+	new_human.equip_to_slot_or_del(new /obj/item/device/flashlight/lantern(new_human), WEAR_IN_BACK)
+	new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/tools/full(new_human), WEAR_R_STORE)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/hardhat/orange(new_human), WEAR_HEAD)
+
+// /datum/equipment_preset/survivor/alphatech/off_duty //TODO: Find something to do with this...
+// 	name = "Alpha-Tech Hardware Corporation Employee"
+// 	job_title = JOB_ALPHATECH_EMPLOYEE
+// 	assignment = JOB_ALPHATECH_EMPLOYEE
+// 	languages = list(LANGUAGE_CHINESE)
+// 	skills = /datum/skills/military/survivor/usasf/pilot
+// 	paygrades = list(PAY_SHORT_CIV = JOB_PLAYTIME_TIER_0)
+// 	survivor_variant = CIVILIAN_SURVIVOR
+
+// /datum/equipment_preset/survivor/alphatech/off_duty/load_gear(mob/living/carbon/human/new_human)
+// 	..()