cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 19:22:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Spelling correction: tratior and Tratior to traitor and Traitor

Browse Source
This commit is contained in:
Ravensdale
2014-04-22 01:12:17 -07:00
parent 223aa25695
commit a72f8d3ded
6 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/controllers/configuration.dm
View File

@@ -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/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/traitor_scaling = 0 //if amount of traitors scales based on amount of players
var/objectives_disabled = 0 //if objectives are disabled or not 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/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/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. var/popup_admin_pm = 0 //adminPMs to non-admins show in a pop-up 'reply' window when set to 1.

2
code/datums/helper_datums/getrev.dm
View File

@@ -91,6 +91,6 @@ client/verb/showrevinfo()
var/output = "Sorry, the revision info is unavailable." var/output = "Sorry, the revision info is unavailable."
output = file2text("/home/bay12/live/data/gitcommit") output = file2text("/home/bay12/live/data/gitcommit")
output += "Current Infomational Settings: <br>" output += "Current Infomational Settings: <br>"
output += "Protect Authority Roles From Tratior: [config.protect_roles_from_antagonist]<br>" output += "Protect Authority Roles From Traitor: [config.protect_roles_from_antagonist]<br>"
usr << browse(output,"window=revdata"); usr << browse(output,"window=revdata");
return return

2
code/datums/mind.dm
View File

@@ -1049,7 +1049,7 @@ datum/mind
special_role = "malfunction" special_role = "malfunction"
current.icon_state = "ai-malf" current.icon_state = "ai-malf"
proc/make_Tratior() proc/make_Traitor()
if(!(src in ticker.mode.traitors)) if(!(src in ticker.mode.traitors))
ticker.mode.traitors += src ticker.mode.traitors += src
special_role = "traitor" special_role = "traitor"

2
code/game/gamemodes/game_mode.dm
View File

@@ -22,7 +22,7 @@
var/explosion_in_progress = 0 //sit back and relax var/explosion_in_progress = 0 //sit back and relax
var/list/datum/mind/modePlayer = new 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/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 = 0
var/required_players_secret = 0 //Minimum number of players for that game mode to be chose in Secret var/required_players_secret = 0 //Minimum number of players for that game mode to be chose in Secret
var/required_enemies = 0 var/required_enemies = 0

2
code/game/gamemodes/objective.dm
View File

@@ -358,7 +358,7 @@ datum/objective/escape
if(!location) if(!location)
return 0 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)) if(istype(owner.current, /mob/living/carbon))
var/mob/living/carbon/C = owner.current var/mob/living/carbon/C = owner.current
if (!C.handcuffed) if (!C.handcuffed)

6
code/modules/admin/verbs/one_click_antag.dm
View File

@@ -73,11 +73,11 @@ client/proc/one_click_antag()
candidates += applicant candidates += applicant
if(candidates.len) if(candidates.len)
var/numTratiors = min(candidates.len, 3) var/numTraitors = min(candidates.len, 3)
for(var/i = 0, i<numTratiors, i++) for(var/i = 0, i<numTraitors, i++)
H = pick(candidates) H = pick(candidates)
H.mind.make_Tratior() H.mind.make_Traitor()
candidates.Remove(H) candidates.Remove(H)
return 1 return 1