More globals (#19111)

This commit is contained in:
Kashargul
2026-01-30 19:51:21 +01:00
committed by GitHub
parent 48e8d0df0b
commit d0678d4046
73 changed files with 258 additions and 248 deletions
+1 -1
View File
@@ -31,7 +31,7 @@ GLOBAL_LIST_EMPTY(prevent_respawns)
//Job slot cleanup
var/job = src.mind.assigned_role
job_master.FreeRole(job)
GLOB.job_master.FreeRole(job)
//Their objectives cleanup
if(src.mind.objectives.len)
+2 -2
View File
@@ -575,7 +575,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
if(check_rights_for(src.client, R_ADMIN|R_FUN|R_EVENT))
return 0
return (T && T.holy) && (is_manifest || (mind in cult.current_antagonists))
return (T && T.holy) && (is_manifest || (mind in GLOB.cult.current_antagonists))
/mob/observer/dead/verb/jumptomob() //Moves the ghost instead of just changing the ghosts's eye -Nodrak
set category = "Ghost.Game"
@@ -687,7 +687,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
var/ghosts_can_write
if(SSticker.mode.name == "cult")
if(cult.current_antagonists.len > CONFIG_GET(number/cult_ghostwriter_req_cultists))
if(GLOB.cult.current_antagonists.len > CONFIG_GET(number/cult_ghostwriter_req_cultists))
ghosts_can_write = 1
if(!ghosts_can_write && !check_rights(R_ADMIN|R_EVENT|R_FUN, 0)) //Let's allow for admins to write in blood for events and the such.
+1 -1
View File
@@ -18,7 +18,7 @@
return seen_turfs_in_range(src, 3)
/mob/living/carbon/human/seen_cult_turfs()
if(mind in cult.current_antagonists)
if(mind in GLOB.cult.current_antagonists)
return seen_turfs_in_range(src, world.view)
return ..()
@@ -36,10 +36,10 @@
/datum/antagonist/add_antagonist(var/datum/mind/player)
. = ..()
if(src == cult)
if(src == GLOB.cult)
cultnet.updateVisibility(player.current, 0)
/datum/antagonist/remove_antagonist(var/datum/mind/player, var/show_message, var/implanted)
..()
if(src == cult)
if(src == GLOB.cult)
cultnet.updateVisibility(player.current, 0)
+1 -1
View File
@@ -223,7 +223,7 @@ GLOBAL_LIST_INIT(ai_verbs_default, list(
ooc_notes_style = read_preference(/datum/preference/toggle/living/ooc_notes_style)
private_notes = client.prefs.read_preference(/datum/preference/text/living/private_notes)
if (malf && !(mind in malf.current_antagonists))
if (GLOB.malf && !(mind in GLOB.malf.current_antagonists))
show_laws()
to_chat(src, span_filter_notice(span_bold("These laws may be changed by other players, or by you being the traitor.")))
@@ -221,7 +221,7 @@
return
if (syndicate)
for(var/datum/mind/tra in traitors.current_antagonists)
for(var/datum/mind/tra in GLOB.traitors.current_antagonists)
if(tra.current)
// TODO: Update to new antagonist system.
var/I = image('icons/mob/mob.dmi', loc = tra.current, icon_state = "traitor")
@@ -231,7 +231,7 @@
// TODO: Update to new antagonist system.
if(!mind.special_role)
mind.special_role = "traitor"
traitors.current_antagonists |= mind
GLOB.traitors.current_antagonists |= mind
update_cell()
+3 -3
View File
@@ -381,10 +381,10 @@
/mob/living/silicon/proc/is_traitor()
return mind && (mind in traitors.current_antagonists)
return mind && (mind in GLOB.traitors.current_antagonists)
/mob/living/silicon/proc/is_malf()
return mind && (mind in malf.current_antagonists)
return mind && (mind in GLOB.malf.current_antagonists)
/mob/living/silicon/proc/is_malf_or_traitor()
return is_traitor() || is_malf()
@@ -407,7 +407,7 @@
//Handle job slot/tater cleanup.
var/job = mind.assigned_role
job_master.FreeRole(job)
GLOB.job_master.FreeRole(job)
if(mind.objectives.len)
qdel(mind.objectives)
+1 -1
View File
@@ -471,7 +471,7 @@
//Job slot cleanup
var/job = mind.assigned_role
job_master.FreeRole(job)
GLOB.job_master.FreeRole(job)
//Their objectives cleanup
if(mind.objectives.len)
+4 -4
View File
@@ -202,7 +202,7 @@
return timer - world.time
/mob/new_player/proc/IsJobAvailable(rank)
var/datum/job/job = job_master.GetJob(rank)
var/datum/job/job = GLOB.job_master.GetJob(rank)
if(!job)
return 0
if(!job.is_position_available())
@@ -237,7 +237,7 @@
return 0
//Find our spawning point.
var/list/join_props = job_master.LateSpawn(client, rank)
var/list/join_props = GLOB.job_master.LateSpawn(client, rank)
if(!join_props)
return
@@ -276,10 +276,10 @@
qdel(src)
return
job_master.AssignRole(src, rank, 1)
GLOB.job_master.AssignRole(src, rank, 1)
var/mob/living/character = create_character(T) //creates the human and transfers vars and mind
character = job_master.EquipRank(character, rank, 1) //equips the human
character = GLOB.job_master.EquipRank(character, rank, 1) //equips the human
UpdateFactionList(character)
var/datum/job/J = SSjob.get_job(rank)
@@ -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 = job_master.GetJob(JOB_ALT_VISITOR)
previewJob = GLOB.job_master.GetJob(JOB_ALT_VISITOR)
else if(client && ispAI(client.mob))
pass() //Don't do anything!
else
for(var/datum/job/job in job_master.occupations)
for(var/datum/job/job in GLOB.job_master.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 = job_master.GetJob(JOB_ALT_ASSISTANT)
highJob = GLOB.job_master.GetJob(JOB_ALT_ASSISTANT)
else
for(var/datum/job/job in job_master.occupations)
for(var/datum/job/job in GLOB.job_master.occupations)
var/job_flag
switch(job.department_flag)
if(CIVILIAN)