From 42d09afa053a50e70d864279264699e44475f138 Mon Sep 17 00:00:00 2001 From: nvt14 Date: Fri, 4 Oct 2024 23:38:23 +0300 Subject: [PATCH] unique job names tweak & remove unnecessary checks --- .../ascent_caulship/code/ascent_caulship_jobs.dm | 3 --- .../ascent_seedship/code/ascent_seedship_jobs.dm | 13 +++++-------- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/mods/_maps/ascent_caulship/code/ascent_caulship_jobs.dm b/mods/_maps/ascent_caulship/code/ascent_caulship_jobs.dm index 482578b7f0cf3..d56482265b6e6 100644 --- a/mods/_maps/ascent_caulship/code/ascent_caulship_jobs.dm +++ b/mods/_maps/ascent_caulship/code/ascent_caulship_jobs.dm @@ -115,9 +115,6 @@ return H.AIize(set_species_on_join, move = FALSE)*/ var/datum/submap/ascent/cutter = owner - if(!istype(cutter)) - crash_with("Ascent submap job is being used by a non-Ascent submap, aborting variant join.") - return if(!cutter.gyne_name) cutter.gyne_name = TYPE_PROC_REF(/singleton/cultural_info/culture/ascent, create_gyne_name) diff --git a/mods/_maps/ascent_seedship/code/ascent_seedship_jobs.dm b/mods/_maps/ascent_seedship/code/ascent_seedship_jobs.dm index c0c8438cff6cf..720210db8ad2b 100644 --- a/mods/_maps/ascent_seedship/code/ascent_seedship_jobs.dm +++ b/mods/_maps/ascent_seedship/code/ascent_seedship_jobs.dm @@ -1,5 +1,5 @@ -/*/datum/submap/ascent_inf - var/gyne_name*/ +/datum/submap/ascent_inf + var/gyne_name /datum/submap/ascent_inf/sync_cell(obj/overmap/visitable/cell) return @@ -108,10 +108,7 @@ /*if(ispath(set_species_on_join, /mob/living/silicon/ai)) return H.AIize(set_species_on_join, move = FALSE)*/ - var/datum/submap/ascent/cutter = owner - if(!istype(cutter)) - crash_with("Ascent submap job is being used by a non-Ascent submap, aborting variant join.") - return + var/datum/submap/ascent_inf/cutter = owner if(!cutter.gyne_name) cutter.gyne_name = TYPE_PROC_REF(/singleton/cultural_info/culture/ascent, create_gyne_name) @@ -167,7 +164,7 @@ /datum/job/submap/ascent_inf/monarch_worker - title = "Serpentid Adjunct" + title = "Serpentid adjunct" 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." @@ -181,7 +178,7 @@ SKILL_MEDICAL = SKILL_BASIC) /datum/job/submap/ascent_inf/monarch_queen - title = "Serpentid Queen" + title = "Serpentid queen" 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."