cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-22 20:48:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix latejoin seccies teleporting to departments (#93259)

Browse Source 
## About The Pull Request

Don't send latejoins to their departments, let them ride the shuttle

Why did this break? My GUESS Is that this uses `Move` for some reason
instead of `forceMove`, and as latejoiners spawn buckled, it stopped
them from moving

Meaning #93250 also fixes it but let's just nip the issue in the bud and
NOT teleport latejoiners

## Changelog

🆑 Melbert
fix: Latejoin officers no longer teleport
/🆑
This commit is contained in:
MrMelbert
2025-10-04 04:36:28 +02:00
committed by GitHub
parent 6b1f91541b
commit 90f2b92c0f
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/jobs/job_types/security_officer.dm
+5 -5
View File
@@ -62,7 +62,7 @@ GLOBAL_LIST_EMPTY(security_officer_distribution)
/datum/job/security_officer/after_roundstart_spawn(mob/living/spawning, client/player_client)
. = ..()
if(ishuman(spawning))
setup_department(spawning, player_client)
setup_department(spawning, player_client, move_to = TRUE)
/datum/job/security_officer/after_latejoin_spawn(mob/living/spawning)
@@ -74,7 +74,7 @@ GLOBAL_LIST_EMPTY(security_officer_distribution)
/// Returns the department this mob was assigned to, if any.
/datum/job/security_officer/proc/setup_department(mob/living/carbon/human/spawning, client/player_client)
/datum/job/security_officer/proc/setup_department(mob/living/carbon/human/spawning, client/player_client, move_to = FALSE)
var/department = player_client?.prefs?.read_preference(/datum/preference/choiced/security_department)
if (!isnull(department))
department = get_my_department(spawning, department)
@@ -132,15 +132,15 @@ GLOBAL_LIST_EMPTY(security_officer_distribution)
var/spawn_point = pick(LAZYACCESS(GLOB.department_security_spawns, department))
if(!CONFIG_GET(flag/sec_start_brig) && (destination || spawn_point))
if(!CONFIG_GET(flag/sec_start_brig) && move_to && (destination || spawn_point))
if(spawn_point)
spawning.Move(get_turf(spawn_point))
spawning.forceMove(get_turf(spawn_point))
else
var/list/possible_turfs = get_area_turfs(destination)
while (length(possible_turfs))
var/random_index = rand(1, length(possible_turfs))
var/turf/target = possible_turfs[random_index]
if (spawning.Move(target))
if (spawning.forceMove(target))
break
possible_turfs.Cut(random_index, random_index + 1)