Merge pull request #213 from alex-gh/mutiny_fixes2

Mutiny fixes? 3
This commit is contained in:
alex-gh
2014-05-21 16:33:06 +02:00
9 changed files with 25 additions and 25 deletions
@@ -8,7 +8,7 @@ datum/directive/terminations/alien_fraud/get_crew_to_terminate()
var/list/aliens[0]
for(var/mob/living/carbon/human/H in player_list)
if (H.species.name == "Tajaran" || H.species.name == "Unathi")
aliens.Add(H)
aliens+=H
return aliens
datum/directive/terminations/alien_fraud/get_description()
@@ -21,9 +21,9 @@ datum/directive/bluespace_contagion/initialize()
break
var/mob/living/carbon/human/candidate = pick(candidates)
candidates.Remove(candidate)
infected.Add(candidate)
infected_names.Add("[candidate.mind.assigned_role] [candidate.mind.name]")
candidates-=candidate
infected+=candidate
infected_names+="[candidate.mind.assigned_role] [candidate.mind.name]"
special_orders = list(
"Quarantine these personnel: [list2text(infected_names, ", ")].",
@@ -41,5 +41,5 @@ datum/directive/bluespace_contagion/directives_complete()
if(!D) return 1
if(deceased in D.infected)
D.infected.Remove(deceased)
D.infected-=deceased
return 1
@@ -9,7 +9,7 @@ datum/directive/terminations/financial_crisis/get_crew_to_terminate()
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.Add(H)
civilians+=H
return civilians
datum/directive/terminations/financial_crisis/get_description()
@@ -17,21 +17,21 @@ datum/directive/ipc_virus
var/list/machines[0]
for(var/mob/living/carbon/human/H in player_list)
if (H.species.name == "Machine")
machines.Add(H)
machines+=H
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.Add(H)
roboticists+=H
return roboticists
datum/directive/ipc_virus/initialize()
for(var/mob/living/carbon/human/H in get_ipcs())
brains_to_enslave.Add(H.mind)
cyborgs_to_make.Add(H.mind)
ids_to_terminate.Add(H.wear_id)
brains_to_enslave+=H.mind
cyborgs_to_make+=H.mind
ids_to_terminate+=H.wear_id
datum/directive/ipc_virus/get_description()
return {"
@@ -54,7 +54,7 @@ datum/directive/ipc_virus/directives_complete()
if (!D) return 1
if(D.brains_to_enslave.Find(B.brainmob.mind))
D.brains_to_enslave.Remove(B.brainmob.mind)
D.brains_to_enslave-=B.brainmob.mind
return 1
@@ -63,13 +63,13 @@ datum/directive/ipc_virus/directives_complete()
if (!D) return 1
if(D.cyborgs_to_make.Find(cyborg.mind))
D.cyborgs_to_make.Remove(cyborg.mind)
D.cyborgs_to_make-=cyborg.mind
// In case something glitchy happened and the victim got
// borged without us tracking the brain removal, go ahead
// and update that list too.
if(D.brains_to_enslave.Find(cyborg.mind))
D.brains_to_enslave.Remove(cyborg.mind)
D.brains_to_enslave-=cyborg.mind
return 1
@@ -78,6 +78,6 @@ datum/directive/ipc_virus/directives_complete()
if (!D) return 1
if(D.ids_to_terminate && D.ids_to_terminate.Find(id))
D.ids_to_terminate.Remove(id)
D.ids_to_terminate-=id
return 1
@@ -8,7 +8,7 @@ datum/directive/research_to_ripleys
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.Add(H)
researchers+=H
return researchers
proc/count_researchers_reassigned()
@@ -10,21 +10,21 @@ datum/directive/tau_ceti_needs_women
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.Add(H)
targets+=H
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.Add(H)
heads+=H
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.Add(H)
aliens+=H
return aliens
proc/count_heads_reassigned()
@@ -48,7 +48,7 @@ datum/directive/tau_ceti_needs_women/initialize()
command_targets[H.wear_id] = 0
for(var/mob/living/carbon/human/H in get_target_aliens())
alien_targets.Add(H.wear_id)
alien_targets+=H.wear_id
special_orders = list(
"Remove [get_target_gender()] personnel from Command positions.",
@@ -75,7 +75,7 @@ datum/directive/tau_ceti_needs_women/directives_complete()
if (!D) return 1
if(D.alien_targets && D.alien_targets.Find(id))
D.alien_targets.Remove(id)
D.alien_targets-=id
if(D.command_targets && D.command_targets.Find(id))
D.command_targets[id] = 1
@@ -26,7 +26,7 @@ datum/directive/terminations/initialize()
var/datum/money_account/account = A.mind.initial_account
accounts_to_revoke["[account.account_number]"] = 0
accounts_to_suspend["[account.account_number]"] = account.suspended
ids_to_terminate.Add(A.wear_id)
ids_to_terminate+=A.wear_id
/hook/revoke_payroll/proc/payroll_directive(datum/money_account/account)
var/datum/directive/terminations/D = get_directive("terminations")
@@ -51,6 +51,6 @@ datum/directive/terminations/initialize()
if (!D) return 1
if(D.ids_to_terminate && D.ids_to_terminate.Find(id))
D.ids_to_terminate.Remove(id)
D.ids_to_terminate-=id
return 1
@@ -8,7 +8,7 @@ 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.Add(H)
uglies+=H
return uglies
datum/directive/terminations/test/get_description()
+1 -1
View File
@@ -2,7 +2,7 @@
var/datum/game_mode/mutiny/mode = get_mutiny_mode()
if (!mode) return 1
mode.body_count.Add(deceased.mind)
mode.body_count+=deceased.mind
return 1
/hook/clone/proc/update_icon(mob/living/carbon/human/H)