diff --git a/config/admin_ranks.txt b/config/admin_ranks.txt index 2c87bda64baa..d1332eb49d5f 100644 --- a/config/admin_ranks.txt +++ b/config/admin_ranks.txt @@ -28,18 +28,23 @@ # +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.) +# +TICKET = ability to ticket people, claim tickets and respond to tickets # +EVERYTHING (or +HOST or +ALL) = Simply gives you everything without having to type every flag # END_KEYWORDS -Admin Observer = -AUTOLOGIN -Moderator = +ADMIN -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 +Host = +EVERYTHING +Council Member = +EVERYTHING +Head Coder = +EVERYTHING -Host = +EVERYTHING +Senior Admin = +EVERYTHING +Primary Admin = +STEALTH +ADMIN +BASIC +BAN +SPAWN +VAREDIT +DEBUG +SERVER +FUN +POSSESS +BUILDMODE +TICKET +SOUND +Administrator = +STEALTH +ADMIN +BASIC +BAN +SPAWN +VAREDIT +DEBUG +SERVER +FUN +TICKET +Retired Admin = +ADMIN +STEALTH +BASIC +SERVER +BAN +TICKET +VAREDIT +Moderator = +STEALTH +ADMIN +BASIC +BAN +TICKET +ModeratorOnProbation = +STEALTH +ADMIN +BASIC +NOJOIN +BAN +TICKET +Admin Observer = +STEALTH -AUTOLOGIN -Coder = +DEBUG +VAREDIT +SERVER +SPAWN +POLL -AUTOLOGIN +Maintainer = +STEALTH +ADMIN +VAREDIT +DEBUG +SERVER +BASIC +SPAWN -AUTOLOGIN +Senior Coder = +BASIC +SPAWN +VAREDIT +DEBUG +SERVER -AUTOLOGIN + +Bot = +ALL diff --git a/config/admins.txt b/config/admins.txt index 5fef2ccbf5bb..dd5048037ffd 100644 --- a/config/admins.txt +++ b/config/admins.txt @@ -1,134 +1,63 @@ -############################################################################################### -# Basically, ckey goes first. Rank goes after the "=" # -# Case is not important for ckey. # -# Case IS important for the rank. # -# All punctuation (spaces etc) EXCEPT '-', '_' and '@' will be stripped from rank names. # -# Ranks can be anything defined in admin_ranks.txt # -# NOTE: if the rank-name cannot be found in admin_ranks.txt, they will not be adminned! ~Carn # -# NOTE: syntax was changed to allow hyphenation of ranknames, since spaces are stripped. # -############################################################################################### -Optimumtact = Host -NewSta = Game Master -Expletives = Game Master -kingofkosmos = Game Master -MrStonedOne = Lazy Master -microscopics = Game Master -Gun Hog = Game Master -KorPhaeron = Game Master -razharas = Game Master -Lordpidey = Game Master -Niknakflak = Game Master -rolan7 = Game Master -quarxink = Game Master -adrix89 = Game Master -tle = Game Master -xsi = Game Master -scaredofshadows = Game Master -neofite = Game Master -trubblebass = Game Master -mport2004 = Game Master -deuryn = Game Master -agouri = Game Master -errorage = Game Master -superxpdude = Game Master -petethegoat = Game Master -korphaeron = Game Master -nodrak = Game Master -carnwennan = Game Master -ikarrus = Game Master -cheridan = Game Master -giacomand = Game Master -rockdtben = Game Master -sieve = Game Master -aranclanos = Game Master -intigracy = Game Master -dumpdavidson = Game Master -kazeespada = Game Master -malkevin = Game Master -incoming = Game Master -demas = Game Master -fleure = Game Master -ricotez = Game Master -misterperson = Game Master -crimsonvision = Game Master -iamgoofball = Game Master -zelacks = Game Master -androidsfv = Game Master -miggles = Game Master -jordie0608 = Game Master -s0ldi3rkr4s0 = Game Master -ergovisavi = Game Master -vistapowa = Game Master -miauw62 = Game Master -kazeespada = Game Master -rumia29 = Game Master -bobylein = Game Master -sirbayer = Game Master -hornygranny = Game Master -yota = Game Master -firecage = Game Master -donkieyo = Game Master -argoneus = Game Master -paprka = Game Master -cookingboy3 = Game Master -limeliz = Game Master -steelpoint = Game Master -phil235 = Game Master -CorruptComputer = Game Master -xxnoob = Game Master -tkdrg = Game Master -Cuboos = Game Master -thunder12345 = Game Master -wjohnston = Game Master -mandurrh = Game Master -thurgatar = Game Master -xerux = Game Master -dannno = Game Master -lo6a4evskiy = Game Master -vekter = Game Master -Ahammer18 = Game Master -ACCount12 = Game Master -fayrik = Game Master -shadowlight213 = Game Master -drovidicorv = Game Master -Dunc = Game Master -MMMiracles = Game Master -bear1ake = Game Master -CoreOverload = Game Master -Jalleo = Game Master -ChangelingRain = Game Master -FoxPMcCloud = Game Master -Xhuis = Game Master -Astralenigma = Game Master -Tokiko1 = Game Master -SuperSayu = Game Master -Lzimann = Game Master -As334 = Game Master -neersighted = Game Master -Swankcookie = Game Master -Ressler = Game Master -Folix = Game Master -Bawhoppennn = Game Master -Anturke = Host -Lumipharon = Game Master -bgobandit = Game Master -coiax = Game Master -RandomMarine = Game Master -PKPenguin321 = Game Master -TechnoAlchemist = Game Master -Aloraydrel = Game Master -Quiltyquilty = Game Master -SnipeDragon = Game Master -Fjeld = Game Master -kevinz000 = Game Master -Tacolizard = Game Master -TrustyGun = Game Master -Cyberboss = Game Master -PJB3005 = Game Master -Sweaterkittens = Game Master -Feemjmeem = Game Master -JStheguy = Game Master -excessiveuseofcobby = Game Master -Plizzard = Game Master -octareenroon91 = Game Master -Serpentarium = Game Master \ No newline at end of file +############################################################################################### +# Basically, ckey goes first. Rank goes after the "=" # +# Case is not important for ckey. # +# Case IS important for the rank. # +# All punctuation (spaces etc) EXCEPT '-', '_' and '@' will be stripped from rank names. # +# Ranks can be anything defined in admin_ranks.txt # +# NOTE: if the rank-name cannot be found in admin_ranks.txt, they will not be adminned! ~Carn # +# NOTE: syntax was changed to allow hyphenation of ranknames, since spaces are stripped. # +############################################################################################### + +Xantam = Host +OakBoscage = Council Member +Alexandria404 = Council Member +Slovenian = Council Member +Atomicapples = Council Member +Oisin100 = Council Member +AsV9 = Head Coder + +ktlwjec = Senior Admin + +R3DGL4R3 = Primary Admin +simonset55 = Primary Admin +Nichlas0010 = Primary Admin +AtRealDonaldTrump = Primary Admin +Kmc2000 = Primary Admin +YeOldeSheriff = Primary Admin +halueryphi = Primary Admin +Wardog390 = Administrator +MorrowWolf = Administrator +Arkaotic = Administrator +Colburn3000 = Administrator +MrRory = Administrator +Menacingmanatee = Administrator +Altoids0 = Administrator +Hydre = Administrator +Sircodey = Administrator +Kiripirin = Administrator +Yogurtshrimp69 = Administrator +Bachri = Administrator +BritishGrace = Administrator + +Spl99 = Retired Admin +20thgirl = Retired Admin +Madventurer = Retired Admin +Nightshadow1055 = Retired Admin +Grayrachnid = Retired Admin +Robotic Potato = Retired Admin +Hadrin Alucard = Retired Admin +Kayozz11 = Retired Admin +Alek2ander = Retired Admin +Matskuman5 = Retired Admin + +kooarbiter = Moderator +Void00 = Moderator +Ikoden = Moderator +dotlyna = Moderator +enkaa = Moderator +TheBombmaker = Moderator + +ThatLing = Maintainer +Observer = Admin Observer + +Yogstation13-Bot = Bot diff --git a/config/config.txt b/config/config.txt index 583f365a4a19..665792caef60 100644 --- a/config/config.txt +++ b/config/config.txt @@ -13,19 +13,19 @@ $include comms.txt # There are various options which are hard-locked for security reasons. ## Server name: This appears at the top of the screen in-game and in the BYOND hub. Uncomment and replace 'tgstation' with the name of your choice. -# SERVERNAME tgstation +SERVERNAME Yogstation 13 [99% LAGFREE!][Custom map!] ## Server SQL name: This is the name used to identify the server to the SQL DB, distinct from SERVERNAME as it must be at most 32 characters. -# SERVERSQLNAME tgstation +SERVERSQLNAME Yogstation ## Station name: The name of the station as it is referred to in-game. If commented out, the game will generate a random name instead. -STATIONNAME Space Station 13 +# STATIONNAME Space Station 13 ## Put on byond hub: Uncomment this to put your server on the byond hub. -#HUB +HUB ## Lobby time: This is the amount of time between rounds that players have to setup their characters and be ready. -LOBBY_COUNTDOWN 120 +LOBBY_COUNTDOWN 180 ## Round End Time: This is the amount of time after the round ends that players have to murder death kill each other. ROUND_END_COUNTDOWN 90 @@ -33,34 +33,34 @@ ROUND_END_COUNTDOWN 90 ## Comment this out if you want to use the SQL based admin system, the legacy system uses admins.txt. ## You need to set up your database to use the SQL based system. ## This flag is automatically enabled if SQL_ENABLED isn't -ADMIN_LEGACY_SYSTEM +# ADMIN_LEGACY_SYSTEM ## Comment this out if you want to use the SQL based banning system. The legacy systems use the files in the data folder. You need to set up your database to use the SQL based system. -BAN_LEGACY_SYSTEM +# BAN_LEGACY_SYSTEM ## 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. ## NOTE: If you have just set-up the database keep this DISABLED, as player age is determined from the first time they connect to the server with the database up. If you just set it up, it means ## you have noone older than 0 days, since noone has been logged yet. Only turn this on once you have had the database up for 30 days. -#USE_AGE_RESTRICTION_FOR_JOBS +USE_AGE_RESTRICTION_FOR_JOBS ## Uncomment this to have the job system use the player's account creation date, rather than the when they first joined the server for job timers. #USE_ACCOUNT_AGE_FOR_JOBS ## Unhash this to track player playtime in the database. Requires database to be enabled. -#USE_EXP_TRACKING +USE_EXP_TRACKING ## Unhash this to enable playtime requirements for head jobs. -#USE_EXP_RESTRICTIONS_HEADS +USE_EXP_RESTRICTIONS_HEADS ## Unhash this to override head jobs' playtime requirements with this number of hours. ## 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. -#USE_EXP_RESTRICTIONS_ADMIN_BYPASS +USE_EXP_RESTRICTIONS_ADMIN_BYPASS ## log OOC channel @@ -155,7 +155,7 @@ NORESPAWN # DONT_DEL_NEWMOB ## set a hosted by name for unix platforms -HOSTEDBY Yournamehere +HOSTEDBY Yogstation13-Bot ## Set to jobban "Guest-" accounts from Captain, HoS, HoP, CE, RD, CMO, Warden, Security, Detective, and AI positions. ## Set to 1 to jobban them from those positions, set to 0 to allow them. @@ -170,13 +170,13 @@ CHECK_RANDOMIZER ## IPINTEL: ## This allows you to detect likely proxies by checking ips against getipintel.net ## Rating to warn at: (0.9 is good, 1 is 100% likely to be a spammer/proxy, 0.8 is 80%, etc) anything equal to or higher then this number triggers an admin warning -#IPINTEL_RATING_BAD 0.9 +IPINTEL_RATING_BAD 0.9 ## Contact email, (required to use the service, leaving blank or default disables IPINTEL) -#IPINTEL_EMAIL ch@nge.me +IPINTEL_EMAIL admin@yogstation.net ## How long to save good matches (ipintel rate limits to 15 per minute and 500 per day. so this shouldn't be too low, getipintel.net suggests 6 hours, time is in hours) (Your ip will get banned if you go over 500 a day too many times) -#IPINTEL_SAVE_GOOD 12 +IPINTEL_SAVE_GOOD 6 ## How long to save bad matches (these numbers can change as ips change hands, best not to save these for too long in case somebody gets a new ip used by a spammer/proxy before.) -#IPINTEL_SAVE_BAD 3 +IPINTEL_SAVE_BAD 3 ## Domain name to query (leave commented out for the default, only needed if you pay getipintel.net for more querys) #IPINTEL_DOMAIN check.getipintel.net @@ -196,24 +196,24 @@ CHECK_RANDOMIZER # SERVER ss13.example.com:2506 ## forum address -# FORUMURL http://tgstation13.org/phpBB/index.php +FORUMURL https://forums.yogstation.net/index.php ## Wiki address # WIKIURL http://www.tgstation13.org/wiki ## Rules address -# RULESURL http://www.tgstation13.org/wiki/Rules +# RULESURL http://forums.yogstation.net/index.php?pages/rules/ ## Github address -# GITHUBURL https://www.github.com/tgstation/tgstation +# GITHUBURL https://www.github.com/yogstation13/yogstation ## Github repo id ##This can be found by going to https://api.github.com/users//repos ##Or https://api.github.com/orgs//repos if the repo owner is an organization -# GITHUBREPOID 3234987 +GITHUBREPOID 120966336 ## Ban appeals URL - usually for a forum or wherever people should go to contact your admins. -# BANAPPEALS http://justanotherday.example.com +BANAPPEALS http://forums.yogstation.net/index.php?forms/unban-appeal-form.1/respond ## System command that invokes youtube-dl, used by Play Internet Sound. ## You can install youtube-dl with @@ -246,22 +246,22 @@ TICK_LIMIT_MC_INIT 500 ##Defines the ticklag for the world. Ticklag is the amount of time between game ticks (aka byond ticks) (in 1/10ths of a second). ## This also controls the client network update rate, as well as the default client fps -TICKLAG 0.5 +TICKLAG 0.65 ##Can also be set as per-second value, the following value is identical to the above. #FPS 20 ## Comment this out to disable automuting -#AUTOMUTE_ON +AUTOMUTE_ON ## Uncomment this to let players see their own notes (they can still be set by admins only) #SEE_OWN_NOTES ### Comment these two out to prevent notes fading out over time for admins. ## Notes older then this will start fading out. -NOTE_FRESH_DAYS 91.31055 +#NOTE_FRESH_DAYS 91.31055 ## Notes older then this will be completely faded out. -NOTE_STALE_DAYS 365.2422 +#NOTE_STALE_DAYS 365.2422 ##Note: all population caps can be used with each other if desired. @@ -316,7 +316,7 @@ AUTOCONVERT_NOTES ANNOUNCE_ADMIN_LOGOUT ## Uncomment to have an admin message sent anytime an admin connects to a round in play, you can edit the messages in admin.dm -#ANNOUNCE_ADMIN_LOGIN +ANNOUNCE_ADMIN_LOGIN ## Map rotation ## You should edit maps.txt to match your configuration when you enable this. @@ -331,11 +331,11 @@ ALLOW_MAP_VOTING 1 ## This is the chance of map rotation factored to the round length. ## A value of 1 would mean the map rotation chance is the round length in minutes (hour long round == 60% rotation chance) ## A value of 0.5 would mean the map rotation chance is half of the round length in minutes (hour long round == 30% rotation chance) -#MAPROTATIONCHANCEDELTA 0.75 +#MAPROTATIONCHANCEDELTA 0 ## AUTOADMIN ## The default admin rank -AUTOADMIN_RANK Game Master +AUTOADMIN_RANK Council Member ## Uncomment to automatically give that admin rank to all players #AUTOADMIN diff --git a/config/game_options.txt b/config/game_options.txt index f05b5c9a3fd9..5c689c0f1161 100644 --- a/config/game_options.txt +++ b/config/game_options.txt @@ -51,7 +51,7 @@ ANIMAL_DELAY 1 ## NAMES ### ## If uncommented this adds a random surname to a player's name if they only specify one name. -#HUMANS_NEED_SURNAMES +HUMANS_NEED_SURNAMES ## If uncommented, this forces all players to use random names !and appearances!. #FORCE_RANDOM_NAMES @@ -76,15 +76,15 @@ ALERT_DELTA Destruction of the station is imminent. All crew are instructed to o ## Default probablity is 1, increase to make that mode more likely to be picked. ## Set to 0 to disable that mode. -PROBABILITY TRAITOR 5 -PROBABILITY TRAITORBRO 2 -PROBABILITY TRAITORCHAN 4 -PROBABILITY INTERNAL_AFFAIRS 3 -PROBABILITY NUCLEAR 2 -PROBABILITY REVOLUTION 2 -PROBABILITY CULT 2 -PROBABILITY CHANGELING 2 -PROBABILITY WIZARD 4 +PROBABILITY TRAITOR 11 +PROBABILITY TRAITORBRO 7 +PROBABILITY TRAITORCHAN 15 +PROBABILITY INTERNAL_AFFAIRS 7 +PROBABILITY NUCLEAR 12 +PROBABILITY REVOLUTION 12 +PROBABILITY CULT 18 +PROBABILITY CHANGELING 10 +PROBABILITY WIZARD 8 PROBABILITY MONKEY 0 PROBABILITY METEOR 0 PROBABILITY EXTENDED 0 @@ -166,10 +166,10 @@ MIDROUND_ANTAG WIZARD #MIN_POP CLOCKWORK_CULT 24 #MAX_POP CLOCKWORK_CULT -1 -#MIN_POP CHANGELING 15 +#MIN_POP CHANGELING 25 #MAX_POP CHANGELING -1 -#MIN_POP WIZARD 20 +#MIN_POP WIZARD 30 #MAX_POP WIZARD -1 #MIN_POP MONKEY 20 @@ -196,14 +196,14 @@ SHUTTLE_REFUEL_DELAY 12000 ## Variables calculate how number of antagonists will scale to population. ## Used as (Antagonists = Population / Coeff) ## Set to 0 to disable scaling and use default numbers instead. -TRAITOR_SCALING_COEFF 6 +TRAITOR_SCALING_COEFF 7 BROTHER_SCALING_COEFF 6 -CHANGELING_SCALING_COEFF 6 +CHANGELING_SCALING_COEFF 8 ## Variables calculate how number of open security officer positions will scale to population. ## Used as (Officers = Population / Coeff) ## Set to 0 to disable scaling and use default numbers instead. -SECURITY_SCALING_COEFF 8 +SECURITY_SCALING_COEFF 7 ## The number of objectives traitors get. ## Not including escaping/hijacking. @@ -212,13 +212,13 @@ BROTHER_OBJECTIVES_AMOUNT 2 ## Uncomment to prohibit jobs that start with loyalty ## implants from being most antagonists. -#PROTECT_ROLES_FROM_ANTAGONIST +PROTECT_ROLES_FROM_ANTAGONIST ## Uncomment to prohibit assistants from becoming most antagonists. #PROTECT_ASSISTANT_FROM_ANTAGONIST ## If non-human species are barred from joining as a head of staff -#ENFORCE_HUMAN_AUTHORITY +ENFORCE_HUMAN_AUTHORITY ## If late-joining players have a chance to become a traitor/changeling ALLOW_LATEJOIN_ANTAGONISTS @@ -264,7 +264,7 @@ GATEWAY_DELAY 18000 ## If the number of players ready at round starts exceeds this threshold, JOBS_HAVE_MINIMAL_ACCESS will automatically be enabled. Otherwise, it will be disabled. ## This is useful for accomodating both low and high population rounds on the same server. ## Comment this out or set to 0 to disable this automatic toggle. -MINIMAL_ACCESS_THRESHOLD 20 +MINIMAL_ACCESS_THRESHOLD 10 ## Comment this out this if you wish to use the setup where jobs have more access. ## This is intended for servers with low populations - where there are not enough @@ -276,7 +276,7 @@ MINIMAL_ACCESS_THRESHOLD 20 #ASSISTANTS_HAVE_MAINT_ACCESS ## Uncoment to give security maint access. Note that if you dectivate JOBS_HAVE_MINIMAL_ACCESS security already gets maint from that. -#SECURITY_HAS_MAINT_ACCESS +SECURITY_HAS_MAINT_ACCESS ## Uncomment to give everyone maint access. #EVERYONE_HAS_MAINT_ACCESS @@ -287,7 +287,7 @@ SEC_START_BRIG ## GHOST INTERACTION ### ## Uncomment to let ghosts spin chairs. You may be wondering why this is a config option. Don't ask. -#GHOST_INTERACTION +GHOST_INTERACTION ## NON-VOCAL SILICONS ### ## Uncomment these to stop the AI, or cyborgs, from having vocal communication. @@ -374,7 +374,7 @@ LAW_WEIGHT buildawall,0 ## SILICON LAW MAX AMOUNT ### ## The maximum number of laws a silicon can have ## Attempting to upload laws past this point will fail unless the AI is reset -SILICON_MAX_LAW_AMOUNT 12 +SILICON_MAX_LAW_AMOUNT 20 ## Roundstart Races ##------------------------------------------------------------------------------------------- @@ -420,10 +420,10 @@ ASSISTANT_CAP -1 ## Starlight for exterior walls and breaches. Uncomment for starlight! ## This is disabled by default to make testing quicker, should be enabled on production servers or testing servers messing with lighting -#STARLIGHT +STARLIGHT ## Uncomment to bring back old grey suit assistants instead of the now default rainbow colored assistants. -#GREY_ASSISTANTS +GREY_ASSISTANTS ## Midround Antag (aka Mulligan antag) config options ### @@ -480,10 +480,10 @@ ARRIVALS_SHUTTLE_DOCK_WINDOW 55 ## How many wirechewing rodents you want to spawn on exposed maintenane wires at the start of the round. You may wish to set this to 0 if you're testing powernets. -MICE_ROUNDSTART 10 +MICE_ROUNDSTART 5 ## If the percentage of players alive (doesn't count conversions) drops below this threshold the emergency shuttle will be forcefully called (provided it can be) #EMERGENCY_SHUTTLE_AUTOCALL_THRESHOLD 0.2 ## Determines if players are allowed to print integrated circuits, uncomment to allow. -#IC_PRINTING \ No newline at end of file +IC_PRINTING diff --git a/config/motd.txt b/config/motd.txt index c5b8a594972a..a03ea660c384 100644 --- a/config/motd.txt +++ b/config/motd.txt @@ -1,5 +1,14 @@ - +

