cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-19 19:15:11 +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 09:06:54 +03:00
committed by GitHub
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/admin/verbs/mapping.dm
+2 -2
View File
@@ -57,8 +57,8 @@ ADMIN_VERB(camera_view, R_DEBUG, "Camera Range Display", "Globally changes the c
ADMIN_VERB_VISIBILITY(sec_camera_report, ADMIN_VERB_VISIBLITY_FLAG_LOCALHOST)
ADMIN_VERB(sec_camera_report, R_DEBUG, "Camera Report", "Gives a report of the camera state (Only use on a test server).", ADMIN_CATEGORY_MAPPING_TESTS)
if(!GLOB.master_controller)
tgui_alert_async(user,"Master_controller not found.","Sec Camera Report")
if(!SSticker.HasRoundStarted())
tgui_alert_async(user,"Game init not ready.","Sec Camera Report")
return 0
var/list/obj/machinery/camera/CL = list()
code/modules/admin/verbs/randomverbs.dm
+5 -5
View File
@@ -390,7 +390,7 @@ ADMIN_VERB(respawn_character, (R_ADMIN|R_REJUVINATE), "Spawn Character", "(Re)Sp
//Well you're not reloading their job or they never had one.
if(!charjob)
var/pickjob = tgui_input_list(src, "Pick a job to assign them (or none).","Job Select", GLOB.joblist.Copy() + "-No Job-", "-No Job-")
var/pickjob = tgui_input_list(src, "Pick a job to assign them (or none).","Job Select", SSjob.occupations_by_name.Copy() + "-No Job-", "-No Job-")
if(!pickjob)
return
if(pickjob != "-No Job-")
@@ -521,10 +521,10 @@ ADMIN_VERB(respawn_character, (R_ADMIN|R_REJUVINATE), "Spawn Character", "(Re)Sp
//If desired, apply equipment.
if(equipment)
if(charjob)
GLOB.job_master.EquipRank(new_character, charjob, 1)
SSjob.equip_rank(new_character, charjob, 1)
if(new_character.mind)
new_character.mind.assigned_role = charjob
new_character.mind.role_alt_title = GLOB.job_master.GetPlayerAltTitle(new_character, charjob)
new_character.mind.role_alt_title = SSjob.get_player_alt_title(new_character, charjob)
//If customised job title, modify here.
if(custom_job && custom_job_title)
@@ -652,8 +652,8 @@ ADMIN_VERB_AND_CONTEXT_MENU(cmd_admin_delete, R_FUN|R_ADMIN, "Delete", "Delete t
user.admin_delete(atom_target)
ADMIN_VERB(cmd_admin_list_open_jobs, R_HOLDER, "List free slots", "Show available job slots.", ADMIN_CATEGORY_INVESTIGATE)
if(GLOB.job_master)
for(var/datum/job/job in GLOB.job_master.occupations)
if(SSjob)
for(var/datum/job/job in SSjob.occupations)
to_chat(user, "[job.title]: [job.total_positions]")
feedback_add_details("admin_verb","LFS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
code/modules/admin/verbs/tripAI.dm
+2 -2
View File
@@ -6,8 +6,8 @@
to_chat(usr, "This option is currently only usable during pregame. This may change at a later date.")
return
if(GLOB.job_master && SSticker)
var/datum/job/job = GLOB.job_master.GetJob(JOB_AI)
if(SSjob && SSticker)
var/datum/job/job = SSjob.get_job(JOB_AI)
if(!job)
to_chat(usr, "Unable to locate the AI job")
return