cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2850 from comma/master

Browse Source 
Couple of fixes
This commit is contained in:
Jim "Apples"
2013-05-25 06:12:16 -07:00
parent 4f293e5000 e197799c46
commit d8ed2d2b29
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
code/game/jobs/job/job.dm
View File

@@ -4,8 +4,8 @@
var/title = "NOPE" var/title = "NOPE"
//Job access. The use of minimal_access or access is determined by a config setting: config.jobs_have_minimal_access //Job access. The use of minimal_access or access is determined by a config setting: config.jobs_have_minimal_access
var/minimal_access = list() //Useful for servers which prefer to only have access given to the places a job absolutely needs (Larger server population) var/list/minimal_access = list() //Useful for servers which prefer to only have access given to the places a job absolutely needs (Larger server population)
var/access = list() //Useful for servers which either have fewer players, so each person needs to fill more than one role, or servers which like to give more access, so players can't hide forever in their super secure departments (I'm looking at you, chemistry!) var/list/access = list() //Useful for servers which either have fewer players, so each person needs to fill more than one role, or servers which like to give more access, so players can't hide forever in their super secure departments (I'm looking at you, chemistry!)
//Bitflags for the job //Bitflags for the job
var/flag = 0 var/flag = 0
@@ -46,12 +46,12 @@
/datum/job/proc/get_access() /datum/job/proc/get_access()
if(!config) //Needed for robots. if(!config) //Needed for robots.
return src.minimal_access return src.minimal_access.Copy()
if(config.jobs_have_minimal_access) if(config.jobs_have_minimal_access)
return src.minimal_access return src.minimal_access.Copy()
else else
return src.access return src.access.Copy()
//If the configuration option is set to require players to be logged as old enough to play certain jobs, then this proc checks that they are, otherwise it just returns 1 //If the configuration option is set to require players to be logged as old enough to play certain jobs, then this proc checks that they are, otherwise it just returns 1
/datum/job/proc/player_old_enough(client/C) /datum/job/proc/player_old_enough(client/C)

2
code/modules/mob/living/silicon/robot/robot.dm
View File

@@ -210,7 +210,7 @@
/mob/living/silicon/robot/verb/Namepick() /mob/living/silicon/robot/verb/Namepick()
if(custom_name) if(custom_name)
return 0 return 0
spawn(0)
var/newname var/newname
newname = input(src,"You are a robot. Enter a name, or leave blank for the default name.", "Name change","") as text newname = input(src,"You are a robot. Enter a name, or leave blank for the default name.", "Name change","") as text
if (newname != "") if (newname != "")