From 9e4d474b9334bf56e59ca517cbaa59e21be582d4 Mon Sep 17 00:00:00 2001 From: TheGreatKitsune Date: Sat, 10 Sep 2022 12:29:02 -0500 Subject: [PATCH] Fix vore spawns as noncrew. --- code/game/jobs/job_controller.dm | 3 +-- code/modules/client/preferences_spawnpoints.dm | 5 +++-- modular_chomp/code/modules/client/preferences_spawnpoints.dm | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/code/game/jobs/job_controller.dm b/code/game/jobs/job_controller.dm index 5a414430ea..3ca68c8219 100644 --- a/code/game/jobs/job_controller.dm +++ b/code/game/jobs/job_controller.dm @@ -657,8 +657,7 @@ var/global/datum/controller/occupations/job_master var/obj/belly/vore_spawn_gut var/mob/living/prey_to_nomph - var/datum/job/J = SSjob.get_job(rank) - fail_deadly = J?.offmap_spawn + //CHOMPEdit - Remove fail_deadly addition on offmap_spawn //Spawn them at their preferred one if(C && C.prefs.spawnpoint) diff --git a/code/modules/client/preferences_spawnpoints.dm b/code/modules/client/preferences_spawnpoints.dm index 902c19f2ad..e04383a01f 100644 --- a/code/modules/client/preferences_spawnpoints.dm +++ b/code/modules/client/preferences_spawnpoints.dm @@ -13,6 +13,7 @@ var/list/spawntypes = list() var/list/restrict_job = null var/list/disallow_job = null var/announce_channel = "Common" + var/allow_offmap_spawn = FALSE //CHOMPEdit - add option to allow offmap spawns to a spawnpoint without entirely restricting that spawnpoint var/allowed_mob_types = JOB_SILICON|JOB_CARBON /datum/spawnpoint/proc/check_job_spawning(job) @@ -26,7 +27,7 @@ var/list/spawntypes = list() if(!J) // Couldn't find, admin shenanigans? Allow it return 1 - if(J.offmap_spawn && !(job in restrict_job)) + if(J.offmap_spawn && !allow_offmap_spawn && !(job in restrict_job)) //CHOMPEdit - add option to allow offmap spawns to a spawnpoint without entirely restricting that spawnpoint return 0 if(!(J.mob_type & allowed_mob_types)) @@ -107,4 +108,4 @@ var/global/list/latejoin_tram = list() /datum/spawnpoint/tram/New() ..() - turfs = latejoin_tram \ No newline at end of file + turfs = latejoin_tram diff --git a/modular_chomp/code/modules/client/preferences_spawnpoints.dm b/modular_chomp/code/modules/client/preferences_spawnpoints.dm index 60df048bc5..f1c2a2c0ac 100644 --- a/modular_chomp/code/modules/client/preferences_spawnpoints.dm +++ b/modular_chomp/code/modules/client/preferences_spawnpoints.dm @@ -10,6 +10,7 @@ /datum/spawnpoint/vore display_name = "Vorespawn - Prey" msg = "has arrived on the station" + allow_offmap_spawn = TRUE /datum/spawnpoint/vore/pred display_name = "Vorespawn - Pred"