khizriel update

mods/_fd/_maps/khizriel/code/khizriel_areas.dm

@@ -1,68 +1,85 @@
 /area/ship/khizriel
 	name = "\improper Khizriel"
 	icon_state = "bridge"
+	req_access = list(access_syndicate)
 	area_flags = AREA_FLAG_RAD_SHIELDED | AREA_FLAG_ION_SHIELDED
 
 /area/ship/khizriel/generator
 	name = "\improper Khizriel - Generator Room"
 	icon_state = "engineering_workshop"
+	req_access = list(access_syndicate)
 
 /area/ship/khizriel/kitchen
 	name = "\improper Khizriel - Kitchen"
 	icon_state = "kitchen"
+	req_access = list(access_syndicate)
 
 /area/ship/khizriel/eng
 	name = "\improper Khizriel - Engineering"
 	icon_state = "engineering"
+	req_access = list(access_syndicate)
 
 /area/ship/khizriel/armory
 	name = "\improper Khizriel - Armory"
 	icon_state = "brig"
+	req_access = list(access_syndicate)
 
 /area/ship/khizriel/equip
 	name = "\improper Khizriel - Equipment Room"
 	icon_state = "brig"
+	req_access = list(access_syndicate)
 
 /area/ship/khizriel/ammo_r
 	name = "\improper Khizriel - Ammunition Laying Right Wing"
 	icon_state = "hall"
+	req_access = list(access_syndicate)
 
 /area/ship/khizriel/bar
 	name = "\improper Khizriel - Bar"
 	icon_state = "bar"
+	req_access = list(access_syndicate)
 
 /area/ship/khizriel/ammo_l
 	name = "\improper Khizriel - Ammunition Laying Left Wing"
 	icon_state = "hall"
+	req_access = list(access_syndicate)
 
 /area/ship/khizriel/bridge
 	name = "\improper Khizriel - Bridge"
 	icon_state = "bridge"
+	req_access = list(access_syndicate)
 
 /area/ship/khizriel/warehouse_r
 	name = "\improper Khizriel - Warehouse Right Wing"
 	icon_state = "warehouse"
+	req_access = list(access_syndicate)
 
 /area/ship/khizriel/warehouse_l
 	name = "\improper Khizriel - Warehouse Left Wing"
 	icon_state = "warehouse"
+	req_access = list(access_syndicate)
 
 /area/ship/khizriel/living
 	name = "\improper Khizriel - Living Quarters"
 	icon_state = "crew_quarters"
+	req_access = list(access_syndicate)
 
 /area/ship/khizriel/med
 	name = "\improper Khizriel - Medbay"
 	icon_state = "medbay2"
+	req_access = list(access_syndicate)
 
 /area/ship/khizriel/cryo
 	name = "\improper Khizriel - Cryo Storage"
 	icon_state = "cryo"
+	req_access = list(access_syndicate)
 
 /area/ship/khizriel/gun
-	name = "\improper Khizriel - Gunnery"
+	name = "\improper Khizriel - Right Wing Gunnery"
 	icon_state = "ofd"
+	req_access = list(access_syndicate)
 
 /area/ship/khizriel/harpoon
-	name = "\improper Khizriel - Harpoon"
+	name = "\improper Khizriel - Left Wing Gunnery"
 	icon_state = "ofd"
+	req_access = list(access_syndicate)

mods/_fd/_maps/khizriel/code/khizriel_jobs.dm

@@ -1,35 +1,75 @@
 // Submap datum and archetype.
 /singleton/submap_archetype/khizriel
-	descriptor = "Suspicious looking private vessel"
+	descriptor = "IPV Khizriel"
 	map = "Khizriel"
-	crew_jobs = list(/datum/job/submap/khizriel)
+	crew_jobs = list(/datum/job/submap/khizriel/crewman, /datum/job/submap/khizriel/cyborg)
 
-/datum/job/submap/khizriel
-	title = "Khizriel's crew"
-	total_positions = 6
-	spawn_positions = 6
+/obj/item/card/id/syndicate_command/khizriel
+	name = "Khizriel Crewman"
+	desc = ""
+	registered_name = "Khizriel"
+	assignment = "Khizriel Interceptor"
+	access = list(access_syndicate)
+	color = COLOR_RED_GRAY
+	detail_color = COLOR_GRAY40
+
+/datum/job/submap/khizriel/crewman
+	title = "Khizriel Crewman"
+	total_positions = 12
+	spawn_positions = 12
 	supervisors = "You obey orders of your Captain."
 	info = "You are a lawless crew member of pirate's Vessel - Khizriel. You have no mercy, no remorse or fear. Only greed."
