Commit Graph

77 Commits

Author SHA1 Message Date
Neerti 61e291a083 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 12/16/2015_newwizard 2016-07-08 21:00:12 -04:00
Anewbe e2f210f5bd Developers now appear in Staffwho 2016-06-27 18:51:40 -05:00
Neerti 20a3bd5b26 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 12/16/2015_newwizard 2016-06-26 20:14:29 -04:00
EmperorJon 254a1a04e0 Revert "Adds byond hub visibility as a config option 2" 2016-06-25 01:15:35 +01:00
spookerton 9a0aef4b83 *Compiles with the correct hub password set in hub.dm by default.
*Sets world visibility to 0 to maintain prior behavior.
*Adds a configuration toggle for setting the world public on startup.
2016-06-24 07:39:48 +01:00
Yoshax 0fb98bbabd Scheduler now uses btime, and other improvements 2016-06-01 17:56:07 +01:00
Arokha Sieyes 6c9346d0c4 Prevent Unexpected SQL Errors (#1628)
* Don't nag me, game.

* Added disabled message, made config consistent

* Missed adding 'else'
2016-05-14 21:09:21 -04:00
Datraen 39e5834692 Lowers requirements for the new game modes. 2016-04-02 15:13:54 -04:00
Neerti be43fd1d9e Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 12/16/2015_newwizard 2016-02-07 22:15:36 -05:00
Zuhayr 4aa2e8a269 Added a config option for a visible human deathgasp message. 2016-01-30 08:29:06 +10:30
Neerti 19603db5dc More work on new wizard. 2016-01-14 00:54:07 -07:00
Neerti a9dda6cf3f Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 9/6/2015_baymerge
Conflicts:
	.travis.yml
	code/game/gamemodes/cult/cult.dm
	code/game/gamemodes/heist/heist.dm
	code/game/gamemodes/ninja/ninja.dm
	code/game/gamemodes/nuclear/nuclear.dm
	code/game/gamemodes/traitor/traitor.dm
	code/game/gamemodes/wizard/wizard.dm
	code/game/jobs/job/civilian.dm
	code/game/jobs/job/medical.dm
	code/game/jobs/job/security.dm
	code/game/objects/structures/lattice.dm
	code/global.dm
	code/modules/projectiles/ammunition/boxes.dm
	code/modules/reagents/Chemistry-Recipes.dm
	config/example/config.txt
	polaris.dme
2015-09-06 18:26:06 -04:00
Zuhayr 63cb207eb8 Merge pull request #10890 from PsiOmegaDelta/150826-AltLangKeys
Languages now use alternative prefix keys.
2015-09-06 17:20:51 +09:30
Ccomp5950 a6e426c864 Update motd.txt
Something something new link.
2015-08-27 16:24:43 -04:00
PsiOmegaDelta 5962656c1e Languages now use alternative prefix keys.
Makes radio and language key overlaps possible.
It is possible to configure the default language keys server side.
Pending: The possibility for players to configure their own language keys.
2015-08-26 13:17:57 +02:00
Neerti 00fa623c9d Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
Conflicts:
	.travis.yml
	code/controllers/configuration.dm
	code/game/gamemodes/changeling/modularchangling.dm
	code/game/jobs/job/medical.dm
	code/game/jobs/job/security.dm
	code/game/machinery/Sleeper.dm
	code/game/machinery/computer/communications.dm
	code/game/machinery/cryopod.dm
	code/game/objects/items/weapons/RCD.dm
	code/game/objects/items/weapons/storage/boxes.dm
	code/game/turfs/simulated/floor.dm
	code/game/turfs/simulated/floor_types.dm
	code/global.dm
	code/modules/materials/materials.dm
	code/modules/mob/living/silicon/ai/ai.dm
	code/modules/projectiles/guns/projectile/automatic.dm
	polaris.dme
2015-08-23 01:30:46 -04:00
Karolis2011 cc029828bb Updated old wiki link to a new one. 2015-08-11 17:20:55 +03:00
Neerti 88270df755 Refactors the map generation to not assume the fifth z-level is mining. Now it checks the config.txt. 2015-08-09 05:49:25 -04:00
Neerti 8152ce0676 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 7/29/2015_bay_sync
Conflicts:
	polaris.dme
2015-07-29 03:45:53 -04:00
Zuhayr e0429af2f7 Added config option for initial brain organ health. 2015-07-27 15:33:54 +09:30
Zuhayr 4afa8a80f8 Readds config option to disable organ decay. 2015-07-27 15:30:38 +09:30
Neerti 6eece8ac45 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 7/16/2015_bay_merge_2
Conflicts:
	.travis.yml
	polaris.dme
2015-07-16 22:46:53 -04:00
PsiOmegaDelta 7b3759c1f3 Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/controllers/configuration.dm
	code/modules/admin/topic.dm
	config/example/config.txt
2015-07-12 14:49:31 +02:00
Null Snapshot 55ef56e36e mentors.txt needed instructions. 2015-07-09 12:13:40 -07:00
Null Snapshot a28d3cd9d1 Added new config variables for toggling moderator tempban permissions and maximum duration for bans. 2015-07-09 12:10:18 -07:00
Neerti 462eaa834b Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 6/25/2015_bay_sync
Conflicts:
	.travis.yml
	code/modules/clothing/spacesuits/rig/modules/combat.dm
	code/modules/clothing/spacesuits/rig/modules/utility.dm
	code/modules/mob/living/silicon/ai/ai.dm
	icons/mob/rig_back.dmi
	polaris.dme
2015-06-25 18:50:18 -04:00
PsiOmegaDelta f5da9f70c5 Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	config/example/config.txt
2015-06-19 09:55:48 +02:00
Ccomp5950 eea423ce0f Merge pull request #9857 from GinjaNinja32/bot
Adds support for bots which use world.Export() for server-to-bot communication
2015-06-18 13:46:50 -04:00
GinjaNinja32 8d232e9304 Adds support for bots which use world.Export() for server-to-bot communication 2015-06-18 18:34:55 +01:00
GinjaNinja32 a60b91fd1b Adds a new configuration value, SERVERURL, for the IRC bot to use if set 2015-06-17 10:00:35 +01:00
Neerti 2a45114038 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 6/5/2015_bay_merge
Conflicts:
	.travis.yml
	code/controllers/configuration.dm
	code/datums/supplypacks.dm
	code/game/machinery/bluespacerelay.dm
	code/game/machinery/hologram.dm
	code/game/objects/items/weapons/RCD.dm
	code/game/objects/items/weapons/circuitboards/machinery/commsantenna.dm
	code/game/turfs/simulated/floor.dm
	code/game/turfs/simulated/floor_types.dm
	code/game/turfs/simulated/walls.dm
	code/global.dm
	code/modules/clothing/spacesuits/rig/suits/ert.dm
	code/modules/mob/living/silicon/ai/ai.dm
	code/modules/research/designs.dm
	config/example/config.txt
	icons/mob/feet.dmi
	icons/mob/head.dmi
	icons/mob/suit.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/clothing/shoes.dmi
	icons/obj/clothing/suits.dmi
	icons/obj/rig_modules.dmi
	interface/interface.dm
	maps/exodus-3.dmm
	polaris.dme
2015-06-05 22:11:15 -04:00
PsiOmega 5e84bfa57c Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/modules/clothing/spacesuits/rig/suits/ert.dm
2015-05-30 15:59:54 +02:00
Zuhayr 445056ba5f 'Fixes' #9395 2015-05-30 03:59:54 +09:30
PsiOmega 4ce737d87d Server build date and revision.
Can now see the current compilation date and revision:
* In the Dream Daemon log output.
* By using the "Show Server Revision" client verb which also links you to the commit in question.
2015-05-29 08:26:31 +02:00
PsiOmega 98c585615e Inactivity process tweaks.
Partially by request:
The inactive check process now respects client holder status and can be configured how long clients may remain inactive before being kicked.
2015-05-26 09:04:26 +02:00
Zuhayr 088aa953ef Cleanup of testing sprites and custom item defines. 2015-05-12 21:36:53 +09:30
Zuhayr 59af7e5c4d Refactor/rewrite of custom item spawning. 2015-05-12 15:14:51 +09:30
Miniature ed60b17f8d Cherrypicking Mini's custom item code. 2015-05-12 11:02:34 +09:30
Neerti a52334eff8 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 4/18/2015_bay_sync 2015-04-18 23:08:17 -04:00
PsiOmega 9ef7aeb940 On join clients are now given a changelog notice, if the changelog has changed since last. 2015-04-18 15:53:23 +02:00
Neerti 61e415eed9 Updates the wiki verb to be able to type, say 'wiki cult', and hopefully go to the cult page. 2015-04-07 07:36:25 -04:00
GinjaNinja32 4095c7053d Add GENERATE_ASTEROID line to example config file, defaulted to off. 2015-03-24 14:59:13 +00:00
PsiOmega 744ef41d8e Law Zero phrasing is now a config option.
The default value is a non-objective phrasing. config.txt contains the default phrasing should it be desired.
2015-03-17 14:47:32 +01:00
PsiOmega 6749e09ead Makes available ERT species a config option. 2015-03-08 15:45:52 +01:00
PsiOmega d0aa773020 Makes starlight strength configurable. 2015-02-24 16:12:07 +01:00
PsiOmega 5023fa4000 Ports /tg/'s starlight luminance.
Because configuration is initialized before the map we also don't have the same runtimes issues corrected by https://github.com/tgstation/-tg-station/pull/7806.
2015-02-23 10:11:46 +01:00
Loganbacca 7812ad9782 Updated example config for nuclear/mercenary rename 2015-01-27 17:41:21 +13:00
Zuhayr 8978747e53 Moved several globals into the config controller, updated eample config appropriately. 2014-12-25 21:10:30 +10:30
Zuhayr 5730bcb885 Merged master/dev config.txt. 2014-12-10 16:35:39 +10:30
ccomp5950 3414e48ceb Adds "paranoid" option to remove more powerful debug options from R_DEBUG.
The purpose of this is to allow for testers on our test server without them having advance proc call which can do some fun stuff with python, etc.
    Also removes debug controller so that testers can't just edit the configuration to remove debugparanoid

    The default config is the status quo, you have to go out of your way and set this option in config to remove proccal from R_DEBUG
2014-12-09 21:25:07 -05:00