Skip to content

Commit

Permalink
Fix: update Ascent Caulship whitelists requirements (#677)
Browse files Browse the repository at this point in the history
# Описание

Не то чтобы это на что-то влияет, но на всякий случай.
Когда в последний раз занимался этой авейкой, как-то упустил момент, что
вайтлисты стоило бы сделать более правильно.

:cl: Neonvolt
bugfix: edited Ascent Caulship whitelist vars
bugfix: removed redundant required role check for Caulship
/:cl:
  • Loading branch information
Neonvolt authored Nov 14, 2023
1 parent dca3697 commit 355c928
Showing 1 changed file with 13 additions and 11 deletions.
24 changes: 13 additions & 11 deletions maps/away/ascent_caulship/ascent_jobs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@
info = "You are a Gyne of the Ascent, fleeing the murderous Kharmaani political sphere after your first molt. Your search for safe harbour has brought you to this remote unsettled sector. Find a safe nest, and bring prosperity to your lineage."
outfit_type = /decl/hierarchy/outfit/job/ascent
blacklisted_species = null
whitelisted_species = list("Kharmaan Gyne")
whitelisted_species = list(SPECIES_MANTID_GYNE)
loadout_allowed = FALSE
is_semi_antagonist = TRUE
min_skill = list(
Expand All @@ -116,7 +116,7 @@
var/requires_supervisor = FALSE
var/set_species_on_join = SPECIES_MANTID_GYNE

/datum/job/submap/ascent/is_position_available()
/* /datum/job/submap/ascent/is_position_available()
. = ..()
if(. && requires_supervisor)
for(var/mob/M in GLOB.player_list)
Expand All @@ -125,7 +125,7 @@
var/datum/job/submap/ascent/ascent_job = M.mind.assigned_job
if(istype(ascent_job) && ascent_job.owner == owner)
return TRUE
return FALSE
return FALSE */

/datum/job/submap/ascent/handle_variant_join(var/mob/living/carbon/human/H, var/alt_title)

Expand Down Expand Up @@ -169,8 +169,7 @@
info = "You are a young Alate of a new Gyne. She has led you to this remote sector to found a new nest. Follow her instructions and bring prosperity to your nest-lineage."
set_species_on_join = SPECIES_MANTID_ALATE
outfit_type = /decl/hierarchy/outfit/job/ascent/attendant
whitelisted_species = list("Kharmaan Alate")
requires_supervisor = "Ascent Gyne"
whitelisted_species = list(SPECIES_MANTID_ALATE)
min_skill = list(
SKILL_EVA = SKILL_ADEPT,
SKILL_HAULING = SKILL_ADEPT,
Expand All @@ -179,25 +178,26 @@
SKILL_MEDICAL = SKILL_BASIC
)
required_role = list("Ascent Gyne")
//requires_supervisor = "Ascent Gyne"

/datum/job/submap/ascent/drone
title = "Ascent Drone"
supervisors = "the Gyne"
total_positions = 1
info = "You are a Machine Intelligence of an independent Ascent vessel. The Gyne you assist has fled her sisters, ending up in this sector full of primitive bioforms. Try to keep her alive, and assist where you can."
set_species_on_join = /mob/living/silicon/robot/flying/ascent
whitelisted_species = list("Kharmaan Alate")
requires_supervisor = "Ascent Gyne"
whitelisted_species = list(SPECIES_MANTID_ALATE)
required_role = list("Ascent Gyne")
//requires_supervisor = "Ascent Gyne"

/datum/job/submap/ascent/worker
title = "Serpentid Adjunct"
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_MANTID_ALATE, SPECIES_NABBER)
set_species_on_join = SPECIES_MONARCH_WORKER
outfit_type = /decl/hierarchy/outfit/job/ascent/worker/tech
requires_supervisor = "Serpentid Queen"
min_skill = list(SKILL_EVA = SKILL_ADEPT,
SKILL_HAULING = SKILL_ADEPT,
SKILL_COMBAT = SKILL_ADEPT,
Expand All @@ -206,23 +206,25 @@
SKILL_MEDICAL = SKILL_BASIC
)
required_role = list("Serpentid Queen")
//requires_supervisor = "Serpentid Queen"

/datum/job/submap/ascent/queen
title = "Serpentid Queen"
supervisors = "the Gyne"
supervisors = "the Gyne"
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."
set_species_on_join = SPECIES_MONARCH_QUEEN
outfit_type = /decl/hierarchy/outfit/job/ascent/queen
whitelisted_species = list("Kharmaan Gyne")
requires_supervisor = "Ascent Gyne"
whitelisted_species = list(SPECIES_MANTID_GYNE, SPECIES_NABBER)
min_skill = list(SKILL_EVA = SKILL_ADEPT,
SKILL_HAULING = SKILL_ADEPT,
SKILL_COMBAT = SKILL_ADEPT,
SKILL_WEAPONS = SKILL_ADEPT,
SKILL_MEDICAL = SKILL_BASIC
)
required_role = list("Ascent Gyne")
//requires_supervisor = "Ascent Gyne"


// Spawn points.
/obj/effect/submap_landmark/spawnpoint/ascent_caulship
Expand Down

0 comments on commit 355c928

Please sign in to comment.