diff --git a/code/_compile_options.dm b/code/_compile_options.dm index 178b6b3c9e..85a353371e 100644 --- a/code/_compile_options.dm +++ b/code/_compile_options.dm @@ -35,6 +35,7 @@ //MINOR TWEAKS/MISC #define AGE_MIN 17 //youngest a character can be #define AGE_MAX 85 //oldest a character can be +#define WIZARD_AGE_MIN 30 //youngest a wizard can be #define SHOES_SLOWDOWN 0 //How much shoes slow you down by default. Negative values speed you up #define POCKET_STRIP_DELAY 40 //time taken (in deciseconds) to search somebody's pockets #define DOOR_CRUSH_DAMAGE 15 //the amount of damage that airlocks deal when they crush you diff --git a/code/game/gamemodes/antag_spawner.dm b/code/game/gamemodes/antag_spawner.dm index cba7ded631..da749b603a 100644 --- a/code/game/gamemodes/antag_spawner.dm +++ b/code/game/gamemodes/antag_spawner.dm @@ -117,6 +117,7 @@ M.mind.name = newname M.real_name = newname M.name = newname + M.age = rand(AGE_MIN, WIZARD_AGE_MIN - 1) M.dna.update_dna_identity() /obj/item/weapon/antag_spawner/contract/equip_antag(mob/target) @@ -154,7 +155,6 @@ /obj/item/weapon/antag_spawner/nuke_ops/attack_self(mob/user) if(!(check_usability(user))) return - to_chat(user, "You activate [src] and wait for confirmation.") var/list/nuke_candidates = pollCandidatesForMob("Do you want to play as a syndicate [borg_to_spawn ? "[lowertext(borg_to_spawn)] cyborg":"operative"]?", ROLE_OPERATIVE, null, ROLE_OPERATIVE, 150, POLL_IGNORE_SYNDICATE, src) if(nuke_candidates.len) diff --git a/code/game/gamemodes/wizard/wizard.dm b/code/game/gamemodes/wizard/wizard.dm index 35bccb692a..0d169e9024 100644 --- a/code/game/gamemodes/wizard/wizard.dm +++ b/code/game/gamemodes/wizard/wizard.dm @@ -110,6 +110,10 @@ wizard_mob.name = newname if(wizard_mob.mind) wizard_mob.mind.name = newname + + /* Wizards by nature cannot be too young. */ + if(wizard_mob.age < WIZARD_AGE_MIN) + wizard_mob.age = WIZARD_AGE_MIN return