From f701632767253360ea7db4dd5ff19bed298bcb2d Mon Sep 17 00:00:00 2001 From: yogstation13-bot Date: Tue, 7 Apr 2020 16:43:14 +0100 Subject: [PATCH 1/2] Updates config --- config/admin_ranks.txt | 42 +++++-- config/admins.txt | 199 ++++++++++++---------------------- config/antag_rep.txt | 3 + config/awaymissionconfig.txt | 4 +- config/config.txt | 89 +++++++-------- config/game_options.txt | 112 +++++++++++-------- config/lavaruinblacklist.txt | 2 +- config/maps.txt | 32 ++---- config/minor_filter.txt | 28 +++-- config/motd.txt | 8 +- config/spaceruinblacklist.txt | 4 +- 11 files changed, 250 insertions(+), 273 deletions(-) diff --git a/config/admin_ranks.txt b/config/admin_ranks.txt index fc1cb96c86c1..3a5dcfd5b358 100644 --- a/config/admin_ranks.txt +++ b/config/admin_ranks.txt @@ -33,15 +33,35 @@ # +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 *EVERYTHING -Lazy Master = +EVERYTHING -AUTOLOGIN *EVERYTHING -Host = +EVERYTHING *EVERYTHING - -Coder = +DEBUG +VAREDIT +SERVER +SPAWN +POLL -AUTOLOGIN +RetCoder = +EVERYTHING +Moderator-Mainterino = +STEALTH +ADMIN +VAREDIT +DEBUG +SERVER +BASIC +SPAWN +POLL +BAN +Host = +EVERYTHING +Community Manager = +EVERYTHING *EVERYTHING +Administrator-Mainterino = +STEALTH +ADMIN +BASIC +BAN +SPAWN +VAREDIT +DEBUG +SERVER +FUN +TICKET +BUILD +POLL + +Council Member = +EVERYTHING *EVERYTHING + +Head Coder = +EVERYTHING *EVERYTHING + +Tribunal = +EVERYTHING + +Senior Admin = +EVERYTHING *EVERYTHING + +Primary Admin = +STEALTH +ADMIN +BASIC +BAN +SPAWN +VAREDIT +DEBUG +SERVER +FUN +POSSESS +BUILD +TICKET +SOUND + +Administrator = +STEALTH +ADMIN +BASIC +BAN +SPAWN +VAREDIT +DEBUG +SERVER +FUN +TICKET +BUILD + +Retired Admin = +ADMIN +STEALTH +BASIC +SERVER +BAN +TICKET +VAREDIT + +Moderator = +STEALTH +ADMIN +BASIC +BAN +TICKET + +ModeratorOnProbation = +STEALTH +ADMIN +BASIC +NOJOIN +BAN +TICKET + +Senior Coder = +BASIC +SPAWN +VAREDIT +DEBUG +SERVER + +Maintainer = +STEALTH +ADMIN +VAREDIT +DEBUG +SERVER +BASIC +SPAWN +POLL -AUTOLOGIN + +Admin Observer = +STEALTH + +Bot = +EVERYTHING diff --git a/config/admins.txt b/config/admins.txt index 66604b0d4260..ce69012adc59 100644 --- a/config/admins.txt +++ b/config/admins.txt @@ -9,134 +9,71 @@ # If SQL-based admin loading is enabled, admins listed here will always be loaded first # # and will override any duplicate entries in the database. # ############################################################################################### -Optimumtact = Host -CitrusGender = Game Master -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 -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 -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 -Averagejoe82 = Game Master -The Dreamweaver = Game Master -88Naoki = Game Master -Naksuasdf = Game Master -MrDoomBringer = Game Master -shizcalev = Game Master -NicBR = Game Master + +AsV9 = RetCoder +ThatLing = RetCoder +AshCorr = Host +Xantam = Host +Spl99 = Community Manager + +oakboscage = Council Member +TehLadyK = Council Member +Yogurtshrimp69 = Council Member +zxmongoose = Council Member + +alexkar598 = Head Coder +Monster860 = Head Coder + +halueryphi = Senior Admin +ktlwjec = Senior Admin +Alexandria404 = Senior Admin + +SwissLoaf = Primary Admin +Master Penguin5 = Primary Admin +Mordrehel = Primary Admin +Fillywonk = Primary Admin +Rayisken = Primary Admin + +hopek = Administrator +lyis = Administrator +superguy113 = Administrator +Readystorm546 = Administrator +BayBee = Administrator +jasiopl123 = Administrator +TheGamer01 = Administrator +Takahiru = Administrator +lewdelf = Administrator + +Colburn3000 = Retired Admin +Fataleyes = Retired Admin +Menacingmanatee = Retired Admin +Nightshadow1055 = Retired Admin +PenguinFisher = Retired Admin +BritishGrace = Retired Admin +Altoids0 = Retired Admin +Qe = Retired Admin +dominuslucian = Retired Admin +liberalbiass = Retired Admin +ltureborned = Retired Admin +Slovenian = Retired Admin +Likeless = Retired Admin +genericdm = Retired Admin +AtRealDonaldTrump = Retired Admin +simonset55 = Retired Admin +Mrspace = Retired Admin +Rumia29 = Retired Admin + +ynot01 = Moderator + +05rhardy = ModeratorOnProbation + +Identification = Maintainer +Theos = Maintainer +fluffe9911 = Maintainer +McDonald072 = Maintainer + +Observer = Admin Observer +dr.derp3635 = Admin Observer +bowlofcereal = Admin Observer + +Yogstation13-Bot = Bot diff --git a/config/antag_rep.txt b/config/antag_rep.txt index e8a7250686a4..f822e855db0a 100644 --- a/config/antag_rep.txt +++ b/config/antag_rep.txt @@ -3,3 +3,6 @@ ## e.g. ## ANTAG_REP Captain 10 ## ANTAG_REP Assistant 0 + +ANTAG_REP Assistant 10 +## Like everyone else :) \ No newline at end of file diff --git a/config/awaymissionconfig.txt b/config/awaymissionconfig.txt index b916f89f62f2..d60d243dea80 100644 --- a/config/awaymissionconfig.txt +++ b/config/awaymissionconfig.txt @@ -20,4 +20,6 @@ #_maps/RandomZLevels/snowdin.dmm #_maps/RandomZLevels/research.dmm #_maps/RandomZLevels/Cabin.dmm -_maps/RandomZLevels/VR/snowdin_VR.dmm \ No newline at end of file +_maps/RandomZLevels/VR/murderdome.dmm +_maps/RandomZLevels/VR/snowdin_VR.dmm +_maps/RandomZLevels/VR/syndicate_trainer.dmm \ No newline at end of file diff --git a/config/config.txt b/config/config.txt index cb2de8000344..a789babc2104 100644 --- a/config/config.txt +++ b/config/config.txt @@ -14,19 +14,19 @@ $include antag_rep.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 ## 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 ## 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 210 ## 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 @@ -37,7 +37,7 @@ ROUND_END_COUNTDOWN 90 ADMIN_LEGACY_SYSTEM ##Uncomment this to stop any admins loaded by the legacy system from having their rank edited by the permissions panel -#PROTECT_LEGACY_ADMINS +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 @@ -54,24 +54,24 @@ ENABLE_LOCALHOST_RANK ## 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 LOG_OOC @@ -82,6 +82,12 @@ LOG_LOOC ## log client Say LOG_SAY +## log telecomms +LOG_TELECOMMS + +## log ntsl compilations +LOG_NTSL + ## log admin actions LOG_ADMIN @@ -138,7 +144,7 @@ LOG_MANIFEST # LOG_PICTURES ## log mecha actions -# LOG_MECHA +LOG_MECHA ## log virus and actions LOG_VIRUS @@ -147,7 +153,7 @@ LOG_VIRUS LOG_CLONING ##Log camera pictures - Must have picture logging enabled -PICTURE_LOGGING_CAMERA +# PICTURE_LOGGING_CAMERA ## period of time in seconds for players to be considered inactive # INACTIVITY_PERIOD 300 @@ -210,13 +216,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.8 ## Contact email, (required to use the service, leaving blank or default disables IPINTEL) -#IPINTEL_EMAIL ch@nge.me +# IPINTEL_EMAIL ch@nge.me ## 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 12 ## 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 1 ## 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 @@ -236,32 +242,21 @@ CHECK_RANDOMIZER # SERVER ss13.example.com:2506 ## forum address -# FORUMURL http://tgstation13.org/phpBB/index.php +# FORUMURL http://yogstation.net ## Wiki address -# WIKIURL http://www.tgstation13.org/wiki - -## Rules address -# RULESURL http://www.tgstation13.org/wiki/Rules - -## Github address -# GITHUBURL https://www.github.com/tgstation/tgstation +# WIKIURL https://wiki.yogstation.net/wiki -## Round specific stats address -## Link to round specific parsed logs; IE statbus. It is appended with the RoundID automatically by ticker/Reboot() -## This will take priority over the game logs address during reboot. -## Example: https://atlantaned.space/statbus/round.php?round= -# ROUNDSTATSURL +##Rules address +# RULESURL http://forums.yogstation.net/index.php?pages/rules/ -## Game Logs address -## Incase you don't have a fancy parsing system, but still want players to be able to find where you keep your server's logs. -## Example: https://tgstation13.org/parsed-logs/basil/data/logs/ -# GAMELOGURL +##Github address +# 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 @@ -297,22 +292,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.5 ##Can also be set as per-second value, the following value is identical to the above. -#FPS 20 +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. @@ -323,13 +318,13 @@ NOTE_STALE_DAYS 365.2422 SOFT_POPCAP_MESSAGE Be warned that the server is currently serving a high number of users, consider using alternative game servers. ## Uncomment for 'hard' population caps, players will not be allowed to spawn if the living crew exceeds the listed number, though they may still observe or wait for the living crew to decrease in size. -#HARD_POPCAP 150 +HARD_POPCAP 80 ## Message for hard cap HARD_POPCAP_MESSAGE The server is currently serving a high number of users, You cannot currently join. You may wait for the number of living crew to decline, observe, or find alternative servers. ## Uncomment for 'extreme' population caps, players will not be allowed to join the server if living crew exceeds the listed number. -#EXTREME_POPCAP 200 +EXTREME_POPCAP 82 ## Message for extreme cap EXTREME_POPCAP_MESSAGE The server is currently serving a high number of users, find alternative servers. @@ -370,7 +365,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. @@ -385,11 +380,11 @@ PREFERENCE_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.25 ## AUTOADMIN ## The default admin rank -AUTOADMIN_RANK Game Master +#AUTOADMIN_RANK Council Member ## Uncomment to automatically give that admin rank to all players #AUTOADMIN @@ -479,16 +474,16 @@ BASE_MC_TICK_RATE 1 HIGH_POP_MC_TICK_RATE 1.1 ##Engage high pop mode if player count raises above this (Player in this context means any connected user. Lobby, ghost or in-game all count) -HIGH_POP_MC_MODE_AMOUNT 65 +HIGH_POP_MC_MODE_AMOUNT 60 ##Disengage high pop mode if player count drops below this -DISABLE_HIGH_POP_MC_MODE_AMOUNT 60 +DISABLE_HIGH_POP_MC_MODE_AMOUNT 50 ## Uncomment to prevent the world from sleeping while no players are connected after initializations #RESUME_AFTER_INITIALIZATIONS ## Uncomment to set the number of /world/Reboot()s before the DreamDaemon restarts itself. 0 means restart every round. Requires tgstation server tools. -#ROUNDS_UNTIL_HARD_RESTART 10 +ROUNDS_UNTIL_HARD_RESTART 5 ##Default view size, in tiles. diff --git a/config/game_options.txt b/config/game_options.txt index b2055bc69f31..62f8f07ccef9 100644 --- a/config/game_options.txt +++ b/config/game_options.txt @@ -36,8 +36,8 @@ EMOJIS ## To speed things up make the number negative, to slow things down, make the number positive. ## These modify the run/walk speed of all mobs before the mob-specific modifiers are applied. -RUN_DELAY 1 -WALK_DELAY 4 +RUN_DELAY 2 +WALK_DELAY 6 ## The variables below affect the movement of specific mob types. THIS AFFECTS ALL SUBTYPES OF THE TYPE YOU CHOOSE! ## Entries completely override all subtypes. Later entries have precedence over earlier entries. @@ -45,7 +45,7 @@ WALK_DELAY 4 ## /mob/living/carbon/human on the last entry, the last entry will override the first. ##MULTIPLICATIVE_MOVESPEED /mob/living/carbon/human 0 ##MULTIPLICATIVE_MOVESPEED /mob/living/silicon/robot 0 -##MULTIPLICATIVE_MOVESPEED /mob/living/carbon/monkey 0 +MULTIPLICATIVE_MOVESPEED /mob/living/carbon/monkey 0 ##MULTIPLICATIVE_MOVESPEED /mob/living/carbon/alien 0 ##MULTIPLICATIVE_MOVESPEED /mob/living/simple_animal/slime 0 MULTIPLICATIVE_MOVESPEED /mob/living/simple_animal 1 @@ -53,13 +53,13 @@ MULTIPLICATIVE_MOVESPEED /mob/living/simple_animal 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 ## Unhash this to turn on automatic reopening of a player's job if they suicide at roundstart -#REOPEN_ROUNDSTART_SUICIDE_ROLES +REOPEN_ROUNDSTART_SUICIDE_ROLES ## Unhash to enable reopening of command level positions #REOPEN_ROUNDSTART_SUICIDE_ROLES_COMMAND_POSITIONS @@ -70,7 +70,7 @@ MULTIPLICATIVE_MOVESPEED /mob/living/simple_animal 1 #REOPEN_ROUNDSTART_SUICIDE_ROLES_DELAY 240 ## Unhash to enable a printed command report for reopened roles listing what roles were reopened. -#REOPEN_ROUNDSTART_SUICIDE_ROLES_COMMAND_REPORT +REOPEN_ROUNDSTART_SUICIDE_ROLES_COMMAND_REPORT ## ALERT LEVELS ### @@ -92,24 +92,41 @@ 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 TRAITORVAMP 3 -PROBABILITY VAMPIRE 3 +# Lowpop +PROBABILITY TRAITOR 6 +PROBABILITY TRAITORBRO 6 +PROBABILITY TRAITORCHAN 6 PROBABILITY INTERNAL_AFFAIRS 3 -PROBABILITY MALF 4 -PROBABILITY NUCLEAR 2 -PROBABILITY REVOLUTION 2 -PROBABILITY CULT 2 -PROBABILITY CHANGELING 2 -PROBABILITY WIZARD 4 +PROBABILITY CHANGELING 3 + +# Group antags +PROBABILITY REVOLUTION 9 +PROBABILITY CLOCKWORK_CULT 5 +PROBABILITY GANG 5 +PROBABILITY CULT 9 + +# Snowflakes +PROBABILITY SHADOWLING 4 +PROBABILITY WIZARD 7 +PROBABILITY NUCLEAR 9 +PROBABILITY MALF 6 +PROBABILITY CLOWNOPS 0 +PROBABILITY MALFUNCTION 6 + +# New +PROBABILITY HIVEMIND 0 +PROBABILITY OVERTHROW 0 +PROBABILITY-TRAITORVAMP-2 +PROBABILITY VAMPIRE 2 + +# Special +PROBABILITY RAGINMAGES 1 +PROBABILITY MONKEY 0 PROBABILITY METEOR 0 PROBABILITY EXTENDED 0 PROBABILITY SECRET_EXTENDED 0 PROBABILITY DEVIL 0 PROBABILITY DEVIL_AGENTS 0 -PROBABILITY CLOWNOPS 0 ## Percent weight reductions for three of the most recent modes @@ -163,7 +180,7 @@ MIDROUND_ANTAG MALF #MIN_POP TRAITOR 0 #MAX_POP TRAITOR -1 -#MIN_POP TRAITORBRO 0 +#MIN_POP TRAITORBRO 25 #MAX_POP TRAITORBRO -1 #MIN_POP TRAITORCHAN 15 @@ -214,14 +231,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 -BROTHER_SCALING_COEFF 6 -CHANGELING_SCALING_COEFF 6 +TRAITOR_SCALING_COEFF 7 +BROTHER_SCALING_COEFF 10 +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. @@ -230,7 +247,7 @@ 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 @@ -239,7 +256,7 @@ BROTHER_OBJECTIVES_AMOUNT 2 #PROTECT_AI_FROM_TRAITOR ## 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 @@ -248,7 +265,7 @@ ALLOW_LATEJOIN_ANTAGONISTS ## roll antagonist in subsequent rounds until they get it. ## ## For details See the comments for /datum/game_mode/proc/antag_pick in code/game/gamemodes/game_mode.dm -# USE_ANTAG_REP +USE_ANTAG_REP ## The maximum amount of antagonist reputation tickets a player can bank (not use at once) ANTAG_REP_MAXIMUM 200 @@ -260,7 +277,7 @@ DEFAULT_ANTAG_TICKETS 100 MAX_TICKETS_PER_ROLL 100 ## Uncomment to allow players to see the set odds of different rounds in secret/random in the get server revision screen. This will NOT tell the current roundtype. -#SHOW_GAME_TYPE_ODDS +SHOW_GAME_TYPE_ODDS ## RANDOM EVENTS ### ## Comment this out to disable random events during the round. @@ -309,7 +326,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 8 ## 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 @@ -321,7 +338,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 @@ -332,11 +349,11 @@ 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 ## NEAR-DEATH EXPERIENCE ### ## Comment this out to disable mobs hearing ghosts when unconscious and very close to death -NEAR_DEATH_EXPERIENCE +#NEAR_DEATH_EXPERIENCE ## NON-VOCAL SILICONS ### ## Uncomment these to stop the AI, or cyborgs, from having vocal communication. @@ -349,7 +366,7 @@ NEAR_DEATH_EXPERIENCE ## Set to 1 for "custom", silicons will start with the custom laws defined in silicon_laws.txt. (If silicon_laws.txt is empty, the AI will spawn with asimov and Custom boards will auto-delete.) ## Set to 2 for "random", silicons will start with a random lawset picked from random laws specified below. ## Set to 3 for "weighted random", using values in "silicon_weights.txt", a law will be selected, with weights specifed in that file. -DEFAULT_LAWS 0 +DEFAULT_LAWS 3 ## RANDOM LAWS ## ## ------------------------------------------------------------------------------------------ @@ -364,11 +381,11 @@ RANDOM_LAWS robocop RANDOM_LAWS corporate ## Quirky laws. Shouldn't cause too much harm -#RANDOM_LAWS hippocratic -#RANDOM_LAWS maintain +RANDOM_LAWS hippocratic +RANDOM_LAWS maintain #RANDOM_LAWS drone -#RANDOM_LAWS liveandletlive -#RANDOM_LAWS peacekeeper +RANDOM_LAWS liveandletlive +RANDOM_LAWS peacekeeper #RANDOM_LAWS reporter #RANDOM_LAWS hulkamania @@ -399,11 +416,10 @@ LAW_WEIGHT corporate,12 ## Quirky laws. Shouldn't cause too much harm LAW_WEIGHT hippocratic,3 LAW_WEIGHT maintain,4 -LAW_WEIGHT drone,3 +LAW_WEIGHT drone,0 LAW_WEIGHT liveandletlive,3 LAW_WEIGHT peacekeeper,3 -LAW_WEIGHT reporter,4 -LAW_WEIGHT hulkamania,4 +LAW_WEIGHT reporter,0 ## Bad idea laws. Probably shouldn't enable these LAW_WEIGHT syndie,0 @@ -418,7 +434,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 10 ##------------------------------------------------ @@ -440,7 +456,7 @@ ROUNDSTART_RACES human ROUNDSTART_RACES lizard #ROUNDSTART_RACES gorilla #ROUNDSTART_RACES fly -#ROUNDSTART_RACES moth +ROUNDSTART_RACES moth ROUNDSTART_RACES plasmaman #ROUNDSTART_RACES shadow ROUNDSTART_RACES preternis @@ -484,10 +500,10 @@ OVERFLOW_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 ### @@ -507,10 +523,12 @@ REACTIONARY_EXPLOSIONS ## eg: If you give the number 20. The bomb cap will be 5,10,20. ## Can be any number above 4, some examples are provided below. +## Yogs (3, 6, 12) +BOMBCAP 12 ## Small (3, 7, 14) #BOMBCAP 14 ## Default (5, 10, 20) (recommended if you enable REACTIONARY_EXPLOSIONS above) -BOMBCAP 20 +#BOMBCAP 20 ## LagHell (7, 14, 28) #BOMBCAP 28 @@ -540,7 +558,7 @@ 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 @@ -553,7 +571,7 @@ MICE_ROUNDSTART 10 ROUNDSTART_TRAITS ## Uncomment to disable human moods. -#DISABLE_HUMAN_MOOD +DISABLE_HUMAN_MOOD ## Enable night shifts ## #ENABLE_NIGHT_SHIFTS @@ -565,7 +583,7 @@ ROUNDSTART_TRAITS #SHIFT_TIME_REALTIME ## A cap on how many monkeys may be created via monkey cubes -MONKEYCAP 64 +#MONKEYCAP 64 ## Enable the capitalist agenda on your server. ECONOMY diff --git a/config/lavaruinblacklist.txt b/config/lavaruinblacklist.txt index b0956a6b8f4b..71d034db6903 100644 --- a/config/lavaruinblacklist.txt +++ b/config/lavaruinblacklist.txt @@ -7,7 +7,7 @@ #_maps/RandomRuins/LavaRuins/lavaland_surface_biodome_winter.dmm #_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm #_maps/RandomRuins/LavaRuins/lavaland_biodome_clown_planet.dmm -#_maps/RandomRuins/LavaRuins/lavaland_surface_cube.dmm +_maps/RandomRuins/LavaRuins/lavaland_surface_cube.dmm ##RESPAWN #_maps/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm diff --git a/config/maps.txt b/config/maps.txt index fa80a1191408..81b39dad92d1 100644 --- a/config/maps.txt +++ b/config/maps.txt @@ -14,45 +14,27 @@ Format: endmap map yogstation - default - voteweight 1.5 + voteweight 1.6 votable endmap map minskystation - voteweight 0.5 + minplayers 80 endmap -#map boxstation - #default - #voteweight 1.5 -#endmap - map omegastation maxplayers 35 endmap - -#map metastation - #minplayers 25 -#endmap - map yogsmeta minplayers 25 votable endmap -#map pubbystation -#endmap - map yogspubby votable endmap -#map deltastation - #minplayers 50 -#endmap - map yogsdelta minplayers 50 votable @@ -60,7 +42,6 @@ endmap map icebox minplayers 25 - votable endmap map runtimestation @@ -68,3 +49,12 @@ endmap map multiz_debug endmap + +map eclipsestation + voteweight 0 +endmap + + + + + diff --git a/config/minor_filter.txt b/config/minor_filter.txt index a3ff31484d5e..4a0f32026309 100644 --- a/config/minor_filter.txt +++ b/config/minor_filter.txt @@ -16,17 +16,27 @@ # \b[f]+[u]+\b=fun you # This would make any word with combinations of "f" followed by "u" be replaced with fun you. So "ffffffffuuuuuuuuuuu" becomes "fun you". -wtf=what the fuck +#hahas lmao=haha -lol =haha -brb=be right back +\blol\b=haha kek=haha rofl=haha -lel=haha +\blel\b=haha +xd=haha + +#general netspeak +\btbh\b=to be honest +\bsmh\b=shaking my head +wtf=what the fuck +\bbrb\b=be right back +nvm=nevermind wbu=what about you -idk=I don't know -idc=I don't care +\bidk\b=I don't know +idfk=I don't fucking know +\bidc\b=I don't care +idfc=I don't fucking care hbu=how about you -brt=be right there -xd=haha -btw=by the way +\bbrt\b=be right there +\bffs\b=for fuck's sake +\bur\b=your +btw=by the way \ No newline at end of file diff --git a/config/motd.txt b/config/motd.txt index f7ba00787cd2..55f1b7863c9d 100644 --- a/config/motd.txt +++ b/config/motd.txt @@ -6,9 +6,11 @@ ¤ Admin Application ¤ GitHub Repo -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! +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!
+YOGS GENERAL SURVEY! Tell us what modes you want to see more or less of!
+ +Discord: https://discord.gg/0keg6hQH05Ha8OfO
+If you need to create an account on the forums please use this keyword to register: assistantgreytide
-Discord: https://discord.gg/0keg6hQH05Ha8OfO -If you need to create an account on the forums please use this keyword to register: assistantgreytide

