Skip to content

mob_lists -> player and client lists #389

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Posshum wants to merge 1 commit into
base: main
Choose a base branch
from
+15 −9
Open

mob_lists -> player and client lists #389

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion code/__HELPERS/time.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ GLOBAL_VAR_INIT(date_override_offset, 0)
SStreasury.distribute_estate_incomes()
SStreasury.distribute_daily_payments()
SStreasury.distribute_interest()
for(var/mob/living/player in GLOB.mob_list)
for(var/mob/living/player in GLOB.joined_player_list) //CC Edit mob_list -> joined_player_list
if(player.stat != DEAD && player.client)
player.do_time_change()

Expand Down
8 changes: 4 additions & 4 deletions code/controllers/subsystem/job.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -886,7 +886,7 @@ SUBSYSTEM_DEF(job)
///////////////////////////////////
/datum/controller/subsystem/job/proc/get_living_heads()
. = list()
for(var/i in GLOB.human_list)
for(var/i in GLOB.joined_player_list) //CC Edit human_list -> joined_player_list
var/mob/living/carbon/human/player = i
if(player.stat != DEAD && player.mind && (player.mind.assigned_role in GLOB.command_positions))
. |= player.mind
Expand All @@ -897,7 +897,7 @@ SUBSYSTEM_DEF(job)
////////////////////////////
/datum/controller/subsystem/job/proc/get_all_heads()
. = list()
for(var/i in GLOB.mob_list)
for(var/i in GLOB.joined_player_list) //CC Edit mob_list -> joined_player_list
var/mob/player = i
if(player.mind && (player.mind.assigned_role in GLOB.command_positions))
. |= player.mind
Expand All @@ -907,7 +907,7 @@ SUBSYSTEM_DEF(job)
//////////////////////////////////////////////
/datum/controller/subsystem/job/proc/get_living_sec()
. = list()
for(var/i in GLOB.human_list)
for(var/i in GLOB.joined_player_list) //CC Edit human_list -> joined_player_list
var/mob/living/carbon/human/player = i
if(player.stat != DEAD && player.mind && (player.mind.assigned_role in GLOB.security_positions))
. |= player.mind
Expand All @@ -917,7 +917,7 @@ SUBSYSTEM_DEF(job)
////////////////////////////////////////
/datum/controller/subsystem/job/proc/get_all_sec()
. = list()
for(var/i in GLOB.human_list)
for(var/i in GLOB.joined_player_list) //CC Edit human_list -> joined_player_list
var/mob/living/carbon/human/player = i
if(player.mind && (player.mind.assigned_role in GLOB.security_positions))
. |= player.mind
Expand Down
1 change: 1 addition & 0 deletions code/modules/roguetown/roguemachine/questing/questing_components.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
if(is_mob)
var/mob/M = parent
M.add_filter(outline_filter_id, 2, list("type" = "outline", "color" = "#ff0000", "size" = 0.5))
GLOB.quest_mobs += M //CC Edit for registering mobs to quests so we don't go through a global list
RegisterSignal(parent, COMSIG_MOB_DEATH, PROC_REF(on_target_death))
RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(on_mob_examine))
else
Expand Down
7 changes: 6 additions & 1 deletion code/modules/roguetown/roguemachine/questing/types/__quest.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
//CC Edit Begin
//This list holds all mobs currently associated with active quests.
GLOBAL_LIST_EMPTY(quest_mobs)
//CC Edit End

/datum/quest
var/title = ""
var/datum/weakref/quest_giver_reference
Expand Down Expand Up @@ -37,7 +42,7 @@

/datum/quest/Destroy()
// Clean up mobs with quest components
for(var/mob/living/M in GLOB.mob_list)
for(var/mob/living/M in GLOB.quest_mobs)
var/datum/component/quest_object/Q = M.GetComponent(/datum/component/quest_object)
if(Q && Q.quest_ref?.resolve() == src)
M.remove_filter("quest_item_outline")
Expand Down
4 changes: 2 additions & 2 deletions code/modules/spells/roguetown/acolyte/necra.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@
var/mob/living/carbon/spirit/capturedsoul = null
var/list/souloptions = list()
var/list/itemstore = list()
for(var/mob/living/carbon/spirit/S in GLOB.mob_list)
for(var/mob/living/carbon/spirit/S in GLOB.player_list) //CC Edit mob_list -> player_list
if(S.summoned)
continue
if(!S.client)
Expand All @@ -134,7 +134,7 @@
if(!pickedsoul)
to_chat(user, span_warning("I was unable to commune with a soul."))
return
for(var/mob/living/carbon/spirit/P in GLOB.mob_list)
for(var/mob/living/carbon/spirit/P in GLOB.player_list) //CC Edit mob_list -> player_list
if(P.livingname == pickedsoul)
to_chat(P, "<font color='blue'>You feel yourself being pulled out of the Underworld.</font>")
sleep(2 SECONDS)
Expand Down
2 changes: 1 addition & 1 deletion code/modules/vampire_neu/objects/scrying.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@
to_chat(V, span_boldnotice("A message from [src.real_name]:[msg]"))
for(var/datum/mind/D in SSmapping.retainer.death_knights)
to_chat(D, span_boldnotice("A message from [src.real_name]:[msg]"))
for(var/mob/dead/observer/rogue/arcaneeye/A in GLOB.mob_list)
for(var/mob/dead/observer/rogue/arcaneeye/A in GLOB.player_list) //CC Edit mob_list -> player_list
to_chat(A, span_boldnotice("A message from [src.real_name]:[msg]"))

/mob/dead/observer/rogue/arcaneeye/proc/eye_up()
Expand Down
Loading