Commit Graph

336 Commits

Author SHA1 Message Date
Swag McYolosteinen 853009f7e0 Merge pull request #8157 from Xhuis/shadowling_gamemode
Shadowling (MERGE-READY!!)
2015-04-11 17:51:23 +02:00
Xhuis c9338f7212 Shadowling: RELEASE EDITION 2015-04-11 11:42:02 -04:00
Cheridan 076fc321f0 Merge pull request #8859 from Incoming5643/gutcheck_time
Better admin/config control of mulligans + tweaks
2015-04-10 15:19:42 -05:00
Incoming d1892cffbe Organizes the various continuous_round_x config options into one set of config options continuous. Functionality is only there for the same mode that already had that functionality, everything else is continuous always
Makes another set of config options for which rounds types, if any, use the midround antagonist (mulligan) system. Keep in mind this is by definition a subset of round with continuous set. Again this feature is only present for the roundtypes where I KNOW it works properly, other modes can't use midround antags.

The check antagonist screen will show how the game will behave when all the antagonists die, and it can be changed on the fly by admins, the four possible states are:

End on antagonist death (noncontinuous rounds)
Continue if antagonists die (unsupported continuous by default round)
Continue if antagonists die, creating replacement antagonists (continuous, using midround antags)
Continue if antagonists die, not creating new antagonists (continuous, not using midround antags)

