This commit is contained in:
Fox McCloud
2018-05-14 20:40:39 -04:00
parent f2bc448d02
commit 042ee7b77b
4 changed files with 6 additions and 6 deletions
+1 -1
View File
@@ -525,7 +525,7 @@
new_objective = new objective_path
new_objective.owner = src
new_objective:target = new_target:mind
//Will display as special role if the target is set as MODE. Ninjas/commandos/nuke ops.
//Will display as special role if assigned mode is equal to special role.. Ninjas/commandos/nuke ops.
new_objective.explanation_text = "[objective_type] [new_target:real_name], the [new_target:mind:assigned_role == new_target:mind:special_role ? (new_target:mind:special_role) : (new_target:mind:assigned_role)]."
if("destroy")
+3 -3
View File
@@ -91,7 +91,7 @@
var/list/dudes = list()
for(var/mob/living/carbon/human/man in player_list)
if(!man.mind) continue
if(man.mind.assigned_role=="MODE") continue
if(man.mind.assigned_role == man.mind.special_role) continue
dudes += man
if(dudes.len==0)
return null
@@ -210,14 +210,14 @@
var/prob_right_job = rand(prob_correct_job_lower, prob_correct_job_higher)
if(prob(prob_right_job))
if(correct_person)
if(correct_person:assigned_role=="MODE")
if(correct_person:assigned_role == correct_person:special_role)
changeling_job = pick(joblist)
else
changeling_job = correct_person:assigned_role
else
changeling_job = pick(joblist)
if(prob(prob_right_dude) && ticker.mode == "changeling")
if(correct_person:assigned_role=="MODE")
if(correct_person:assigned_role == correct_person:special_role)
changeling_name = correct_person:current
else
changeling_name = src.pick_mob()
+1 -1
View File
@@ -49,7 +49,7 @@
if(!employee.job_objectives.len)//If the employee had no objectives, don't need to process this.
continue
if(employee.assigned_role == employee.special_role)//If the employee is a gamemode thing, skip.
if(employee.assigned_role == employee.special_role) //If the character is an offstation character, skip them.
continue
var/tasks_completed=0
+1 -1
View File
@@ -429,7 +429,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
//Announces the character on all the systems, based on the record.
if(!issilicon(new_character))//If they are not a cyborg/AI.
if(!record_found && new_character.mind.assigned_role != new_character.mind.special_role)//If there are no records for them. If they have a record, this info is already in there. MODE people are not announced anyway.
if(!record_found && new_character.mind.assigned_role != new_character.mind.special_role)//If there are no records for them. If they have a record, this info is already in there. Offstation special characters announced anyway.
//Power to the user!
if(alert(new_character,"Warning: No data core entry detected. Would you like to announce the arrival of this character by adding them to various databases, such as medical records?",,"No","Yes")=="Yes")
data_core.manifest_inject(new_character)