-	whitelisted_species = list(SPECIES_HUMAN,SPECIES_IPC,SPECIES_SPACER,SPECIES_GRAVWORLDER,SPECIES_VATGROWN,SPECIES_TRITONIAN,SPECIES_RESOMI)
+	whitelisted_species = list(SPECIES_HUMAN,SPECIES_IPC,SPECIES_SPACER,SPECIES_GRAVWORLDER,SPECIES_VATGROWN,SPECIES_TRITONIAN)
 	is_semi_antagonist = TRUE
+	access = list(access_syndicate)
 	outfit_type = /singleton/hierarchy/outfit/job/khizriel
 	loadout_allowed = TRUE
+	skill_points = 26
 	min_skill = list(
 		SKILL_EVA = SKILL_TRAINED,
 		SKILL_HAULING = SKILL_BASIC,
 		SKILL_COMBAT = SKILL_BASIC,
-		SKILL_WEAPONS = SKILL_BASIC,
+		SKILL_WEAPONS = SKILL_TRAINED,
 		SKILL_PILOT = SKILL_BASIC
 	)
 
-/singleton/hierarchy/outfit/job/khizriel
+/singleton/hierarchy/outfit/job/khizriel/crewman
 	name = "Khizriel Crewman"
 	uniform = /obj/item/clothing/under/color/black
 	l_ear = null
 	l_pocket = /obj/item/device/flashlight/maglight
+	id_slot = /obj/item/card/id/syndicate_command/khizriel
 	shoes = /obj/item/clothing/shoes/black
 	pda_type = /obj/item/modular_computer/pda
 
-/obj/submap_landmark/spawnpoint/khizriel
-	name = "Khizriel's crew"
+/obj/submap_landmark/spawnpoint/khizriel/crewman
+	name = "Khizriel Crewman"
+	movable_flags = MOVABLE_FLAG_EFFECTMOVE
+
+/datum/job/submap/khizriel/cyborg
+	title = "Khizriel Bot"
+	total_positions = 1
+	spawn_positions = 1
+	supervisors = "Your laws and your crew."
+	minimal_player_age = 7
+	account_allowed = 0
+	economic_power = 0
+	loadout_allowed = FALSE
+	outfit_type = /singleton/hierarchy/outfit/job/silicon/cyborg
+	hud_icon = "hudblank"
+	skill_points = 0
+
+/datum/job/submap/khizriel/cyborg/handle_variant_join(mob/living/carbon/human/H, alt_title)
+	return H && H.Robotize(SSrobots.get_mob_type_by_title(alt_title || title))
+
+/datum/job/submap/khizriel/cyborg/equip(mob/living/carbon/human/H)
+	return !!H
+
+/datum/job/submap/khizriel/cyborg/New(datum/submap/_owner, abstract_job = FALSE)
+	..()
+	alt_titles = SSrobots.robot_alt_titles.Copy()
+	alt_titles -= title // So the unit test doesn't flip out if a mob or mmi type is declared for our main title.
+
+/obj/submap_landmark/spawnpoint/khizriel/cyborg
+	name = "Khizriel Bot"
 	movable_flags = MOVABLE_FLAG_EFFECTMOVE

mods/_fd/_maps/khizriel/code/khizriel_shuttles.dm

@@ -1,7 +1,7 @@
 /obj/overmap/visitable/ship/landable/khizriel
 	name = "IPV Khizriel"
 	shuttle = "Khizriel"
-	desc = "Sensor array is detecting a small-size vessel, broadcasting unknown registration codes \"██████-0x000x-Z-███\"."
+	desc = "Sensor array is detecting a small-size vessel, broadcasting unknown registration codes \"12JJJ-0x000x-Z-███\"."
 	max_speed = 1/(2 SECONDS)
 	burn_delay = 1 SECONDS
 	vessel_mass = 13400
@@ -27,7 +27,7 @@
 /datum/shuttle/autodock/overmap/khizriel
 	name = "Khizriel"
 	warmup_time = 10
-	move_time = 25
+	move_time = 20
 	range = 1
 	shuttle_area = list(/area/ship/khizriel/generator, /area/ship/khizriel/kitchen, /area/ship/khizriel/eng, /area/ship/khizriel/armory, /area/ship/khizriel/equip, /area/ship/khizriel/ammo_r, /area/ship/khizriel/bar, /area/ship/khizriel/ammo_l, /area/ship/khizriel/bridge, /area/ship/khizriel/warehouse_r, /area/ship/khizriel/warehouse_l, /area/ship/khizriel/living, /area/ship/khizriel/med, /area/ship/khizriel/cryo, /area/ship/khizriel/gun, /area/ship/khizriel/harpoon)
 	defer_initialisation = TRUE