diff --git a/code/controllers/configuration.dm b/code/controllers/configuration.dm index 39f9a770a4..4a1f519bc8 100644 --- a/code/controllers/configuration.dm +++ b/code/controllers/configuration.dm @@ -39,7 +39,7 @@ var/feature_object_spell_system = 0 //spawns a spellbook which gives object-type spells instead of verb-type spells for the wizard var/traitor_scaling = 0 //if amount of traitors scales based on amount of players var/objectives_disabled = 0 //if objectives are disabled or not - var/protect_roles_from_antagonist = 0// If security and such can be tratior/cult/other + var/protect_roles_from_antagonist = 0// If security and such can be traitor/cult/other var/continous_rounds = 1 // Gamemodes which end instantly will instead keep on going until the round ends by escape shuttle or nuke. var/allow_Metadata = 0 // Metadata is supported. var/popup_admin_pm = 0 //adminPMs to non-admins show in a pop-up 'reply' window when set to 1. diff --git a/code/datums/helper_datums/getrev.dm b/code/datums/helper_datums/getrev.dm index c25133b443..6d81631890 100644 --- a/code/datums/helper_datums/getrev.dm +++ b/code/datums/helper_datums/getrev.dm @@ -91,6 +91,6 @@ client/verb/showrevinfo() var/output = "Sorry, the revision info is unavailable." output = file2text("/home/bay12/live/data/gitcommit") output += "Current Infomational Settings:
" - output += "Protect Authority Roles From Tratior: [config.protect_roles_from_antagonist]
" + output += "Protect Authority Roles From Traitor: [config.protect_roles_from_antagonist]
" usr << browse(output,"window=revdata"); return diff --git a/code/datums/mind.dm b/code/datums/mind.dm index ce47a37a76..733c3e4e93 100644 --- a/code/datums/mind.dm +++ b/code/datums/mind.dm @@ -1049,7 +1049,7 @@ datum/mind special_role = "malfunction" current.icon_state = "ai-malf" - proc/make_Tratior() + proc/make_Traitor() if(!(src in ticker.mode.traitors)) ticker.mode.traitors += src special_role = "traitor" diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm index 22bdac77a9..fe252c3ab3 100644 --- a/code/game/gamemodes/game_mode.dm +++ b/code/game/gamemodes/game_mode.dm @@ -22,7 +22,7 @@ var/explosion_in_progress = 0 //sit back and relax var/list/datum/mind/modePlayer = new var/list/restricted_jobs = list() // Jobs it doesn't make sense to be. I.E chaplain or AI cultist - var/list/protected_jobs = list() // Jobs that can't be tratiors because + var/list/protected_jobs = list() // Jobs that can't be traitors because var/required_players = 0 var/required_players_secret = 0 //Minimum number of players for that game mode to be chose in Secret var/required_enemies = 0 diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index bc571b6c79..848f247db9 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -358,7 +358,7 @@ datum/objective/escape if(!location) return 0 - if(istype(location, /turf/simulated/shuttle/floor4)) // Fails tratiors if they are in the shuttle brig -- Polymorph + if(istype(location, /turf/simulated/shuttle/floor4)) // Fails traitors if they are in the shuttle brig -- Polymorph if(istype(owner.current, /mob/living/carbon)) var/mob/living/carbon/C = owner.current if (!C.handcuffed) diff --git a/code/modules/admin/verbs/one_click_antag.dm b/code/modules/admin/verbs/one_click_antag.dm index 6f4ee9340c..81fcb93546 100644 --- a/code/modules/admin/verbs/one_click_antag.dm +++ b/code/modules/admin/verbs/one_click_antag.dm @@ -73,11 +73,11 @@ client/proc/one_click_antag() candidates += applicant if(candidates.len) - var/numTratiors = min(candidates.len, 3) + var/numTraitors = min(candidates.len, 3) - for(var/i = 0, i