cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2025-12-11 18:22:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

De-snowflakes latejoin on-station code, latejoin borgs now sync properly, see #6472 (#7742)

Browse Source 
* Revert "aaaa (#6451)"

This reverts commit f11bf3faf0.

* onstation latejoin stuff

* linking to parent AI

* test

* de-snowflaking

* Update code/modules/jobs/job_types/cyborg.dm

* Update code/modules/jobs/job_types/cyborg.dm

* Update modular_skyrat/master_files/code/modules/jobs/job_types/cyborg.dm

* Update modular_skyrat/master_files/code/modules/jobs/job_types/cyborg.dm

* Update cyborg.dm

Co-authored-by: SpaceVampire <46720418+SpaceVampire@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
This commit is contained in:
FlamingLily
2021-08-28 11:02:22 +10:00
committed by GitHub
parent f41edd966e
commit c0b967f2b4
7 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
code/controllers/subsystem/job.dm
View File

@@ -763,13 +763,6 @@ SUBSYSTEM_DEF(job)
destination = pick(GLOB.jobspawn_overrides[M.mind.assigned_role.title])
destination.JoinPlayerHere(M, FALSE)
return TRUE
//SKYRAT EDIT ADDITION
if(M.job)
if(M.job == "Prisoner")
destination = locate(/obj/effect/landmark/start/prisoner) in GLOB.landmarks_list
destination.JoinPlayerHere(M, buckle)
return TRUE
//SKYRAT EDIT END
if(latejoin_trackers.len)
destination = pick(latejoin_trackers)
destination.JoinPlayerHere(M, buckle)