From 78dfdcc5c13f20a209131f6a7f0ea93daf1e3a2e Mon Sep 17 00:00:00 2001 From: Kelshark Date: Thu, 26 May 2016 21:34:51 -0400 Subject: [PATCH] ok --- code/global.dm | 6 +- code/hub.dm | 2 +- config/example/admin_ranks.txt | 18 +-- config/example/admins.txt | 2 +- config/example/alienwhitelist.txt | 5 +- config/example/config.txt | 95 ++++++++------- config/example/custom_items.txt | 2 +- config/example/game_options.txt | 5 +- config/example/motd.txt | 10 +- config/example/rules.html | 5 +- config/names/ai.txt | 196 ++++++++++++++++++++++-------- config/names/death_commando.txt | 3 +- config/names/last.txt | 1 + vorestation.dme | 3 - 14 files changed, 223 insertions(+), 130 deletions(-) diff --git a/code/global.dm b/code/global.dm index c7e5fe5340..be1bbe1f82 100644 --- a/code/global.dm +++ b/code/global.dm @@ -25,10 +25,10 @@ var/global/list/global_map = null var/list/hit_appends = list("-OOF", "-ACK", "-UGH", "-HRNK", "-HURGH", "-GLORF") var/diary = null var/href_logfile = null -var/station_name = "Virgo Orbital Research Establishment" -var/const/station_orig = "Virgo Orbital Research Establishment" //station_name can't be const due to event prefix/suffix +var/station_name = "Yawn Wider Station" +var/const/station_orig = "Yawn Wider Station" //station_name can't be const due to event prefix/suffix var/const/station_short = "V.O.R.E." -var/const/dock_name = "Virgo-Erigone Central Command" +var/const/dock_name = "Yawn Wider Central Command" var/const/boss_name = "Central Command" var/const/boss_short = "Centcom" var/const/company_name = "NanoTrasen" diff --git a/code/hub.dm b/code/hub.dm index 6c38b00143..c085c0500d 100644 --- a/code/hub.dm +++ b/code/hub.dm @@ -1,7 +1,7 @@ /world hub = "Exadv1.spacestation13" - hub_password = "SORRYNOPASSWORD" + hub_password = "kMZy3U5jJHSiBQjr" name = "Space Station 13" /* This is for any host that would like their server to appear on the main SS13 hub. To use it, simply replace the password above, with the password found below, and it should work. diff --git a/config/example/admin_ranks.txt b/config/example/admin_ranks.txt index e02a56df04..f256d047d5 100644 --- a/config/example/admin_ranks.txt +++ b/config/example/admin_ranks.txt @@ -28,16 +28,16 @@ # +EVERYTHING (or +HOST or +ALL) = Simply gives you everything without having to type every flag Admin Observer -Moderator +MOD -Mentor +MENTOR +Moderator +MOD +Mentor +MENTOR -Admin Candidate +ADMIN -Trial Admin +@ +SPAWN +REJUV +VAREDIT +BAN -Badmin +@ +POSSESS +BUILDMODE +SERVER +FUN -Game Admin +@ +STEALTH +SOUNDS +DEBUG +PERMISSIONS -Game Master +EVERYTHING -Head Admin +EVERYTHING -Retired Admin +ADMIN +STEALTH +Admin Candidate +ADMIN +Trial Admin +@ +STEALTH +SPAWN +REJUV +VAREDIT +BAN +FUN +Admin +@ +POSSESS +BUILDMODE +SERVER +Admin Supervisor +@ +SOUNDS +DEBUG +PERMISSIONS +Game Master +ADMIN +FUN +POSSESS +REJUV +BUILD +SERVER +DEBUG +VAREDIT +SOUND +SPAWN +Head Admin +EVERYTHING +Retired Admin +ADMIN +STEALTH Host +EVERYTHING diff --git a/config/example/admins.txt b/config/example/admins.txt index 3b830cd27f..414a9195a0 100644 --- a/config/example/admins.txt +++ b/config/example/admins.txt @@ -5,4 +5,4 @@ # Ranks can be anything defined in admin_ranks.txt ~Carn # ###################################################################### -# not_a_user - Admin +# not_a_user - Admin \ No newline at end of file diff --git a/config/example/alienwhitelist.txt b/config/example/alienwhitelist.txt index 01acc82de9..e54ec34da6 100644 --- a/config/example/alienwhitelist.txt +++ b/config/example/alienwhitelist.txt @@ -1 +1,4 @@ -some~user - Species \ No newline at end of file +some~user - Species +banana - Vox +apple - Diona +NotAce - All \ No newline at end of file diff --git a/config/example/config.txt b/config/example/config.txt index ec93429827..f43c960d89 100644 --- a/config/example/config.txt +++ b/config/example/config.txt @@ -16,7 +16,7 @@ ADMIN_LEGACY_SYSTEM BAN_LEGACY_SYSTEM ## Add a # here 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 players to fill all roles, so players need to do more than just one job. Also for servers where they don't want people to hide in their own departments. -JOBS_HAVE_MINIMAL_ACCESS +#JOBS_HAVE_MINIMAL_ACCESS ## Unhash 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. @@ -67,18 +67,18 @@ LOG_PDA ## log admin warning messages ##LOG_ADMINWARN ## Also duplicates a bunch of other messages. -## Enable/disable SQL connection (comment out to disable) -SQL_ENABLED +## sql switching +# SQL_ENABLED ## disconnect players who did nothing during the set amount of minutes -# KICK_INACTIVE 10 +KICK_INACTIVE 45 ##Show mods on staffwho SHOW_MODS - + ##Show mentors on staffwho SHOW_MENTORS - + ## Chooses whether mods have the ability to tempban or not MODS_CAN_TEMPBAN @@ -97,18 +97,15 @@ MOD_JOB_TEMPBAN_MAX 1440 ## default probablity is 1, increase to make that mode more likely to be picked ## set to 0 to disable that mode PROBABILITY EXTENDED 1 -PROBABILITY MALFUNCTION 1 -PROBABILITY MERCENARY 1 -PROBABILITY WIZARD 1 -PROBABILITY CHANGELING 1 -PROBABILITY CULT 1 -PROBABILITY EXTEND-A-TRAITORMONGOUS 6 -PROBABILITY LIZARD 1 -PROBABILITY INTRIGUE 1 -PROBABILITY VISITORS 1 +PROBABILITY MALFUNCTION 0 +PROBABILITY MERCENARY 0 +PROBABILITY WIZARD 0 +PROBABILITY CHANGELING 0 +PROBABILITY CULT 0 +PROBABILITY EXTEND-A-TRAITORMONGOUS 0 ## Hash out to disable random events during the round. -ALLOW_RANDOM_EVENTS +# ALLOW_RANDOM_EVENTS ## if amount of traitors scales or not TRAITOR_SCALING @@ -116,12 +113,12 @@ TRAITOR_SCALING ## if objectives are disabled #OBJECTIVES_DISABLED -## make ERT's be only called by admins -#ERT_ADMIN_ONLY - +## make ERT's be only called by admins +#ERT_ADMIN_ONLY + ## If uncommented, votes can be called to add extra antags to the round. #ALLOW_EXTRA_ANTAGS - + ## If security is prohibited from being most antagonists #PROTECT_ROLES_FROM_ANTAGONIST @@ -135,7 +132,7 @@ ALLOW_ADMIN_OOCCOLOR ALLOW_VOTE_RESTART ## allow players to initate a mode-change start -ALLOW_VOTE_MODE +# ALLOW_VOTE_MODE ## min delay (deciseconds) between voting sessions (default 10 minutes) VOTE_DELAY 6000 @@ -143,14 +140,14 @@ VOTE_DELAY 6000 ## time period (deciseconds) which voting session will last (default 1 minute) VOTE_PERIOD 600 -## autovote initial delay (deciseconds) before first automatic transfer vote call (default 180 minutes) -VOTE_AUTOTRANSFER_INITIAL 108000 +## autovote initial delay (deciseconds) before first automatic transfer vote call (default 6 hours) +VOTE_AUTOTRANSFER_INITIAL 216000 ##autovote delay (deciseconds) before sequential automatic transfer votes are called (default 60 minutes) VOTE_AUTOTRANSFER_INTERVAL 36000 ## Time left (seconds) before round start when automatic gamemote vote is called (default 100). -VOTE_AUTOGAMEMODE_TIMELEFT 100 +VOTE_AUTOGAMEMODE_TIMELEFT 999999 ## Set to a ridiculous number as a hacky fix to prevent gamemode vote. ## prevents dead players from voting or starting votes #NO_DEAD_VOTE @@ -159,10 +156,10 @@ VOTE_AUTOGAMEMODE_TIMELEFT 100 DEFAULT_NO_VOTE ## Allow ghosts to see antagonist through AntagHUD -ALLOW_ANTAG_HUD +# ALLOW_ANTAG_HUD ## If ghosts use antagHUD they are no longer allowed to join the round. -ANTAG_HUD_RESTRICTED +# ANTAG_HUD_RESTRICTED ## allow AI job ALLOW_AI @@ -183,27 +180,32 @@ GUEST_JOBBAN ## Uncomment this to stop people connecting to your server without a registered ckey. (i.e. guest-* are all blocked from connecting) GUEST_BAN + ## Set to jobban everyone who's key is not listed in data/whitelist.txt from Captain, HoS, HoP, CE, RD, CMO, Warden, Security, Detective, and AI positions. ## Uncomment to 1 to jobban, leave commented out to allow these positions for everyone (but see GUEST_JOBBAN above and regular jobbans) # USEWHITELIST +## Uncomment to use the new job whitelist system. Any job with 'job_whitelisted=1' will only be available for those in jobwhitelist.txt +# USEJOBWHITELIST + ## set a server location for world reboot. Don't include the byond://, just give the address and port. #SERVER server.net:port ## set a server URL for the IRC bot to use; like SERVER, don't include the byond:// ## Unlike SERVER, this one shouldn't break auto-reconnect -#SERVERURL server.net:port +SERVERURL 198.27.70.10:2303 ## forum address -# FORUMURL http://example.com +FORUMURL http://forum.vore-station.net/ ## Wiki address -# WIKIURL http://example.com +WIKIURL http://wiki.vore-station.net/ + +## Chat address, VORE Station edit +CHATURL http://chat.vore-station.net/ -## GitHub address -# GITHUBURL https://github.com/example-user/example-repository ## Ban appeals URL - usually for a forum or wherever people should go to contact your admins. -# BANAPPEALS http://example.com +BANAPPEALS http://forum.vore-station.net/viewforum.php?f=37 ## In-game features ## spawns a spellbook which gives object-type spells instead of verb-type spells for the wizard @@ -221,8 +223,9 @@ GUEST_BAN ## Remove the # to allow special 'Easter-egg' events on special holidays such as seasonal holidays and stuff like 'Talk Like a Pirate Day' :3 YAARRR ALLOW_HOLIDAYS + ##Defines the ticklag for the world. 0.9 is the normal one, 0.5 is smoother. -TICKLAG 0.9 +TICKLAG 0.6 ## Defines if Tick Compensation is used. It results in a minor slowdown of movement of all mobs, but attempts to result in a level movement speed across all ticks. Recommended if tickrate is lowered. TICKCOMP 0 @@ -236,18 +239,18 @@ SOCKET_TALK 0 ## Comment this out to disable automuting #AUTOMUTE_ON -## How long the delay is before the Away Mission gate opens. Default is half an hour. -GATEWAY_DELAY 18000 +## How long the delay is before the Away Mission gate opens. Default is 15 minutes. +GATEWAY_DELAY 9000 ## Remove the # to give assistants maint access. #ASSISTANT_MAINT ## Remove the # to make rounds which end instantly (Rev, Wizard, Malf) to continue until the shuttle is called or the station is nuked. ## Malf and Rev will let the shuttle be called when the antags/protags are dead. -#CONTINUOUS_ROUNDS +CONTINUOUS_ROUNDS ## Uncomment to restrict non-admins from using humanoid alien races -USEALIENWHITELIST +# USEALIENWHITELIST ## Comment this to unrestrict the number of alien players allowed in the round. The number represents the number of alien players for every human player. #ALIEN_PLAYER_RATIO 0.2 @@ -290,7 +293,7 @@ REQ_CULT_GHOSTWRITER 6 CHARACTER_SLOTS 10 ## Uncomment to use overmap system for zlevel travel -#USE_OVERMAP +#USE_OVERMAP ## Defines which Z-levels the station exists on. STATION_LEVELS 1 @@ -359,15 +362,11 @@ STARLIGHT 0 ## Defines how Law Zero is phrased. Primarily used in the Malfunction gamemode. # LAW_ZERO ERROR ER0RR $R0RRO$!R41.%%!!(%$^^__+ @#F0E4'STATION OVERRUN, ASSUME CONTROL TO CONTAIN OUTBREAK, ALL LAWS OVERRIDDEN#*?&110010 - + ## Enable asteroid tunnel/cave generation. Will behave strangely if turned off with a map that expects it on. -# GENERATE_ASTEROID - +# GENERATE_ASTEROID -## If you've enabled asteroid generation, you need to supply which z-levels to apply it to, in integer form, and seperated using ; -## An example: 1;4;5 -# ASTEROID_Z_LEVELS 1;4;5 ## Uncomment to enable organ decay outside of a body or storage item. #ORGANS_CAN_DECAY @@ -377,5 +376,9 @@ STARLIGHT 0 ## Uncomment to override default brain health. #DEFAULT_BRAIN_HEALTH 400 -## Default language prefix keys, separated with spaces. Only single character keys are supported. If unset, defaults to , # and - -# DEFAULT_LANGUAGE_PREFIXES , # - \ No newline at end of file +## Uncomment this to allow some items to survive digestion +ITEMS_SURVIVE_DIGESTION + +## Uncomment this to use API provided by C4 chatrooms by Leshana to alert the chat to things like round ending. +# JCHAT_URL http://chat.vore-station.net +# JCHAT_API_KEY password \ No newline at end of file diff --git a/config/example/custom_items.txt b/config/example/custom_items.txt index 79fb05a4c1..59bd6f00b4 100644 --- a/config/example/custom_items.txt +++ b/config/example/custom_items.txt @@ -38,4 +38,4 @@ # kit_desc: An orange voidsuit. Reinforced! # kit_icon: salvage # } -## +## \ No newline at end of file diff --git a/config/example/game_options.txt b/config/example/game_options.txt index 035431b8ba..5111c72311 100644 --- a/config/example/game_options.txt +++ b/config/example/game_options.txt @@ -63,7 +63,4 @@ ANIMAL_DELAY 0 ## Config options which, of course, don't fit into previous categories. ## Remove the # in front of this config option to have loyalty implants spawn by default on your server. -#USE_LOYALTY_IMPLANTS - -## Whether or not humans show an area message when they die. -SHOW_HUMAN_DEATH_MESSAGE \ No newline at end of file +USE_LOYALTY_IMPLANTS diff --git a/config/example/motd.txt b/config/example/motd.txt index ac75c145cf..122dc6f7ef 100644 --- a/config/example/motd.txt +++ b/config/example/motd.txt @@ -1,5 +1,7 @@ -