Welcome to Yogstation 13!

+We have a support ticket system at Yogstation. If you have an issue, please file a ticket by pressing F1 or going to the admin tab and clicking Ahelp. An admin will help you as soon as possible. -

Welcome to Space Station 13!

+We are constantly seeking dedicated new admins, coders, spriters and mappers to improve our server. Without them, you wouldn't have a server to play on. If you feel you may be a good addition to our team, please apply: + + ¤ Admin Application + ¤ Coder / Spriter / Mapper Application + +We are running a high power server, we need donations to keep the server running. Donators get multiple benefits, one such benefit is fun hats! -This server is running a /tg/station 13 Git build. +Teamspeak: 108.61.25.67:10457 +If you need to create an account on the forums please use this keyword to register: assistantgreytide + +

diff --git a/config/unbuyableshuttles.txt b/config/unbuyableshuttles.txt index b563c6c0e626..765fb93d5472 100644 --- a/config/unbuyableshuttles.txt +++ b/config/unbuyableshuttles.txt @@ -5,17 +5,11 @@ ##Station shuttles #_maps/shuttles/emergency_birdboat.dmm -#_maps/shuttles/emergency_box.dmm -#_maps/shuttles/emergency_delta.dmm -#_maps/shuttles/emergency_meta.dmm -#_maps/shuttles/emergency_mini.dmm -#_maps/shuttles/emergency_pubby.dmm ##Others #_maps/shuttles/emergency_asteroid.dmm #_maps/shuttles/emergency_airless.dmm #_maps/shuttles/emergency_arena.dmm -#_maps/shuttles/emergency_bar.dmm #_maps/shuttles/emergency_clown.dmm #_maps/shuttles/emergency_cramped.dmm #_maps/shuttles/emergency_imfedupwiththisworld.dmm diff --git a/config/whitelist.txt b/config/whitelist.txt index 592704873812..5556bc1a91fe 100644 --- a/config/whitelist.txt +++ b/config/whitelist.txt @@ -2,8 +2,4 @@ # Basically, a list of ckeys who make it past user connection # # Case is not important for ckey. # ############################################################################################### -#Optimumtact -#kevinz000 -#Iamgoofball -#Rshoe95 -#That one penguin who became an admin +#Nichlas0010