cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-28 06:27:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes some issues with command and sec job lists (#21806)

Browse Source 
* oh god oh god

* oops, forgot to remove that

* name changes
This commit is contained in:
Contrabang
2023-07-24 14:24:09 -05:00
committed by GitHub
parent 00c823f219
commit 17a4df5a4c
10 changed files with 32 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/gamemodes/game_mode.dm
+4 -6
View File
@@ -272,8 +272,7 @@
. = list()
for(var/thing in GLOB.human_list)
var/mob/living/carbon/human/player = thing
var/list/real_command_positions = GLOB.command_positions.Copy() - "Nanotrasen Representative"
if(player.stat != DEAD && player.mind && (player.mind.assigned_role in real_command_positions))
if(player.stat != DEAD && player.mind && (player.mind.assigned_role in GLOB.command_head_positions))
. |= player.mind
@@ -283,8 +282,7 @@
/datum/game_mode/proc/get_all_heads()
. = list()
for(var/mob/player in GLOB.mob_list)
var/list/real_command_positions = GLOB.command_positions.Copy() - "Nanotrasen Representative"
if(player.mind && (player.mind.assigned_role in real_command_positions))
if(player.mind && (player.mind.assigned_role in GLOB.command_head_positions))
. |= player.mind
//////////////////////////////////////////////
@@ -294,7 +292,7 @@
. = list()
for(var/thing in GLOB.human_list)
var/mob/living/carbon/human/player = thing
if(player.stat != DEAD && player.mind && (player.mind.assigned_role in GLOB.security_positions))
if(player.stat != DEAD && player.mind && (player.mind.assigned_role in GLOB.active_security_positions))
. |= player.mind
////////////////////////////////////////
@@ -304,7 +302,7 @@
. = list()
for(var/thing in GLOB.human_list)
var/mob/living/carbon/human/player = thing
if(player.mind && (player.mind.assigned_role in GLOB.security_positions))
if(player.mind && (player.mind.assigned_role in GLOB.active_security_positions))
. |= player.mind
/datum/game_mode/proc/check_antagonists_topic(href, href_list[])
code/game/gamemodes/revolution/revolution.dm
+1 -2
View File
@@ -177,8 +177,7 @@
/datum/game_mode/revolution/latespawn(mob/living/carbon/human/player)
..()
var/datum/mind/player_mind = player.mind
var/list/real_command_positions = GLOB.command_positions.Copy() - "Nanotrasen Representative"
if(player_mind && (player_mind.assigned_role in real_command_positions))
if(player_mind && (player_mind.assigned_role in GLOB.command_head_positions))
for(var/datum/mind/rev_mind in head_revolutionaries)
mark_for_death(rev_mind, player_mind)