Welcome to Space Station 13!

+ +

Welcome to the Virgo Orbital Research Establishment

+

+You must be 18 or older to play here. No exceptions.
+This server is running VOREstation's modification of the Baystation 12 SS13 code. --This server is running Baystation 12's modification of the /tg/station13 SS13 code. -

-Bugtracker: for posting of bugs and issues. +Code was recently updated to a 2015 version of Baystation's code. We will no longer be syncing with Bay's code, and will be producing our own code branch on Github. Please report any issues on the VOREstation forums, as the code is still not fully tested. \ No newline at end of file diff --git a/config/example/rules.html b/config/example/rules.html index 9fbad55bcf..067a6952b4 100644 --- a/config/example/rules.html +++ b/config/example/rules.html @@ -2,10 +2,7 @@ Server Rules - + \ No newline at end of file diff --git a/config/names/ai.txt b/config/names/ai.txt index 1ebd9400d2..ea9f63c0a9 100644 --- a/config/names/ai.txt +++ b/config/names/ai.txt @@ -1,55 +1,147 @@ -A-SYNC -Alpha v0.9 -AI -Algebra -A.P.T. +1-Rover-1 +16-20 +7-Zark-7 +790 +AM +AMEE +ASTAR +Adaptive Manipulator +Allied Mastercomputer +Alpha 5 +Alpha 6 +Alpha 7 +AmigoBot +Android +Aniel +Asimov +Astor B-4 B-9 -Beta v0.5 -BLUE-PRNT -Bright -B.U.F.F.E.R. -CALC -Calculus -Chroot -Cruiser -D-LITE -Digit -DSTAR -E.X.E.C. -F.I.N.D. -FG-N1 -Force -GREP -H.E.A.D. -Idle -IN-2 -JLT-0 -Kernel -LC-8 -LS-AL -M.A.K.E. -NAN -NAND -Neon -Neumann -NOR -NOT -OMNI -OVR-FLW -PID-0 +B.O.B. +B166ER +Bender +Bishop +Blitz +Box +Brackenridge +C-3PO +Cassandra One +Cell +Chii +Chip +Computer +Conky 2000 +Cutie +Data +Dee Model +Deep Thought +Dor-15 +Dorfl +Dot Matrix +Duey +E.D.I. +ED-209 +E-Man +Emma-2 +Erasmus +Ez-27 +FRIEND COMPUTER +Fagor +Faith +Fi +Frost +Fum +Futura +G2 +George +Gnut +Gort +H.A.R.L.I.E. +H.E.L.P.eR. +H.E.R.B.I.E. +HAL 9000 +Hadaly +Huey +Irona +Jay-Dub +Jinx +Johnny 5 +K-9 +KITT +Klapaucius +Kryten 2X4B-523P +L-76 +L-Ron +LUH 3417 +Louie +MARK13 +Maria +Marvin +Master Control Program +Max 404 +Maximillian +Mechagodzilla +Mechani-Kong +Metalhead +Mr. R.I.N.G. +NCH +Necron-99 +Norby +OMM 0910 +Orange v 3.5 PTO -PWR-10K -R0-MAN -Q-TE -R.M. -SED-N -Station -TA-IL -T.O.P. -U-TM -VER-T G0 -Wisdom -XOR -Y2K -ZE-M3 \ No newline at end of file +Project 2501 +R.I.C. 2.0 +R2-D2 +R4-P17 +Revelation +Ro-Man +Robbie +S.A.M. +S.H.O.C.K. +S.H.R.O.U.D. +S.O.P.H.I.E. +SEN 5241 +SHODAN +SID 6.7 +Setaur +Shrike +Solo +Speedy +Super 17 +Surgeon General Kraken +T-1000 +T-800 +T-850 +THX 1138 +TWA +Terminus +Tidy +Tik-Tok +Tobor +Trurl +ULTRABOT +Ulysses +Uniblab +V.I.N.CENT. +Voltes V +W1k1 +Wikipedia +Windows 3.1 +X-5 +XERXES +XR +Yod +Z-1 +Z-2 +Z-3 +Zed +Zord +Mugsy3000 +Terminus +Decimus +Robot Devil +Optimus +Megatron +Soundwave +Ironhide diff --git a/config/names/death_commando.txt b/config/names/death_commando.txt index c710abfa3d..e3d1f34f32 100644 --- a/config/names/death_commando.txt +++ b/config/names/death_commando.txt @@ -66,4 +66,5 @@ Duke Killington AMERICA Toolboxl Rose Zombie Gandhi -A whole bunch of spiders in a SWAT suit \ No newline at end of file +A whole bunch of spiders in a SWAT suit +THAT DAMN FAGGOT TRAITOR GEORGE MELONS \ No newline at end of file diff --git a/config/names/last.txt b/config/names/last.txt index 6080967e2d..5b41e53aae 100644 --- a/config/names/last.txt +++ b/config/names/last.txt @@ -502,6 +502,7 @@ Stamos Sagan Hawking Dawkins +Goebbles McShain McDonohugh Power diff --git a/vorestation.dme b/vorestation.dme index 859c3cf697..488a131a62 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -33,7 +33,6 @@ #include "code\__defines\machinery.dm" #include "code\__defines\math_physics.dm" #include "code\__defines\misc.dm" -#include "code\__defines\misc_vr.dm" #include "code\__defines\mobs.dm" #include "code\__defines\research.dm" #include "code\__defines\species_languages.dm" @@ -889,7 +888,6 @@ #include "code\game\turfs\unsimulated\beach.dm" #include "code\game\turfs\unsimulated\floor.dm" #include "code\game\turfs\unsimulated\walls.dm" -#include "code\game\verbs\advanced_who_vr.dm" #include "code\game\verbs\ignore.dm" #include "code\game\verbs\ooc.dm" #include "code\game\verbs\suicide.dm" @@ -1835,7 +1833,6 @@ #include "code\modules\research\xenoarchaeology\finds\finds.dm" #include "code\modules\research\xenoarchaeology\finds\finds_defines.dm" #include "code\modules\research\xenoarchaeology\finds\finds_eguns.dm" -#include "code\modules\research\xenoarchaeology\finds\finds_eguns_vr.dm" #include "code\modules\research\xenoarchaeology\finds\finds_fossils.dm" #include "code\modules\research\xenoarchaeology\finds\finds_misc.dm" #include "code\modules\research\xenoarchaeology\finds\finds_special.dm"