cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-21 15:42:35 +00:00
Code Issues Packages Projects Releases Wiki Activity
28,035 Commits 74 Branches 23 Tags
03678b308666103634af63a61f2cb192b8d97eaa
Commit Graph

135 Commits

Author SHA1 Message Date
Chinsky
a287e47c28 Merge pull request #11364 from PsiOmegaDelta/151024-Btime 
Scheduler now uses btime, and other improvements.
 2015-11-19 10:14:03 +03:00
Chinsky
ae91bdbab6 Merge pull request #11328 from PsiOmegaDelta/151017-DelayedAntag 
Adds antagonism minimum player age.
 2015-11-19 10:07:57 +03:00
PsiOmegaDelta
6f559779b5 Additional respawn refactoring. 
Removes a non-utilized config setting.
Adds a config setting to set the respawn timer, defaults to 30 minutes as today.
Makes the MayRespawn() proc utilize this config setting. Makes more uses of MayRespawn() check the respawn delay.
 2015-11-08 20:05:37 +01:00
PsiOmegaDelta
88d85c16fa Scheduler now uses btime. 
Partial port of https://github.com/ParadiseSS13/Paradise/pull/1540.
 2015-10-24 12:53:04 +02:00
PsiOmegaDelta
5c40db0fad Adds antagonism minimum player age. 
Round-start and mid-round auto-antagonism selection can now exclude players if they have not reached a given minimum age requirement.
Can be enabled/disabled by config, is disabled by default.
 2015-10-17 20:39:02 +02: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
PsiOmega
95b12da391 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/__defines/gamemode.dm
	code/game/antagonist/outsider/ert.dm
	code/game/gamemodes/ninja/ninja.dm
 2015-09-05 09:35:02 +02:00
PsiOmega
69fde6af03 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/antagonist/alien/borer.dm
	code/game/gamemodes/game_mode.dm
	code/game/gamemodes/nuclear/nuclear.dm
	code/game/gamemodes/traitor/traitor.dm
	code/game/objects/items/robot/robot_parts.dm
	code/setup.dm
 2015-09-05 09:24:30 +02:00
Zuhayr
a0187f66e3 Fixes Secret. 2015-09-05 14:12:20 +09:30
Zuhayr
23fb8d8b99 Antag system cleanup/fixes. 2015-09-04 18:28:05 +09:30
PsiOmegaDelta
85f32efa7a Players can now select their own language shortcut keys. 2015-08-26 15:15:54 +02: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
Kelenius
60196df634 Merge branch 'dev' into ofClicksAndCooldowns 
Conflicts:
	code/modules/projectiles/gun.dm
 2015-08-13 08:40:31 +03:00
PsiOmegaDelta
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
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
PsiOmegaDelta
c6f4f7fcee Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-07-12 15:14:43 +02: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
168f823c35 Fixed up the things pointed out by Ccomp5950. 2015-07-09 22:19:05 -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
mwerezak
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
PsiOmegaDelta
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
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
Kelenius
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
PsiOmega
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
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
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
Zuhayr
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
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
Kelenius
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
mwerezak
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
mwerezak
413276a4c5 Allows damage to accumulate past max_damage on vital organs 
Fixes #9214
 2015-05-16 02:05:44 -04:00
Kelenius
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
PsiOmega
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
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
Zuhayr
3718245e45 Moves asteroid generation prior to geometry initialization. Adds config for asteroid generation. 2015-03-21 11:13:53 +10:30
Zuhayr
4fdc00dee4 Working on gamemode/antagonist code. 2015-03-21 11:08:22 +10:30
Zuhayr
98da191ac3 Gamemode refactor, lots of code shuffles, PR will have details. 2015-03-21 11:08:17 +10:30
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
Zuhayr
8978747e53 Moved several globals into the config controller, updated eample config appropriately. 2014-12-25 21:10:30 +10:30
mwerezak
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
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
PsiOmega
ddc1a617d0 Fixes and event end estimations. 2014-11-12 09:39:54 +01:00