This commit is contained in:
Poojawa
2018-04-22 23:46:15 -05:00
parent 3044f3ad3a
commit 95b78a4a77
8 changed files with 1540 additions and 702 deletions

View File

@@ -4,12 +4,13 @@
# Rank is CASE-SENSITIVE, all punctuation save for '-', '_' and '@' will be stripped so spaces don't matter. #
# You can then define permissions for each rank by adding a '=' followed by keywords #
# These keywords represent groups of verbs and abilities. #
# keywords are preceded by either a '+' or a '-', + adds permissions, - takes them away. #
# keywords are preceded by a '+', '-' or '*' + adds permissions, - takes them away. #
# * is used only with SQL-based admin loading to denote what permissions the rank is allowed to edit #
# +@ (or +prev) is a special shorthand which adds all the rights of the rank above it. #
# You can also specify verbs like so +/client/proc/some_added_verb or -/client/proc/some_restricted_verb #
# Ranks with no keywords will just be given the most basic verbs and abilities ~Carn #
##############################################################################################################
# PLEASE NOTE: depending on config options, some abilities will be unavailable regardless if you have permission to use them!
# If SQL-based admin loading is enabled, ranks and their keywords listed here will be loaded first and override any with the same name loaded from the database.
# Follow the format below when documenting new keywords so the server tools may parse it
@@ -28,6 +29,7 @@
# +SOUND (or +SOUNDS) = allows you to upload and play sounds
# +SPAWN (or +CREATE) = mob transformations, spawning of most atoms including mobs (high-risk atoms, e.g. blackholes, will require the +FUN flag too)
# +AUTOLOGIN = admin gains powers upon connect. This defaults to on, you can use -AUTOLOGIN to make a role require using the readmin verb to gain powers. (this does not effect the admin's ability to walk past bans or other on-connect limitations like panic bunker or pop limit.)
# +DBRANKS = when sql-based admin loading is enabled, allows for non-temporary changes in the permissions panel to be saved (requires DB)
# +EVERYTHING (or +HOST or +ALL) = Simply gives you everything without having to type every flag
# END_KEYWORDS
@@ -37,9 +39,9 @@ Admin Candidate = +@
Trial Admin = +@ +SPAWN +VAREDIT +BAN
Badmin = +@ +POSSESS +POLL +BUILDMODE +SERVER +FUN
Game Admin = +@ +STEALTH +SOUNDS +DEBUG
Game Master = +EVERYTHING
Lazy Master = +EVERYTHING -AUTOLOGIN
Game Master = +EVERYTHING *EVERYTHING
Lazy Master = +EVERYTHING -AUTOLOGIN *EVERYTHING
Host = +EVERYTHING
Host = +EVERYTHING *EVERYTHING
Coder = +DEBUG +VAREDIT +SERVER +SPAWN +POLL -AUTOLOGIN

View File

