cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-29 16:18:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10209 from Ricotez/human_mutantparts

Browse Source 
Gives humans two types of mutant accessories: ears and (human-specific) tails.
This commit is contained in:
Razharas
2015-07-03 08:36:36 +03:00
parent 6522b8b824 79a41996f5
commit b1bf4d04fe
18 changed files with 353 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/controllers/configuration.dm
+3
View File
@@ -106,6 +106,7 @@
var/shuttle_refuel_delay = 12000
var/show_game_type_odds = 0 //if set this allows players to see the odds of each roundtype on the get revision screen
var/mutant_races = 0 //players can choose their mutant race before joining the game
var/mutant_humans = 0 //players can pick mutant bodyparts for humans before joining the game
var/no_summon_guns //No
var/no_summon_magic //Fun
@@ -480,6 +481,8 @@
config.silicon_max_law_amount = text2num(value)
if("join_with_mutant_race")
config.mutant_races = 1
if("join_with_mutant_humans")
config.mutant_humans = 1
if("assistant_cap")
config.assistant_cap = text2num(value)
if("starlight")
code/controllers/subsystem/jobs.dm
+3 -3
View File
@@ -86,7 +86,7 @@ var/datum/subsystem/job/SSjob
if(player.mind && job.title in player.mind.restricted_roles)
Debug("FOC incompatible with antagonist role, Player: [player]")
continue
if(config.enforce_human_authority && (job.title in command_positions) && player.client.prefs.pref_species.id != "human")
if(config.enforce_human_authority && !player.client.prefs.pref_species.qualifies_for_rank(job.title, player.client.prefs.features))
Debug("FOC non-human failed, Player: [player]")
continue
if(player.client.prefs.GetJobDepartment(job, level) & job.flag)
@@ -118,7 +118,7 @@ var/datum/subsystem/job/SSjob
Debug("GRJ incompatible with antagonist role, Player: [player], Job: [job.title]")
continue
if(config.enforce_human_authority && (job.title in command_positions) && player.client.prefs.pref_species.id != "human")
if(config.enforce_human_authority && !player.client.prefs.pref_species.qualifies_for_rank(job.title, player.client.prefs.features))
Debug("GRJ non-human failed, Player: [player]")
continue
@@ -291,7 +291,7 @@ var/datum/subsystem/job/SSjob
Debug("DO incompatible with antagonist role, Player: [player], Job:[job.title]")
continue
if(config.enforce_human_authority && (job.title in command_positions) && player.client.prefs.pref_species.id != "human")
if(config.enforce_human_authority && !player.client.prefs.pref_species.qualifies_for_rank(job.title, player.client.prefs.features))
Debug("DO non-human failed, Player: [player], Job:[job.title]")
continue