mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-13 03:33:21 +00:00
Final updates:
Fingerprints done. A mob's be_syndicate is a direct copy of their preferences.
This commit is contained in:
@@ -176,7 +176,7 @@ obj/machinery/computer/forensic_scanning
|
|||||||
misc[i] = sum_list //Store it!
|
misc[i] = sum_list //Store it!
|
||||||
break //We found it, we're done here.
|
break //We found it, we're done here.
|
||||||
if(!merged) //Nope! Guess we have to add it!
|
if(!merged) //Nope! Guess we have to add it!
|
||||||
var/list/templist[4]
|
var/list/templist[3]
|
||||||
templist[1] = A
|
templist[1] = A
|
||||||
templist[2] = A.suit_fibers
|
templist[2] = A.suit_fibers
|
||||||
templist[3] = A.blood_DNA
|
templist[3] = A.blood_DNA
|
||||||
|
|||||||
@@ -59,9 +59,6 @@
|
|||||||
|
|
||||||
/datum/game_mode/traitor/autotraitor/post_setup()
|
/datum/game_mode/traitor/autotraitor/post_setup()
|
||||||
..()
|
..()
|
||||||
for(var/mob/T in world)
|
|
||||||
if(T.mind in possible_traitors)
|
|
||||||
T.be_syndicate = 1
|
|
||||||
abandon_allowed = 1
|
abandon_allowed = 1
|
||||||
traitorcheckloop()
|
traitorcheckloop()
|
||||||
|
|
||||||
|
|||||||
@@ -183,7 +183,7 @@
|
|||||||
|
|
||||||
for(var/mob/living/carbon/human/player in world)
|
for(var/mob/living/carbon/human/player in world)
|
||||||
if(player.client)
|
if(player.client)
|
||||||
if(player.be_syndicate)
|
if(player.be_syndicate & BE_REV)
|
||||||
candidates += player.mind
|
candidates += player.mind
|
||||||
|
|
||||||
if(candidates.len < 1)
|
if(candidates.len < 1)
|
||||||
|
|||||||
@@ -354,7 +354,6 @@
|
|||||||
proc/create_character()
|
proc/create_character()
|
||||||
spawning = 1
|
spawning = 1
|
||||||
var/mob/living/carbon/human/new_character = new(loc)
|
var/mob/living/carbon/human/new_character = new(loc)
|
||||||
new_character.be_syndicate = src.preferences.be_special
|
|
||||||
|
|
||||||
close_spawn_windows()
|
close_spawn_windows()
|
||||||
|
|
||||||
|
|||||||
@@ -670,6 +670,7 @@ datum/preferences
|
|||||||
|
|
||||||
character.age = age
|
character.age = age
|
||||||
character.dna.b_type = b_type
|
character.dna.b_type = b_type
|
||||||
|
character.be_syndicate = be_special
|
||||||
|
|
||||||
character.r_eyes = r_eyes
|
character.r_eyes = r_eyes
|
||||||
character.g_eyes = g_eyes
|
character.g_eyes = g_eyes
|
||||||
|
|||||||
Reference in New Issue
Block a user