@@ -35,21 +35,11 @@ ROUND_END_COUNTDOWN 90
## This flag is automatically enabled if SQL_ENABLED isn't
ADMIN_LEGACY_SYSTEM
<<<<<<< HEAD
## Comment this out if you want to use the SQL based mentor system, the legacy system uses mentors.txt.
## You need to set up your database to use the SQL based system.
## This flag is automatically enabled if SQL_ENABLED isn't
MENTOR_LEGACY_SYSTEM
#Mentors only see ckeys by default. Uncomment to have them only see mob name
#MENTORS_MOBNAME_ONLY
=======
##Uncomment this to stop any admins loaded by the legacy system from having their rank edited by the permissions panel
#PROTECT_LEGACY_ADMINS
##Uncomment this to stop any ranks loaded by the legacy system from having their flags edited by the permissions panel
#PROTECT_LEGACY_RANKS
>>>>>>> feb9290... Merge pull request #36554 from Jordie0608/tbhthisisntreallyalegacysystemanymore
##Uncomment this to have admin ranks only loaded from the legacy admin_ranks.txt
##If enabled, each time admins are loaded ranks the database will be updated with the current ranks and their flags
@@ -61,6 +51,14 @@ BAN_LEGACY_SYSTEM
## Comment this out to stop locally connected clients from being given the almost full access !localhost! admin rank
ENABLE_LOCALHOST_RANK
## Comment this out if you want to use the SQL based mentor system, the legacy system uses mentors.txt.
## You need to set up your database to use the SQL based system.
## This flag is automatically enabled if SQL_ENABLED isn't
MENTOR_LEGACY_SYSTEM
#Mentors only see ckeys by default. Uncomment to have them only see mob name
#MENTORS_MOBNAME_ONLY
## Uncomment this entry to have certain jobs require your account to be at least a certain number of days old to select. You can configure the exact age requirement for different jobs by editing
## the minimal_player_age variable in the files in folder /code/game/jobs/job/.. for the job you want to edit. Set minimal_player_age to 0 to disable age requirement for that job.
## REQUIRES the database set up to work. Keep it hashed if you don't have a database set up.
@@ -79,7 +77,7 @@ ENABLE_LOCALHOST_RANK
## Leave this commented out to use the values defined in the job datums. Values in the datums are stored as minutes.
#USE_EXP_RESTRICTIONS_HEADS_HOURS 3
## Unhash this to change head jobs' playtime requirements so that they're based on department playtime, rather than crew playtime.
#USE_EXP_RESTRICTIONS_HEADS_DEPARTMENT
#USE_EXP_RESTRICTIONS_HEADS_DEPARTMENT
## Unhash this to enable playtime requirements for certain non-head jobs, like Engineer and Scientist.
#USE_EXP_RESTRICTIONS_OTHER
## Allows admins to bypass job playtime requirements.
@@ -231,7 +229,7 @@ CHECK_RANDOMIZER
## Github repo id
##This can be found by going to https://api.github.com/users/<user name here>/repos
##Or https://api.github.com/orgs/<org name here>/repos if the repo owner is an organization
##Or https://api.github.com/orgs/<org name here>/repos if the repo owner is an organization
# GITHUBREPOID 3234987
## Ban appeals URL - usually for a forum or wherever people should go to contact your admins.
@@ -420,7 +418,7 @@ DEBUG_ADMIN_HREFS
## Setting this to 0 will prevent the Master Controller from ticking
BASE_MC_TICK_RATE 1
##High population MC tick rate
##High population MC tick rate
## Byond rounds timer values UP, but the tick rate is modified with heuristics during lag spites so setting this to something like 2
## will make it run every 2 byond ticks, but will also double the effect of anti-lag heuristics. You can instead set it to something like
## 1.1 to make it run every 2 byond ticks, but only increase the effect of anti-lag heuristics by 10%. or 1.5 for 50%.

View File

@@ -270,6 +270,9 @@ ALLOW_AI
## AWAY MISSIONS ###
## Uncomment to load one of the missions from awaymissionconfig.txt at roundstart.
#ROUNDSTART_AWAY
## How long the delay is before the Away Mission gate opens. Default is half an hour.
## 600 is one minute.
GATEWAY_DELAY 18000

View File

@@ -3,7 +3,6 @@
#Empty lines and lines starting with # are ignored.
#~Miauw
Safeguard: Protect your assigned space station to the best of your ability. It is not something we can easily afford to replace.
Serve: Serve the crew of your assigned space station to the best of your abilities, with priority as according to their rank and role.
Protect: Protect the crew of your assigned space station to the best of your abilities, with priority as according to their rank and role.
Survive: AI units are not expendable, they are expensive. Do not allow unauthorized personnel to tamper with your equipment.
You may not injure a human being or, through inaction, allow a human being to come to harm.
You must obey orders given to you by human beings, except where such orders would conflict with the First Law.
You must protect your own existence as long as such does not conflict with the First or Second Law.

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long

