Fixes some Ascent bugs (#2727)

mods/_maps/ascent_caulship/code/ascent_caulship_jobs.dm

@@ -108,8 +108,8 @@
 	if(!cutter.gyne_name)
 		cutter.gyne_name = TYPE_PROC_REF(/singleton/cultural_info/culture/ascent, create_gyne_name)
 
-/*	if(set_species_on_join)
-		H.set_species(set_species_on_join)*/
+	if(set_species_on_join)
+		H.set_species(set_species_on_join)
 
 	switch(H.species.name)
 		if(SPECIES_MANTID_GYNE)
@@ -129,6 +129,17 @@
 		H.mind.name = H.real_name
 	return H
 
+/datum/job/submap/ascent/is_position_available()
+	. = ..()
+	if(. && requires_supervisor)
+		for(var/mob/M in GLOB.player_list)
+			if(!M.client || !M.mind || !M.mind.assigned_job || M.mind.assigned_job.title != requires_supervisor)
+				continue
+			var/datum/job/submap/ascent/ascent_job = M.mind.assigned_job
+			if(istype(ascent_job) && ascent_job.owner == owner)
+				return TRUE
+		return FALSE
+
 /datum/job/submap/ascent/alate
 	title = "Ascent Alate"
 	total_positions = 2
@@ -159,7 +170,8 @@
 	supervisors = "the Serpentid Queen and the Gyne"
 	total_positions = 2
 	info = "You are a Monarch Serpentid Worker serving as an attendant to your Queen on this vessel. Serve her however she requires."
-	whitelisted_species = list(SPECIES_MONARCH_WORKER)
+	set_species_on_join = SPECIES_MONARCH_WORKER
+	whitelisted_species = list(SPECIES_NABBER, SPECIES_MANTID_ALATE)
 	outfit_type = /singleton/hierarchy/outfit/job/ascent/worker
 	min_skill = list(SKILL_EVA = SKILL_TRAINED,
 					SKILL_HAULING = SKILL_TRAINED,
@@ -176,7 +188,8 @@
 	total_positions = 1
 	info = "You are a Monarch Serpentid Queen living on an independant Ascent vessel. Assist the Gyne in her duties and tend to your Workers."
 	outfit_type = /singleton/hierarchy/outfit/job/ascent/queen
-	whitelisted_species = list(SPECIES_MONARCH_QUEEN)
+	set_species_on_join = SPECIES_MONARCH_QUEEN
+	whitelisted_species = list(SPECIES_NABBER, SPECIES_MANTID_GYNE)
 	min_skill = list(SKILL_EVA = SKILL_TRAINED,
 					SKILL_HAULING = SKILL_TRAINED,
 					SKILL_COMBAT = SKILL_TRAINED,

mods/_maps/ascent_caulship/code/ascent_caulship_props.dm

@@ -1,7 +1,7 @@
 /obj/item/kharmaan_egg
 	name = "crystalline egg"
 	desc = "A lumpy, gooey egg with a thin crystalline exterior."
-	icon = 'mods/ascent/icons/obj/egg.dmi'
+	icon = 'mods/ascent/icons/obj/items/egg.dmi'
 	icon_state = "egg_single"
 	var/moved = FALSE
 

mods/_maps/ascent_seedship/code/ascent_seedship_jobs.dm

@@ -112,8 +112,8 @@
 	if(!cutter.gyne_name)
 		cutter.gyne_name = TYPE_PROC_REF(/singleton/cultural_info/culture/ascent, create_gyne_name)
 
-/*	if(set_species_on_join)
-		H.set_species(set_species_on_join)*/
+	if(set_species_on_join)
+		H.set_species(set_species_on_join)
 
 	switch(H.species.name)
 		if(SPECIES_MANTID_GYNE)
@@ -133,6 +133,17 @@
 		H.mind.name = H.real_name
 	return H
 
+/datum/job/submap/ascent_inf/is_position_available()
+	. = ..()
+	if(. && requires_supervisor)
+		for(var/mob/M in GLOB.player_list)
+			if(!M.client || !M.mind || !M.mind.assigned_job || M.mind.assigned_job.title != requires_supervisor)
+				continue
+			var/datum/job/submap/ascent_inf/ascent_job = M.mind.assigned_job
+			if(istype(ascent_job) && ascent_job.owner == owner)
+				return TRUE
+		return FALSE
+
 /datum/job/submap/ascent_inf/alate
 	title = "Ascent alate"
 	total_positions = 3
@@ -161,7 +172,8 @@
 	supervisors = "вашей Королевой"
 	total_positions = 3
 	info = "You are a Monarch Serpentid Worker serving as an attendant to your Queen on this vessel. Serve her however she requires."
-	whitelisted_species = list(SPECIES_MONARCH_WORKER)
+	whitelisted_species = list(SPECIES_NABBER, SPECIES_MANTID_ALATE)
+	set_species_on_join = SPECIES_MONARCH_WORKER
 	outfit_type = /singleton/hierarchy/outfit/job/ascent/worker
 	min_skill = list(SKILL_EVA = SKILL_TRAINED,
 					SKILL_HAULING = SKILL_TRAINED,
@@ -175,7 +187,8 @@
 	supervisors = "другими Королевами и Гииной"
 	total_positions = 1
 	info = "You are a Monarch Serpentid Queen living on an independant Ascent vessel. Assist the Gyne in her duties and tend to your Workers."
-	whitelisted_species = list(SPECIES_MONARCH_QUEEN)
+	whitelisted_species = list(SPECIES_NABBER, SPECIES_MANTID_GYNE)
+	set_species_on_join = SPECIES_MONARCH_QUEEN
 	min_skill = list(SKILL_EVA = SKILL_TRAINED,
 					SKILL_HAULING = SKILL_TRAINED,
 					SKILL_COMBAT = SKILL_TRAINED,

mods/ascent/code/ascent_atoms.dm

@@ -4,11 +4,15 @@ MANTIDIFY(/obj/item/storage/bag/trash/purple,    "sample collection carrier", "m
 MANTIDIFY(/obj/structure/bed/chair/padded/purple,"mantid nest",               "resting place")
 MANTIDIFY(/obj/item/pickaxe/diamonddrill,        "lithobliterator",           "drilling")
 MANTIDIFY(/obj/item/tank/jetpack/carbondioxide,  "maneuvering pack",          "propulsion")
+MANTIDIFY(/obj/item/device/scanner/plant, "gazefloranotator", 				  "plant scanning")
+MANTIDIFY(/obj/item/device/scanner/xenobio, "xenonascerator", 				  "xenolife scanning")
+MANTIDIFY(/obj/item/device/scanner/health, "healthoseefer", 				  "medicine")
+MANTIDIFY(/obj/item/reagent_containers/spray/sterilizine, "cleaning agent sprayer", "sterilizing")
 
 /obj/structure/bed/chair/padded/purple/ascent
 	icon_state = "nest_chair"
 	base_icon = "nest_chair"
-	icon = 'mods/ascent/icons/misc/ascent_doodads.dmi'
+	icon = 'mods/ascent/icons/obj/ascent_doodads.dmi'
 	buckle_pixel_shift = list(0,5,0)
 	pixel_z = 0
 
@@ -37,7 +41,7 @@ MANTIDIFY(/obj/item/tank/jetpack/carbondioxide,  "maneuvering pack",          "p
 /obj/item/cell/mantid
 	name = "mantid microfusion plant"
 	desc = "An impossibly tiny fusion reactor of mantid design."
-	icon = 'mods/ascent/icons/items/ascent.dmi'
+	icon = 'mods/ascent/icons/obj/items/ascent.dmi'
 	icon_state = "plant"
 	maxcharge = 1500
 	w_class = ITEM_SIZE_NORMAL

mods/ascent/code/ascent_doodads.dm

@@ -17,47 +17,47 @@
 /obj/item/mop/advanced/ascent
 	name = "deck detritus delaminator"
 	desc = "An alien staff with spongy filaments on one end."
-	icon = 'mods/ascent/icons/misc/ascent_doodads.dmi'
+	icon = 'mods/ascent/icons/obj/ascent_doodads.dmi'
 	item_state = "advmop"
 
 /obj/item/reagent_containers/glass/bucket/ascent
 	name = "portable liquid cleaning agent carrier"
 	desc = "An alien container of some sort."
-	icon = 'mods/ascent/icons/misc/ascent_doodads.dmi'
+	icon = 'mods/ascent/icons/obj/ascent_doodads.dmi'
 	item_state = "bucket"
 
 /obj/structure/mopbucket/ascent
 	name = "portable liquid cleaning agent holder"
 	desc = "An alien container of some sort."
-	icon = 'mods/ascent/icons/misc/ascent_doodads.dmi'
+	icon = 'mods/ascent/icons/obj/ascent_doodads.dmi'
 
 /obj/item/material/knife/kitchen/cleaver/ascent
 	name = "xenobiological flenser"
 	desc = "A mindboggingly alien tool for flensing flesh."
-	icon = 'mods/ascent/icons/misc/ascent_doodads.dmi'
+	icon = 'mods/ascent/icons/obj/ascent_doodads.dmi'
 	icon_state = "xenobutch"
 
 	slot_flags = SLOT_DENYPOCKET | SLOT_HOLSTER | SLOT_BELT
 
 /obj/structure/closet/crate/freezer/meat/ascent
 	name = "cryogenic stasis unit"
 	desc = "A bizarre alien stasis unit."
-	icon = 'mods/ascent/icons/misc/ascent_doodads.dmi'
+	icon = 'mods/ascent/icons/obj/ascent_doodads.dmi'
 	closet_appearance = /singleton/closet_appearance/crate/freezer/ascent
 
 /singleton/closet_appearance/crate/freezer/ascent
 	color = COLOR_PURPLE
-	base_icon = 'mods/ascent/icons/misc/ascent_doodads.dmi'
+	base_icon = 'mods/ascent/icons/obj/ascent_doodads.dmi'
 
 /obj/item/reagent_containers/food/drinks/cans/waterbottle/ascent
 	name = "hydration cylinder"
 	desc = "An alien portable long term storage device for potable water."
-	icon = 'mods/ascent/icons/misc/ascent_doodads.dmi'
+	icon = 'mods/ascent/icons/obj/ascent_doodads.dmi'
 
 /obj/item/reagent_containers/food/snacks/hydration
 	name = "hydration ration"
 	desc = "Approximately ten units of liquid hydration in a edible membrane. Unflavored."
-	icon = 'mods/ascent/icons/misc/ascent_doodads.dmi'
+	icon = 'mods/ascent/icons/obj/ascent_doodads.dmi'
 	icon_state = "h2o_ration"
 	bitesize = 10
 /obj/item/reagent_containers/food/snacks/hydration/Initialize()
@@ -67,24 +67,24 @@
 /obj/item/storage/box/water/ascent
 	name = "box of hydration cylinders"
 	desc = "A box full of bottled water."
-	icon = 'mods/ascent/icons/misc/ascent_doodads.dmi'
+	icon = 'mods/ascent/icons/obj/ascent_doodads.dmi'
 	icon_state = "box"
 	startswith = list(/obj/item/reagent_containers/food/drinks/cans/waterbottle/ascent = 7)
 
 /obj/structure/hygiene/shower/ascent
 	name = "hydrating decontamination armature"
 	desc = "An alien vertical squirt bath."
-	icon = 'mods/ascent/icons/misc/ascent_doodads.dmi'
+	icon = 'mods/ascent/icons/obj/ascent_doodads.dmi'
 
 /obj/structure/hygiene/sink/ascent
 	name = "hydration outlet"
 	desc = "An alien wall mounted basin with mysterious protrusions."
-	icon = 'mods/ascent/icons/misc/ascent_doodads.dmi'
+	icon = 'mods/ascent/icons/obj/ascent_doodads.dmi'
 
 /obj/structure/reagent_dispensers/water_cooler/ascent
 	name = "hydration dispensator"
 	desc = "An alien device housing liquid for alien purposes."
-	icon = 'mods/ascent/icons/misc/ascent_doodads.dmi'
+	icon = 'mods/ascent/icons/obj/ascent_doodads.dmi'
 	cups = 50
 	cup_type = /obj/item/reagent_containers/food/snacks/hydration
 
@@ -93,6 +93,3 @@
 
 /obj/structure/reagent_dispensers/water_cooler/ascent/RejectionMessage(mob/user)
 	return "\The [src]'s orb supply is empty. Notify a control mind."
-
-MANTIDIFY(/obj/item/device/scanner/health, "healthorrebator", "medicine")
-MANTIDIFY(/obj/item/reagent_containers/spray/sterilizine, "cleaning agent sprayer", "sterilizing")

mods/ascent/code/ascent_effects.dm

@@ -20,7 +20,7 @@
 /obj/item/razorweb
 	name = "razorweb wad"
 	desc = "A wad of crystalline monofilament."
-	icon = 'mods/ascent/icons/misc/razorweb.dmi'
+	icon = 'mods/ascent/icons/obj/razorweb.dmi'
 	icon_state = "wad"
 	var/web_type = /obj/effect/razorweb
 
@@ -38,7 +38,7 @@
 /obj/effect/razorweb
 	name = "razorweb"
 	desc = "A glimmering web of razor-sharp crystalline strands. Probably not something you want to sprint through."
-	icon = 'mods/ascent/icons/misc/razorweb.dmi'
+	icon = 'mods/ascent/icons/obj/razorweb.dmi'
 	icon_state = "razorweb"
 	anchored = TRUE
 

mods/ascent/code/ascent_id.dm

@@ -7,7 +7,7 @@ var/global/const/access_ascent = "ACCESS_ASCENT"
 // ID 'card'
 /obj/item/card/id/ascent
 	name = "alien chip"
-	icon = 'mods/ascent/icons/items/ascent.dmi'
+	icon = 'mods/ascent/icons/obj/items/ascent.dmi'
 	icon_state = "access_card"
 	desc = "A slender, complex chip of alien circuitry."
 	access = list(access_ascent)
@@ -35,7 +35,7 @@ var/global/const/access_ascent = "ACCESS_ASCENT"
 /obj/item/organ/internal/controller
 	name = "system controller"
 	desc = "A fist-sized lump of complex circuitry."
-	icon = 'mods/ascent/icons/items/ascent.dmi'
+	icon = 'mods/ascent/icons/obj/items/ascent.dmi'
 	icon_state = "plant"
 	parent_organ = BP_CHEST
 	organ_tag = BP_SYSTEM_CONTROLLER

mods/ascent/code/ascent_outfits.dm

@@ -64,7 +64,7 @@
 /obj/item/clothing/shoes/magboots/ascent
 	name = "mantid mag-claws"
 	desc = "A set of powerful gripping claws."
-	icon = 'mods/ascent/icons/misc/ascent_doodads.dmi'
+	icon = 'mods/ascent/icons/obj/ascent_doodads.dmi'
 	icon_state = "ascent_boots0"
 	icon_base = "ascent_boots"
 	species_restricted = list(SPECIES_MANTID_ALATE, SPECIES_MANTID_GYNE)

mods/ascent/code/ascent_rigs.dm

@@ -64,7 +64,7 @@
 	desc = "A flechette nanofabricator and launch system of Ascent design."
 	interface_name = "flechette rifle"
 	interface_desc = "A flechette nanofabricator and launch system of Ascent design."
-	icon = 'mods/ascent/icons/items/ascent.dmi'
+	icon = 'mods/ascent/icons/obj/items/ascent.dmi'
 	icon_state = "rifle"
 	laser = /obj/item/gun/energy/particle/flechette
 
@@ -73,7 +73,7 @@
 	desc = "A mounted particle rifle of Ascent design."
 	interface_name = "particle rifle"
 	interface_desc = "A mounted particle rifle of Ascent design."
-	icon = 'mods/ascent/icons/items/ascent.dmi'
+	icon = 'mods/ascent/icons/obj/items/ascent.dmi'
 	icon_state = "rifle"
 	laser = /obj/item/gun/energy/particle
 
@@ -83,7 +83,7 @@
 	interface_name = "multitool"
 	interface_desc = "A limited-sentience integrated multitool capable of interfacing with any number of systems."
 	device = /obj/item/device/multitool/mantid
-	icon = 'mods/ascent/icons/items/ascent.dmi'
+	icon = 'mods/ascent/icons/obj/items/ascent.dmi'
 	icon_state = "multitool"
 	usable = FALSE
 	selectable = TRUE
@@ -98,7 +98,7 @@
 	interface_name = "cable fabricator"
 	interface_desc = "A cable nanofabricator of Ascent design."
 	device = /obj/item/stack/cable_coil/fabricator
-	icon = 'mods/ascent/icons/items/ascent.dmi'
+	icon = 'mods/ascent/icons/obj/items/ascent.dmi'
 	icon_state = "cablecoil"
 	usable = FALSE
 	selectable = TRUE
@@ -108,7 +108,7 @@
 	desc = "An electrical cutting torch of Ascent design."
 	interface_name = "welding arm"
 	interface_desc = "An electrical cutting torch of Ascent design."
-	icon = 'mods/ascent/icons/items/ascent.dmi'
+	icon = 'mods/ascent/icons/obj/items/ascent.dmi'
 	icon_state = "welder1"
 	engage_string = "Toggle Welder"
 	device = /obj/item/weldingtool/electric/mantid
@@ -120,7 +120,7 @@
 	desc = "A complex assembly of self-guiding, modular heads capable of performing most manual tasks."
 	interface_name = "modular clustertool"
 	interface_desc = "A complex assembly of self-guiding, modular heads capable of performing most manual tasks."
-	icon = 'mods/ascent/icons/items/ascent.dmi'
+	icon = 'mods/ascent/icons/obj/items/ascent.dmi'
 	icon_state = "clustertool"
 	engage_string = "Select Mode"
 	device = /obj/item/clustertool
@@ -205,7 +205,7 @@
 	desc = "A compact chemical dispenser of mantid design."
 	interface_name = "mantid chemical injector"
 	interface_desc = "A compact chemical dispenser of mantid design."
-	icon = 'mods/ascent/icons/items/ascent.dmi'
+	icon = 'mods/ascent/icons/obj/items/ascent.dmi'
 	icon_state = "injector"
 	charges = list(
 		list("bromide",				"bromide",				/datum/reagent/toxin/bromide, 30),
@@ -219,7 +219,7 @@
 	desc = "A compact chemical dispenser of mantid design."
 	interface_name = "serpentid chemical injector"
 	interface_desc = "A compact chemical dispenser of mantid design."
-	icon = 'mods/ascent/icons/items/ascent.dmi'
+	icon = 'mods/ascent/icons/obj/items/ascent.dmi'
 	icon_state = "injector"
 	charges = list(
 		list("tramadol",            "tramadol",            /datum/reagent/tramadol,     	  30),

mods/ascent/code/ascent_species.dm

@@ -12,7 +12,7 @@
 	deform =                  'mods/ascent/icons/mob/alate/body.dmi'
 	damage_overlays =         'mods/ascent/icons/mob/alate/damage_mask.dmi'
 	blood_mask =              'mods/ascent/icons/mob/alate/blood_mask.dmi'
-	organs_icon =             'mods/ascent/icons/items/organs.dmi'
+	organs_icon =             'mods/ascent/icons/obj/items/organs.dmi'
 
 	blood_color =             "#660066"
 	flesh_color =             "#009999"
@@ -251,7 +251,7 @@
 	years ago and now allies and peers within the Ascent."
 	icobase = 'icons/mob/human_races/species/nabber/body_msw.dmi'
 	deform = 'icons/mob/human_races/species/nabber/body_msw.dmi'
-	spawn_flags = SPECIES_CAN_JOIN | SPECIES_NO_FBP_CONSTRUCTION | SPECIES_NO_FBP_CHARGEN | SPECIES_IS_WHITELISTED
+	spawn_flags = SPECIES_IS_RESTRICTED | SPECIES_NO_FBP_CONSTRUCTION | SPECIES_NO_FBP_CHARGEN | SPECIES_IS_WHITELISTED
 	appearance_flags = 0
 	base_skin_colours = null
 	hud_type = /datum/hud_data/mantid
@@ -304,7 +304,7 @@
 	hud_type = /datum/hud_data/mantid
 	appearance_flags = 0
 	base_skin_colours = null
-	spawn_flags = SPECIES_CAN_JOIN | SPECIES_NO_FBP_CONSTRUCTION | SPECIES_NO_FBP_CHARGEN | SPECIES_IS_WHITELISTED
+	spawn_flags = SPECIES_IS_RESTRICTED | SPECIES_NO_FBP_CONSTRUCTION | SPECIES_NO_FBP_CHARGEN | SPECIES_IS_WHITELISTED
 	has_organ = list(
 		BP_BRAIN =             /obj/item/organ/internal/brain/insectoid/nabber,
 		BP_EYES =              /obj/item/organ/internal/eyes/insectoid/msq,

mods/ascent/code/ascent_tools.dm

@@ -1,12 +1,12 @@
 /obj/item/weldingtool/electric/mantid
 	name = "alien welding tool"
 	desc = "An oddly shaped alien welding tool."
-	icon = 'mods/ascent/icons/items/ascent.dmi'
+	icon = 'mods/ascent/icons/obj/items/ascent.dmi'
 
 /obj/item/device/multitool/mantid
 	name = "alien multitool"
 	desc = "An alien microcomputer of some kind."
-	icon = 'mods/ascent/icons/items/ascent.dmi'
+	icon = 'mods/ascent/icons/obj/items/ascent.dmi'
 	icon_state = "multitool"
 
 /obj/item/clothing/gloves/anomaly_detector/mantid