@@ -12,20 +20,13 @@ datum/directive/bluespace_contagion/get_description() "} datum/directive/bluespace_contagion/initialize() - var/list/candidates = list() - - for (var/mob/living/M in player_list) - if (is_valid_candidate(M)) - candidates += M - - infection_count = min(infection_count, candidates.len) - + var/list/candidates = get_infection_candidates() var/list/infected_names = list() - for(var/i=0, i < infection_count, i++) + for(var/i=0, i < INFECTION_COUNT, i++) if(!candidates.len) break - var/mob/living/carbon/human/candidate = pick(candidates) + var/mob/candidate = pick(candidates) candidates-=candidate infected+=candidate infected_names+="[candidate.mind.assigned_role] [candidate.mind.name]" @@ -35,19 +36,9 @@ datum/directive/bluespace_contagion/initialize() "Allow one hour for a cure to be manufactured.", "If no cure arrives after that time, execute the infected.") -datum/directive/bluespace_contagion/proc/is_valid_candidate(mob/M) - //don't select observers, dead, or disconnected people - if(istype(M, /mob/new_player) || !M.client || M.stat == DEAD) - return 0 - - //don't allow AI, robots, simple_animals and the like - if(!istype(M, /mob/living/carbon)) - return 0 - - return 1 - datum/directive/bluespace_contagion/meets_prerequisites() - return player_list.len >= 7 //would be better to count the number of valid candidates but I don't know if that is possible here. + var/list/candidates = get_infection_candidates() + return candidates.len >= 7 datum/directive/bluespace_contagion/directives_complete() return infected.len == 0 diff --git a/code/game/gamemodes/mutiny/directives/financial_crisis_directive.dm b/code/game/gamemodes/mutiny/directives/financial_crisis_directive.dm index e6fb0907fd6..5de523eaae3 100644 --- a/code/game/gamemodes/mutiny/directives/financial_crisis_directive.dm +++ b/code/game/gamemodes/mutiny/directives/financial_crisis_directive.dm @@ -7,9 +7,9 @@ datum/directive/terminations/financial_crisis datum/directive/terminations/financial_crisis/get_crew_to_terminate() var/list/civilians[0] var/list/candidates = civilian_positions - "Head of Personnel" - for(var/mob/living/carbon/human/H in player_list) - if (candidates.Find(H.mind.assigned_role)) - civilians+=H + for(var/mob/M in player_list) + if (candidates.Find(M.mind.assigned_role) && M.is_ready()) + civilians+=(M) return civilians datum/directive/terminations/financial_crisis/get_description() diff --git a/code/game/gamemodes/mutiny/directives/ipc_virus_directive.dm b/code/game/gamemodes/mutiny/directives/ipc_virus_directive.dm index 35380b3b4d9..76f6f1bd3dc 100644 --- a/code/game/gamemodes/mutiny/directives/ipc_virus_directive.dm +++ b/code/game/gamemodes/mutiny/directives/ipc_virus_directive.dm @@ -15,16 +15,16 @@ datum/directive/ipc_virus proc/get_ipcs() var/list/machines[0] - for(var/mob/living/carbon/human/H in player_list) - if (H.species.name == "Machine") - machines+=H + for(var/mob/M in player_list) + if (M.get_species() == "Machine" && M.is_ready()) + machines+=(M) return machines proc/get_roboticists() var/list/roboticists[0] - for(var/mob/living/carbon/human/H in player_list) - if (roboticist_roles.Find(H.mind.assigned_role)) - roboticists+=H + for(var/mob/M in player_list) + if (roboticist_roles.Find(M.mind.assigned_role) && M.is_ready()) + roboticists+=(M) return roboticists datum/directive/ipc_virus/initialize() @@ -37,7 +37,7 @@ datum/directive/ipc_virus/get_description() return {"
IPC units have been found to be infected with a violent and undesired virus in Virgus Ferrorus system. - Risk to NSS Exodus IPC units has not been assessed. Further information is classified. + Risk to [station_name()] IPC units has not been assessed. Further information is classified.
"} diff --git a/code/game/gamemodes/mutiny/directives/research_to_ripleys_directive.dm b/code/game/gamemodes/mutiny/directives/research_to_ripleys_directive.dm index 55c87e4a484..63657def192 100644 --- a/code/game/gamemodes/mutiny/directives/research_to_ripleys_directive.dm +++ b/code/game/gamemodes/mutiny/directives/research_to_ripleys_directive.dm @@ -4,11 +4,14 @@ datum/directive/research_to_ripleys var/list/ids_to_reassign = list() var/materials_shipped = 0 + proc/is_researcher(mob/M) + return M.mind.assigned_role in science_positions - "Research Director" + proc/get_researchers() var/list/researchers[0] - for(var/mob/living/carbon/human/H in player_list) - if (H.mind.assigned_role in science_positions - "Research Director") - researchers+=H + for(var/mob/M in player_list) + if (is_researcher(M) && M.is_ready()) + researchers+=(M) return researchers proc/count_researchers_reassigned() diff --git a/code/game/gamemodes/mutiny/directives/tau_ceti_needs_women_directive.dm b/code/game/gamemodes/mutiny/directives/tau_ceti_needs_women_directive.dm index d9f91a01d23..f7037955cb2 100644 --- a/code/game/gamemodes/mutiny/directives/tau_ceti_needs_women_directive.dm +++ b/code/game/gamemodes/mutiny/directives/tau_ceti_needs_women_directive.dm @@ -4,27 +4,32 @@ datum/directive/tau_ceti_needs_women proc/get_target_gender() if(!mode.head_loyalist) return FEMALE - return mode.head_loyalist.current.gender == FEMALE ? MALE : FEMALE + return mode.head_loyalist.current.get_gender() == FEMALE ? MALE : FEMALE + + proc/is_target_gender(mob/M) + var/species = M.get_species() + return species != "Diona" && M.get_gender() == get_target_gender() proc/get_crew_of_target_gender() var/list/targets[0] - for(var/mob/living/carbon/human/H in player_list) - if(H.species.name != "Machine" && H.gender == get_target_gender()) - targets+=H + for(var/mob/M in player_list) + if(is_target_gender(M) && !M.is_mechanical() && M.is_ready()) + targets+=(M) return targets proc/get_target_heads() var/list/heads[0] - for(var/mob/living/carbon/human/H in get_crew_of_target_gender()) - if(command_positions.Find(H.mind.assigned_role)) - heads+=H + for(var/mob/M in get_crew_of_target_gender()) + if(command_positions.Find(M.mind.assigned_role)) + heads+=(M) return heads proc/get_target_aliens() var/list/aliens[0] - for(var/mob/living/carbon/human/H in get_crew_of_target_gender()) - if (H.species.name == "Tajaran" || H.species.name == "Unathi" || H.species.name == "Skrell") - aliens+=H + for(var/mob/M in get_crew_of_target_gender()) + var/species = M.get_species() + if(species == "Tajaran" || species == "Unathi" || species == "Skrell") + aliens+=(M) return aliens proc/count_heads_reassigned() @@ -55,8 +60,17 @@ datum/directive/tau_ceti_needs_women/initialize() "Terminate employment of all [get_target_gender()] Skrell, Tajara, and Unathi.") datum/directive/tau_ceti_needs_women/meets_prerequisites() - var/list/targets = get_crew_of_target_gender() - return targets.len >= 3 + var/females = 0 + var/males = 0 + for(var/mob/M in player_list) + if(!M.is_mechanical() && M.get_species() != "Diona" && M.is_ready()) + var/gender = M.get_gender() + if(gender == MALE) + males++ + else if(gender == FEMALE) + females++ + + return males >= 2 && females >= 2 datum/directive/tau_ceti_needs_women/directives_complete() return command_targets.len == count_heads_reassigned() && alien_targets.len == 0 diff --git a/code/game/gamemodes/mutiny/directives/terminations_directive.dm b/code/game/gamemodes/mutiny/directives/terminations_directive.dm index 510e9d4aeb2..894db30ca40 100644 --- a/code/game/gamemodes/mutiny/directives/terminations_directive.dm +++ b/code/game/gamemodes/mutiny/directives/terminations_directive.dm @@ -22,11 +22,11 @@ datum/directive/terminations/directives_complete() return ids_to_terminate.len == 0 datum/directive/terminations/initialize() - for(var/mob/living/carbon/human/A in get_crew_to_terminate()) - var/datum/money_account/account = A.mind.initial_account + for(var/mob/living/carbon/human/H in get_crew_to_terminate()) + var/datum/money_account/account = H.mind.initial_account accounts_to_revoke["[account.account_number]"] = 0 accounts_to_suspend["[account.account_number]"] = account.suspended - ids_to_terminate+=A.wear_id + ids_to_terminate+=(H.wear_id) /hook/revoke_payroll/proc/payroll_directive(datum/money_account/account) var/datum/directive/terminations/D = get_directive("terminations") diff --git a/code/game/gamemodes/mutiny/directives/test_directive.dm b/code/game/gamemodes/mutiny/directives/test_directive.dm index cc1c4390ce7..7d2392acd64 100644 --- a/code/game/gamemodes/mutiny/directives/test_directive.dm +++ b/code/game/gamemodes/mutiny/directives/test_directive.dm @@ -7,8 +7,8 @@ datum/directive/terminations/test datum/directive/terminations/test/get_crew_to_terminate() var/list/uglies[0] - for(var/mob/living/carbon/human/H in player_list) - uglies+=H + for(var/mob/M in player_list) + uglies+=(M) return uglies datum/directive/terminations/test/get_description() diff --git a/code/game/gamemodes/mutiny/emergency_authentication_device.dm b/code/game/gamemodes/mutiny/emergency_authentication_device.dm index 1df5698004e..5bdcf27576e 100644 --- a/code/game/gamemodes/mutiny/emergency_authentication_device.dm +++ b/code/game/gamemodes/mutiny/emergency_authentication_device.dm @@ -43,7 +43,7 @@ return if(!mode.current_directive.directives_complete()) - state("Command aborted. Communication with CentComm is prohibited until Directive X has been completed.") + state("Command aborted. Communication with CentCom is prohibited until Directive X has been completed.") return check_key_existence() diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index bf5a642abea..efcd7d1f212 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -802,6 +802,17 @@ var/list/slot_equipment_priority = list( \ /mob/proc/is_active() return (0 >= usr.stat) +/mob/proc/is_mechanical() + if(mind && (mind.assigned_role == "Cyborg" || mind.assigned_role == "AI")) + return 1 + return istype(src, /mob/living/silicon) || get_species() == "Machine" + +/mob/proc/is_ready() + return !!client + +/mob/proc/get_gender() + return gender + /mob/proc/see(message) if(!is_active()) return 0 diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm index bf0e4e49420..30843add947 100644 --- a/code/modules/mob/new_player/new_player.dm +++ b/code/modules/mob/new_player/new_player.dm @@ -374,7 +374,8 @@ if(client.prefs.species) chosen_species = all_species[client.prefs.species] if(chosen_species) - if(is_alien_whitelisted(src, client.prefs.species) || !config.usealienwhitelist || !(chosen_species.flags & IS_WHITELISTED) || (client.holder.rights & R_ADMIN) )// Have to recheck admin due to no usr at roundstart. Latejoins are fine though. + // Have to recheck admin due to no usr at roundstart. Latejoins are fine though. + if(is_species_whitelisted(chosen_species) || has_admin_rights()) switch(chosen_species.name) if("Slime People") new_character = new /mob/living/carbon/human/slime(loc) @@ -477,3 +478,31 @@ src << browse(null, "window=preferences") //closes job selection src << browse(null, "window=mob_occupation") src << browse(null, "window=latechoices") //closes late job selection + + + proc/has_admin_rights() + return client.holder.rights & R_ADMIN + + proc/is_species_whitelisted(datum/species/S) + if(!S) return 1 + return is_alien_whitelisted(src, S.name) || !config.usealienwhitelist || !(S.flags & IS_WHITELISTED) + +/mob/new_player/get_species() + var/datum/species/chosen_species + if(client.prefs.species) + chosen_species = all_species[client.prefs.species] + + if(!chosen_species) + return "Human" + + if(is_species_whitelisted(chosen_species) || has_admin_rights()) + return chosen_species.name + + return "Human" + +/mob/new_player/get_gender() + if(!client || !client.prefs) ..() + return client.prefs.gender + +/mob/new_player/is_ready() + return ready && !!client