Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Command Roles are properly restricted to just humans #15136

Merged
merged 1 commit into from Feb 3, 2016
Merged

Command Roles are properly restricted to just humans #15136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions code/modules/mob/living/carbon/human/species.dm
View file
Open in desktop
Expand Up @@ -117,6 +117,8 @@

//Please override this locally if you want to define when what species qualifies for what rank if human authority is enforced.
/datum/species/proc/qualifies_for_rank(rank, list/features)
if(rank in command_positions)
return 0
return 1

/datum/species/proc/update_base_icon_state(mob/living/carbon/human/H)
Expand Down
13 changes: 2 additions & 11 deletions code/modules/mob/living/carbon/human/species_types.dm
View file
Open in desktop
Expand Up @@ -18,8 +18,6 @@
return 1 //Pure humans are always allowed in all roles.

//Mutants are not allowed in most roles.
if(rank in command_positions)
return 0
if(rank in security_positions) //This list does not include lawyers.
return 0
if(rank in science_positions)
Expand All @@ -30,7 +28,7 @@
return 0
if(rank == "Quartermaster") //QM is not contained in command_positions but we still want to bar mutants from it.
return 0
return 1
return ..()


/datum/species/human/handle_chemicals(datum/reagent/chem, mob/living/carbon/human/H)
Expand Down Expand Up @@ -76,11 +74,6 @@ datum/species/human/spec_death(gibbed, mob/living/carbon/human/H)

return randname

/datum/species/lizard/qualifies_for_rank(rank, list/features)
if(rank in command_positions)
return 0
return 1

/datum/species/lizard/handle_speech(message)

if(copytext(message, 1, 2) != "*")
Expand Down Expand Up @@ -530,13 +523,11 @@ var/global/image/plasmaman_on_fire = image("icon"='icons/mob/OnFire.dmi', "icon_
return 0

/datum/species/plasmaman/qualifies_for_rank(rank, list/features)
if(rank in command_positions)
return 0
if(rank in security_positions)
return 0
if(rank == "Clown" || rank == "Mime")//No funny bussiness
return 0
return 1
return ..()



Expand Down