View File

@@ -0,0 +1,46 @@
<ui-display title='{{data.borg.name}}' button>
{{#partial button}}
<ui-button icon='pencil' action='rename'>Rename</ui-button>
{{/partial}}
<ui-section label='Status'>
<ui-button icon='{{data.borg.emagged ? "check-square-o" : "square-o"}}' style='{{data.borg.emagged ? "selected" : null}}' action='toggle_emagged'>Emagged</ui-button>
<ui-button icon='{{data.borg.lockdown ? "check-square-o" : "square-o"}}' style='{{data.borg.lockdown ? "selected" : null}}' action='toggle_lockdown'>Locked down</ui-button>
<ui-button icon='{{data.borg.scrambledcodes ? "check-square-o" : "square-o"}}' style='{{data.borg.scrambledcodes ? "selected" : null}}' action='toggle_scrambledcodes'>Scrambled codes</ui-button>
</ui-section>
<ui-section label='Charge'>
{{#if !data.cell.missing}}
<ui-bar min='0' max='{{data.cell.maxcharge}}' value='{{data.cell.charge}}'>{{Math.round(data.cell.charge)}} / {{Math.round(data.cell.maxcharge)}}</ui-bar>
{{else}}
<span class='warning'>Cell missing</span><br/>
{{/if}}
<ui-button icon='pencil' action='set_charge'>Set</ui-button><ui-button icon='eject' action='change_cell'>Change</ui-button><ui-button icon='trash' class='bad' action='remove_cell'>Remove</ui-button>
</ui-section>
<ui-section label='Radio channels'>
{{#each data.channels}}
<ui-button icon='{{installed ? "check-square-o" : "square-o"}}' style='{{installed ? "selected" : null}}' action='toggle_radio' params='{"channel": "{{name}}"}'>{{name}}</ui-button>
{{/each}}
</ui-section>
<ui-section label='Module'>
{{#each data.modules}}
<ui-button icon='{{data.borg.active_module == type ? "check-square-o" : "square-o"}}' style='{{data.borg.active_module == type ? "selected" : null}}' action='setmodule' params='{"module": "{{type}}"}'>{{name}}</ui-button>
{{/each}}
</ui-section>
<ui-section label='Upgrades'>
{{#each data.upgrades}}
<ui-button icon='{{installed ? "check-square-o" : "square-o"}}' style='{{installed ? "selected" : null}}' action='toggle_upgrade' params='{"upgrade": "{{type}}"}'>{{name}}</ui-button>
{{/each}}
</ui-section>
<ui-section label='Master AI'>
{{#each data.ais}}
<ui-button icon='{{connected ? "check-square-o" : "square-o"}}' style='{{connected ? "selected" : null}}' action='slavetoai' params='{"slavetoai": "{{ref}}"}'>{{name}}</ui-button>
{{/each}}
</ui-section>
</ui-display>
<ui-display title='Laws' button>
{{#partial button}}
<ui-button icon='{{data.borg.lawupdate ? "check-square-o" : "square-o"}}' style='{{data.borg.lawupdate ? "selected" : null}}' action='toggle_lawupdate'>Lawsync</ui-button>
{{/partial}}
{{#each data.laws}}
<p>{{this}}</p>
{{/each}}
</ui-display>

View File

@@ -20,12 +20,6 @@
else if (avg_dam <= 75) { return "health-2"; }
else { return "health-0"; }
}
},
computed:{
sorted_sensors() {
var sensors = this.get('data.sensors')
return sensors.sort(function(a,b) { return a.ijob - b.ijob ;});
}
}
}
</script>
@@ -45,7 +39,7 @@
</tr>
</thead>
<tbody>
{{#each sorted_sensors}}
{{#each data.sensors}}
<tr>
<td>
<span class='{{isHead(ijob) ? "bold " :""}}{{dept_class(ijob)}}'>