When rounds prepare to mulligan admins will additionally get the option to just keep the round going without any automatically created antags in case they want to run their own shinanagans instead. They can also as before choose to end the round.
2015-04-09 16:03:11 -04:00
Incoming 654a332d21 Removes the Mutant_colors config option because anyone who's apt to turn on mutant races for joining doesn't want them to all look EXACTLY THE SAME (That's racist guys) 2015-04-08 01:24:55 -04:00
kingofkosmos 2393f6cc80 admins txt normalization 2015-04-03 19:51:49 +03:00
kingofkosmos 2e4a8fcce8 Recieve --> receive grammarfix
Changes all "recieve"s in descriptions around the tgstation to "receive". Also energy katana description high priority fix.

Fixes #8576
Fixes #8504
2015-04-03 19:42:34 +03:00
ACCount12 46fea90958 Merge remote-tracking branch 'my/mining' into mining
Conflicts:
	config/admins.txt
2015-03-31 18:34:15 +12:00
Cheridan 9606763e5f Merge pull request #8583 from Fayrik/CentcomExpansion
Centcom Two: It's better now, I swear.
2015-03-30 21:35:19 -05:00
Fayrik 4f43fff199 Issue fixes! All that, and more! 2015-03-29 03:54:41 +01:00
ACCount12 143259a7b4 The Coder's Ritual 2015-03-28 14:44:50 +12:00
Incoming 50ec2f3224 Makes the ability for wizards to use summon guns, summon magic, and summon events a config option 2015-03-27 01:32:28 -04:00
Cheridan 564238f335 Merge pull request #8215 from Ahammer18/Ahammer18
Slime Cake
2015-03-09 02:35:18 -05:00
Cheridan 0015d4c120 Merge pull request #8141 from Incoming5643/Subjectivity_is_a_bitch
Skipping mulligan antag based on Time/Subjectivity from admins + tweaks
2015-03-09 00:14:28 -05:00
Ahammer18 12a9607b80 Updated 2015-03-07 22:42:43 -06:00
Cheridan 903d2fdb39 Merge pull request #8121 from Incoming5643/everything_I_code_never_works
Fixes pop cap messages not properly showing custom messages (with default config.txt)
2015-03-06 15:01:37 -06:00
Cheridan 07676b352d Merge pull request #8128 from Ikarrus/gangfixup
Makes Gang mode functional again
2015-03-05 21:11:59 -06:00
Incoming db1b40c5ca The living crew and time checks are now both config options. 2015-03-03 17:49:46 -05:00
Jordie0608 e6e2ec2809 Readds changelog popup as a config option 2015-03-03 19:51:35 +11:00
Ikarrus 9b28452bfe Makes Gang mode functional again
I'm going on vacation soon so I thought I might as well bring this game mode back up to at least a minimally functional state before I go.

A lot of features (Gang membership visibility, conversion pens, weapons, deconversion methods) have been stripped out for now. I gave gang bosses uplinks in the meantime.

It's basically rev vs rev right now, but the victory conditions with the recallers are still there. I'll work on adding more stuff after I return from my vacation.
2015-03-02 23:46:46 -07:00
Incoming 58285ab137 fixes the default lines in config.txt to work instead of the previous fix 2015-03-02 21:24:57 -05:00
Remie Richards 679c63a8ea Merge pull request #7924 from Incoming5643/mulligan_rounds
Mulligan Rounds for Wizard/Blob/Malf
2015-02-28 21:27:18 +00:00
Remie Richards 2a41879f8b Merge pull request #7989 from MrStonedOne/graytideworldwide
Makes rainbowtide a config option.
2015-02-28 01:25:19 +00:00
MrStonedOne 5ac23f6a2d Panic bunker + new player notification configs
Panic bunker! Uses the power of the database to reject new ckeys that have never connected to the server(s) before.
Admins are exempt, even while deadmin'ed, but they are also unlikely to be new ckeys except in rare cases that involve vv fuckary.

New player notification is now configurable.

Adds a optional default disabled irc notification of a players first time connecting.
2015-02-25 23:27:03 -08:00
MrStonedOne 24494ec164 Greymato Graymato (replaces gray with grey) 2015-02-25 13:45:46 -08:00
MrStonedOne ea46fe464f Makes rainbowtide a config option.
Defaults to enabling rainbowtide, even if the config entry is absent from the config file.
2015-02-25 13:09:41 -08:00
hornygranny 95f9c59475 Merge pull request #7920 from paprka/starlightconifg
Fixes starlight runtime
2015-02-23 13:03:56 -08:00
Swag McYolosteinen ac5fc9b044 Merge pull request #7544 from Incoming5643/popcapgames
Adds optional population caps
2015-02-23 17:20:02 +01:00
Incoming 24cc205ce5 On primary antagonist rounds (wizard/blob/malfunction) if the config is set for continous rounds the round will convert on the fly to a new mode choosen from these mode if the primary antagonist dies:
EXTENDED
TRAITOR
CHANGELING
DOUBLE AGENTS
TRAITORLING

based on the game probabilities set through the config.

The round will not convert if more than 30% of the players are dead (round immediatly ends) or if the shuttle is beyond the point of no return (the round ends normally).

Adds the CONTINIOUS_ROUND_BLOB config
2015-02-22 21:32:17 -05:00
paprka 69915d0b1a actually fixes starlight with configs 2015-02-22 16:58:00 -08:00
paprka 44f3684053 FUCKING CONFIGS!!!!!!!!!!! 2015-02-22 16:09:46 -08:00
Swag McYolosteinen c792f211a3 Merge pull request #7555 from paprka/asscap
Assistant cap config
2015-02-22 12:58:27 +01:00
paprka 0bb945b788 fixes cap not being unlimited by default 2015-02-22 03:41:50 -08:00
TheVekter ff65ec2018 Fixed "Chilli" -> "Chili" and "Coco" -> "Cocoa". Pray it passes Travis. 2015-02-06 05:22:53 -06:00
Swag McYolosteinen f5359aba3b Merge pull request #7257 from Lo6a4evskiy/Sec_record_photo
Adds photos and some other stuff to security and medical records
2015-02-05 18:45:53 +01:00
paprka f63dfa0c3e fixes 2015-02-04 13:59:50 -08:00
paprka bf0aa3572a assistant cap config 2015-02-04 13:33:03 -08:00
Incoming 7903aba6d3 Adds optional population caps for those that want them. These be dark measures, so tread carefully ye who dare enter this place.
There are three "levels" of popcaps, and you can use them in any assortment you like:

The "soft" cap produces a message on join, and takes no action.

The "hard" cap disallows joining whilst too many other people are alive and playing in game, but allows observing.

The "extreme" cap prevents people from joining the server at all while the cap is exceeded. It won't kick out people who failed to qualify during roundstart, but if they leave they won't be able to get back in.

In each case a customizable message config option has been given. Admins are also immune to most population caps (they still are hit by the ones in job shuffling, but can late join as normal afterwards)
2015-02-04 01:58:02 -05:00
Lo6a4evskiy bfd74684b4 Tweaks as noted, added myself to admins.txt 2015-01-24 16:14:44 +04:00
Ikarrus 916270321f It also turns out sec/assmaint is already included in additional access so I don't need to include them in the automatic toggle. 2015-01-23 23:33:28 -07:00
Cheridan e8a32e22a8 Merge pull request #7244 from Ikarrus/accessthreshold
Automatic Round-start Access Scaling
2015-01-23 20:47:27 -06:00
Ikarrus b63d511d42 Automatic toggle no longer removes sec/assmaint if their options are toggled on in the game options config. It will still grant these accesses if the threshold is not reached. 2015-01-22 23:36:25 -07:00
Ikarrus f4e021fc82 Automatic Round-start Access Scaling
- Added a new config option MINIMAL_ACCESS_THRESHOLD that can be used to automatically give players more access during low-pop rounds.
- If the number of players is below this threshold, expanded access will be used and security and assistants will have maintenance access.
- If the number of players exceeds the threshold, minimal access will be used and security and assistants will not have maintenance access.
- Setting the threshold to 0 will disable this function, and server ops can set the state of round-start access manually
2015-01-20 23:16:51 -07:00
pudl dd5c7db5ad in order to help doctors keep up, since they now need a lot more to heal people, the nanomeds have been stocked with a lot of extra stuff.
12x syringe
10x styptic patch
10x silver sulf patch
4x charcoal bottle
4x epinephrine bottle
4x morphine bottle
4x diphen bottle
3x potassium iodide bottle
5x salglu bottle
3x atropine bottle
6x spaceacillin syringe
10x calomel syringe
10x salbu pill
10x mannitol pill
5x mutadone pill
4x health analyzer
2x crew monitor
CONTRABAND:
all of the same except with 3 bottles of toxin

the two types of wallmed have been combined into one wallmed, which contains all of the above except halved. in instances where the number was odd, the higher of the two numbers was taken.

medical closet has been stocked with a lot of new stuff.
2x beakers
2x droppers
1x medical belt
1x syringe box
1x toxin bottle
2x morphine bottles
3x epi bottles
3x charcoal bottles
1x rxglasses box

this, of course, 3 new pills and 3 new bottles in code so they could be in the nanomed.

gives genetics a bottle of mutadone pills on box and eff3 and puts a public bottle of epinephrine on the medbay desk. adds a single syringe to boxstation's medical storage.

medkits now have some new equipment.

normal
2x styptic patch
2x sulf patch
1x salicyclic pill
1x health analyzer

fire
4x silver sulf patches
1x health analyzer
1x epipen
1x salicyclic pill

toxin is unchanged

oxygen
4x salbu pills
2x epipen
1x health analyzer

all maps and z levels are updated for this.

renames styptic patch to brute patch and silver sulf patch to burn patch. renames charcoal bottle to antitoxin bottle

adds myself to admins.txt
2015-01-20 22:26:13 -06:00
dannno 5dc6f1449f when in hat form, bandanas can be added to head slot
fixed the admins.txt nonsense
2015-01-13 15:41:45 -05:00
dannno 3dc5a04038 Merge branch 'master' of https://github.com/tgstation/-tg-station into bandanno's
Conflicts:
	config/admins.txt
2015-01-12 15:55:51 -05:00
dannno c827a6b118 changelag 2015-01-12 15:37:45 -05:00
dannno c76072608a bamboliers 2015-01-07 20:28:16 -05:00
tkdrg 09c91e8f1e Merge remote-tracking branch 'upstream/master' into IllustriousImpeccableArcticwolf
Conflicts:
	code/controllers/subsystem/ticker.dm
2015-01-06 04:35:46 -03:00
tkdrg 693f0a968a Adds more tips to tips.txt 2015-01-03 18:45:53 -03:00