diff --git a/code/_globalvars/genetics.dm b/code/_globalvars/genetics.dm index 68d81575f23..948d44f5895 100644 --- a/code/_globalvars/genetics.dm +++ b/code/_globalvars/genetics.dm @@ -7,7 +7,6 @@ GLOBAL_VAR_INIT(teleblock, 0) GLOBAL_VAR_INIT(fireblock, 0) GLOBAL_VAR_INIT(xrayblock, 0) GLOBAL_VAR_INIT(clumsyblock, 0) -GLOBAL_VAR_INIT(fakeblock, 0) GLOBAL_VAR_INIT(coughblock, 0) GLOBAL_VAR_INIT(glassesblock, 0) GLOBAL_VAR_INIT(epilepsyblock, 0) @@ -68,3 +67,12 @@ GLOBAL_VAR_INIT(dizzyblock, 0) GLOBAL_LIST_EMPTY(reg_dna) GLOBAL_LIST_EMPTY(global_mutations) + +// Currently empty blocks, you can use these for your own powers +GLOBAL_VAR_INIT(fakeblock1, 0) +GLOBAL_VAR_INIT(fakeblock2, 0) +GLOBAL_VAR_INIT(fakeblock3, 0) +GLOBAL_VAR_INIT(fakeblock4, 0) +GLOBAL_VAR_INIT(fakeblock5, 0) +GLOBAL_VAR_INIT(fakeblock6, 0) + diff --git a/code/game/dna/genes/gene.dm b/code/game/dna/genes/gene.dm index e326822fc5d..58aa012aa5e 100644 --- a/code/game/dna/genes/gene.dm +++ b/code/game/dna/genes/gene.dm @@ -158,12 +158,40 @@ to_chat(mutant, span_warning("[msg]")) -/datum/dna/gene/basic/fake // placeholder for empty FAKE gene +// placeholders for empty FAKE genes +// you can remake these into your own powers + +/datum/dna/gene/basic/fake name = "Ordinary Gene" desc = "Just another link in the DNA strand." -/datum/dna/gene/basic/fake/New() +/datum/dna/gene/basic/fake/fake1/New() + ..() + block = GLOB.fakeblock1 + + +/datum/dna/gene/basic/fake/fake2/New() + ..() + block = GLOB.fakeblock2 + + +/datum/dna/gene/basic/fake/fake3/New() + ..() + block = GLOB.fakeblock3 + + +/datum/dna/gene/basic/fake/fake4/New() + ..() + block = GLOB.fakeblock4 + + +/datum/dna/gene/basic/fake/fake5/New() + ..() + block = GLOB.fakeblock5 + + +/datum/dna/gene/basic/fake/fake6/New() ..() - block = GLOB.fakeblock + block = GLOB.fakeblock6 diff --git a/code/game/gamemodes/setupgame.dm b/code/game/gamemodes/setupgame.dm index 179dd234abf..92eabbdcfed 100644 --- a/code/game/gamemodes/setupgame.dm +++ b/code/game/gamemodes/setupgame.dm @@ -1,5 +1,5 @@ -/proc/getAssignedBlock(var/name,var/list/blocksLeft, var/activity_bounds=DNA_DEFAULT_BOUNDS, var/good=0) - if(blocksLeft.len==0) +/proc/getAssignedBlock(name, list/blocksLeft, activity_bounds = DNA_DEFAULT_BOUNDS, good = FALSE) + if(!length(blocksLeft)) warning("[name]: No more blocks left to assign!") return 0 var/assigned = pick(blocksLeft) @@ -8,12 +8,11 @@ GLOB.good_blocks += assigned else GLOB.bad_blocks += assigned - GLOB.assigned_blocks[assigned]=name - GLOB.dna_activity_bounds[assigned]=activity_bounds - //Debug message_admins("[name] assigned to block #[assigned].") -// testing("[name] assigned to block #[assigned].") + GLOB.assigned_blocks[assigned] = name + GLOB.dna_activity_bounds[assigned] = activity_bounds return assigned + /proc/setupgenetics() if(prob(50)) @@ -21,86 +20,86 @@ if(prob(75)) GLOB.diffmut = rand(0,20) - -//Thanks to nexis for the fancy code -// BITCH I AIN'T DONE YET - // SE blocks to assign. - var/list/numsToAssign=new() - for(var/i=1;i