Merge pull request #4607 from AbbieFland/empty-gene-masks

Fixes rare empty gene_mask
This commit is contained in:
Anewbe
2018-01-22 15:01:56 -06:00
committed by GitHub
2 changed files with 4 additions and 4 deletions

View File

@@ -90,10 +90,10 @@ var/global/datum/controller/plants/plant_controller // Set in New().
var/list/plant_traits = ALL_GENES
while(plant_traits && plant_traits.len)
var/gene_tag = pick(plant_traits)
var/gene_mask = "[uppertext(num2hex(rand(0,255)))]"
var/gene_mask = "[uppertext(num2hex(rand(0,255), 2))]"
while(gene_mask in used_masks)
gene_mask = "[uppertext(num2hex(rand(0,255)))]"
gene_mask = "[uppertext(num2hex(rand(0,255), 2))]"
var/decl/plantgene/G

View File

@@ -34,10 +34,10 @@ var/global/datum/controller/xenobio/xenobio_controller // Set in New().
var/list/xenobio_traits = ALL_XENO_GENES
while(xenobio_traits && xenobio_traits.len)
var/gene_tag = pick(xenobio_traits)
var/gene_mask = "[uppertext(num2hex(rand(0,255)))]"
var/gene_mask = "[uppertext(num2hex(rand(0,255), 2))]"
while(gene_mask in used_masks)
gene_mask = "[uppertext(num2hex(rand(0,255)))]"
gene_mask = "[uppertext(num2hex(rand(0,255), 2))]"
used_masks += gene_mask
xenobio_traits -= gene_tag