60196df634
Merge branch 'dev' into ofClicksAndCooldowns
...
Conflicts:
code/modules/projectiles/gun.dm
2015-08-13 08:40:31 +03:00
5cbb703609
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/_helpers/unsorted.dm
code/game/jobs/access.dm
code/modules/mob/living/carbon/human/life.dm
code/modules/mob/update_icons.dm
code/modules/organs/organ.dm
code/modules/reagents/Chemistry-Holder.dm
code/setup.dm
2015-07-27 10:20:20 +02:00
e0429af2f7
Added config option for initial brain organ health.
2015-07-27 15:33:54 +09:30
4afa8a80f8
Readds config option to disable organ decay.
2015-07-27 15:30:38 +09:30
c6f4f7fcee
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-07-12 15:14:43 +02:00
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
168f823c35
Fixed up the things pointed out by Ccomp5950.
2015-07-09 22:19:05 -07:00
a28d3cd9d1
Added new config variables for toggling moderator tempban permissions and maximum duration for bans.
2015-07-09 12:10:18 -07:00
087a978d56
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into clickcooldown
...
Conflicts:
code/_onclick/click.dm
code/_onclick/telekinesis.dm
code/game/objects/items.dm
code/game/objects/structures/grille.dm
code/game/turfs/simulated/walls.dm
code/modules/mob/living/carbon/resist.dm
code/modules/mob/living/simple_animal/simple_animal.dm
2015-06-28 22:35:14 -04:00
1558bd5b75
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/objects/items/toys.dm
code/modules/mob/living/carbon/brain/life.dm
code/modules/mob/living/carbon/human/life.dm
code/modules/mob/living/living_defense.dm
code/modules/reagents/Chemistry-Holder.dm
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm
code/modules/reagents/reagent_containers.dm
html/changelogs/.all_changelog.yml
2015-06-19 10:19:08 +02:00
f5da9f70c5
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
config/example/config.txt
2015-06-19 09:55:48 +02:00
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
8d232e9304
Adds support for bots which use world.Export() for server-to-bot communication
2015-06-18 18:34:55 +01:00
a60b91fd1b
Adds a new configuration value, SERVERURL, for the IRC bot to use if set
2015-06-17 10:00:35 +01:00
0071ed3f24
Merge branch 'dev' into ofClicksAndCooldowns
...
Conflicts:
code/_onclick/click.dm
code/_onclick/telekinesis.dm
code/game/machinery/deployable.dm
code/game/objects/items.dm
code/game/objects/structures/grille.dm
code/modules/mob/living/simple_animal/simple_animal.dm
code/setup.dm
2015-06-07 14:05:54 +03:00
d0232732d4
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/machinery/floodlight.dm
code/game/objects/items/devices/suit_cooling.dm
code/modules/organs/subtypes/diona.dm
code/modules/paperwork/pen.dm
code/modules/reagents/reagent_containers/hypospray.dm
html/changelogs/.all_changelog.yml
2015-05-30 16:11:57 +02:00
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
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
5ea78421ff
Merge pull request #9408 from mwerezak/sm-eject
...
Limits the ability of the SM to return to the station zlevel once ejected
2015-05-28 11:35:39 +09:30
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
6d54e1c655
Merge branch 'dev' into ofClicksAndCooldowns
...
Conflicts:
code/game/turfs/simulated/walls.dm
code/modules/mob/living/carbon/resist.dm
code/modules/mob/mob_grab.dm
2015-05-21 17:00:50 +03:00
3c67c46442
Limits the ability of the SM to return to the station zlevel once ejected.
...
Fixes #7900
2015-05-21 01:02:30 -04:00
413276a4c5
Allows damage to accumulate past max_damage on vital organs
...
Fixes #9214
2015-05-16 02:05:44 -04:00
3fa79f8d51
Removes click cooldowns almost everywhere.
...
Still have: doors, windoors, cameras, windows, grilles, blobs, resisting, alien stuff, mechas, spray bottles.
Setting changeNextMove is now responsibility of the item being attacked.
Adds a config option to eliminate click cooldowns completely. Intended to be used by devs.
2015-05-09 17:27:19 +03:00
82a8f32783
Admins can now toggle LOOC separately from OOC.
...
Also includes what I image to be proper permission checks for toggling the various OOC channels.
2015-04-30 09:52:29 +02:00
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
3718245e45
Moves asteroid generation prior to geometry initialization. Adds config for asteroid generation.
2015-03-21 11:13:53 +10:30
4fdc00dee4
Working on gamemode/antagonist code.
2015-03-21 11:08:22 +10:30
98da191ac3
Gamemode refactor, lots of code shuffles, PR will have details.
2015-03-21 11:08:17 +10:30
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
6749e09ead
Makes available ERT species a config option.
2015-03-08 15:45:52 +01:00
d0aa773020
Makes starlight strength configurable.
2015-02-24 16:12:07 +01:00
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
8978747e53
Moved several globals into the config controller, updated eample config appropriately.
2014-12-25 21:10:30 +10:30
168cabf03a
Fixes manual runtimes without modifying the construction of every object
...
Loads configuration before map creation instead.
This reverts commit 37b14bae39
2014-12-13 09:35:36 -05:00
5730bcb885
Merged master/dev config.txt.
2014-12-10 16:35:39 +10:30
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
ddc1a617d0
Fixes and event end estimations.
2014-11-12 09:39:54 +01:00
611a8113a6
Merge remote-tracking branch 'upstream/dev' into TheGreatEvents
...
Conflicts:
code/modules/events/radiation_storm.dm
2014-11-05 14:37:20 +01:00
fc67087d7a
More Z-level compatibility
...
Previously missed Z-level checks in the form "z != X". Utilized this regex which hopefully has cought most of them [zZ](\s?)(!?)=(\s?)(\d+).
Adds more Z-level configuration, admin levels.
2014-11-03 09:57:56 +01:00
ff14da90b3
Random Event Overhaul
...
Alters the event controller based on http://baystation12.net/forums/viewtopic.php?f=5&t=10706 .
Exception is that there is always some start time variance to prevent metagaming.
Mundane, moderate, and major events run on their own timers and start and run independantly of each other.
Multiple events of the same severity degree can run at the same time. However, currently only one instance of the same event can be active at a time.
2014-11-03 09:22:37 +01:00
bf1e6af508
Z-Level Compatibility
...
Now possible to configure 3 different kind of Z-levels.
Station levels: Which Z-levels the station exists on.
Contact levels: Which Z-levels are typically affected by, for example, Code Red which alters the visual state of fire alarms.
Player levels: Which Z-levels a character can typically reach.
2014-10-30 14:29:56 +01:00
322e03dd06
Makes the number of load/storable character slots a configurable value.
2014-10-14 10:05:22 +02:00
0c83a95b90
Large merge resultion. Used remote for map conflicts.
2014-09-23 21:41:54 +09:30
9f53cb3673
Removes pump heating
2014-09-13 20:41:12 -04:00
e7c2cf033e
Adds config option for air compression heating
2014-09-12 01:18:12 -04:00
c7257c1bf2
Added handling for space travel/stragglers.
...
Now new empty space levels are created if needed.
Added config option to use overmap system, ticked files in.
Conflicts:
code/setup.dm
2014-08-19 19:05:17 +04:00
0dabf4fc0a
Added in loyalty implant as a configuration...
...
Also reorganized a few configurations to be more intuitive and readable.
Just spaces and moving around on the switch thingy.
Signed-off-by: Decius <deciusreln97@gmail.com >
2014-07-14 16:27:07 -04:00
cc4a6e0f26
Fixes config.continous_rounds and adds check
2014-06-01 15:49:13 -04:00
1fc3ecf145
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
2014-05-10 01:56:57 +09:30
Kelenius