cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-27 14:08:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

removes the last of the old job controller (#19344)

Browse Source 
* removes the last of the old job controller

* .

* .

* .

* .

* .

* Update admin_verbs.dm

* Update admin_verbs.dm

---------

Co-authored-by: Cameron Lennox <killer65311@gmail.com>
This commit is contained in:
Kashargul
2026-04-13 02:06:54 -04:00
committed by GitHub
co-authored by Cameron Lennox
parent a3b7c0e836
commit 12c5adeeb3
40 changed files with 1029 additions and 1148 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/dead/observer/free_vr.dm
+1 -1
View File
@@ -31,7 +31,7 @@ GLOBAL_LIST_EMPTY(prevent_respawns)
//Job slot cleanup
var/job = src.mind.assigned_role
GLOB.job_master.FreeRole(job)
SSjob.free_role(job)
//Their objectives cleanup
if(src.mind.objectives.len)
code/modules/mob/living/silicon/silicon.dm
+1 -1
View File
@@ -409,7 +409,7 @@
//Handle job slot/tater cleanup.
var/job = mind.assigned_role
GLOB.job_master.FreeRole(job)
SSjob.free_role(job)
if(mind.objectives.len)
qdel(mind.objectives)
code/modules/mob/mob.dm
+1 -1
View File
@@ -471,7 +471,7 @@
//Job slot cleanup
var/job = mind.assigned_role
GLOB.job_master.FreeRole(job)
SSjob.free_role(job)
//Their objectives cleanup
if(mind.objectives.len)
code/modules/mob/new_player/new_player.dm
+4 -4
View File
@@ -197,7 +197,7 @@
return timer - world.time
/mob/new_player/proc/IsJobAvailable(rank)
var/datum/job/job = GLOB.job_master.GetJob(rank)
var/datum/job/job = SSjob.get_job(rank)
if(!job)
return 0
if(!job.is_position_available())
@@ -232,7 +232,7 @@
return 0
//Find our spawning point.
var/list/join_props = GLOB.job_master.LateSpawn(client, rank)
var/list/join_props = SSjob.late_spawn(client, rank)
if(!join_props)
return
@@ -271,10 +271,10 @@
qdel(src)
return
GLOB.job_master.AssignRole(src, rank, 1)
SSjob.assign_role(src, rank, 1)
var/mob/living/character = create_character(T) //creates the human and transfers vars and mind
character = GLOB.job_master.EquipRank(character, rank, 1) //equips the human
character = SSjob.equip_rank(character, rank, 1) //equips the human
UpdateFactionList(character)
var/datum/job/J = SSjob.get_job(rank)
code/modules/mob/new_player/preferences_setup.dm
+4 -4
View File
@@ -192,11 +192,11 @@
var/datum/job/previewJob
// Determine what job is marked as 'High' priority, and dress them up as such.
if(job_civilian_low & ASSISTANT)
previewJob = GLOB.job_master.GetJob(JOB_ALT_VISITOR)
previewJob = SSjob.get_job(JOB_ALT_VISITOR)
else if(client && ispAI(client.mob))
pass() //Don't do anything!
else
for(var/datum/job/job in GLOB.job_master.occupations)
for(var/datum/job/job in SSjob.occupations)
var/job_flag
switch(job.department_flag)
if(CIVILIAN)
@@ -257,9 +257,9 @@
var/datum/job/highJob
// Determine what job is marked as 'High' priority, and dress them up as such.
if(job_civilian_low & ASSISTANT)
highJob = GLOB.job_master.GetJob(JOB_ALT_ASSISTANT)
highJob = SSjob.get_job(JOB_ALT_ASSISTANT)
else
for(var/datum/job/job in GLOB.job_master.occupations)
for(var/datum/job/job in SSjob.occupations)
var/job_flag
switch(job.department_flag)
if(CIVILIAN)