diff --git a/config/spaceruinblacklist.txt b/config/spaceruinblacklist.txt index 44495d1ba1b8..44d63920d28e 100644 --- a/config/spaceruinblacklist.txt +++ b/config/spaceruinblacklist.txt @@ -4,7 +4,7 @@ #SPECIFYING AN INVALID MAP WILL RESULT IN RUNTIMES ON GAME START #_maps/RandomRuins/SpaceRuins/abandonedteleporter.dmm -#_maps/RandomRuins/SpaceRuins/abandonedzoo.dmm +_maps/RandomRuins/SpaceRuins/abandonedzoo.dmm #_maps/RandomRuins/SpaceRuins/asteroid1.dmm #_maps/RandomRuins/SpaceRuins/asteroid2.dmm #_maps/RandomRuins/SpaceRuins/asteroid3.dmm @@ -39,7 +39,7 @@ #_maps/RandomRuins/SpaceRuins/onehalf.dmm #_maps/RandomRuins/SpaceRuins/originalcontent.dmm #_maps/RandomRuins/SpaceRuins/shuttlerelic.dmm -#_maps/RandomRuins/SpaceRuins/yogsspacehotel.dmm //yogs - custom yogs space hotel +#_maps/RandomRuins/SpaceRuins/spacehotel.dmm #_maps/RandomRuins/SpaceRuins/thederelict.dmm #_maps/RandomRuins/SpaceRuins/turretedoutpost.dmm #_maps/RandomRuins/SpaceRuins/vaporwave.dmm From 29b490046da6cec70ef3d1e39d5a797487840e7f Mon Sep 17 00:00:00 2001 From: yogstation13-bot Date: Tue, 7 Apr 2020 16:45:21 +0100 Subject: [PATCH 2/2] whoops --- config/game_options.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/game_options.txt b/config/game_options.txt index 62f8f07ccef9..2b2724d75849 100644 --- a/config/game_options.txt +++ b/config/game_options.txt @@ -116,7 +116,7 @@ PROBABILITY MALFUNCTION 6 # New PROBABILITY HIVEMIND 0 PROBABILITY OVERTHROW 0 -PROBABILITY-TRAITORVAMP-2 +PROBABILITY TRAITORVAMP 2 PROBABILITY VAMPIRE 2 # Special