Commit Graph

12467 Commits

Author SHA1 Message Date
phil235 bab61203de Merge pull request #9090 from RemieRichards/PortVGVentcrawling
Ports VG's ComicIronic's awesome ventcrawling overhaul.
2015-04-26 20:49:35 +02:00
Ikarrus ed9c5f7b96 - Engineering SMES subtype that starts with the boosted charge
- Added a fourth SMES in engineering
2015-04-26 12:30:54 -06:00
Remie Richards 504a139364 Reworked remove_ventcrawl() to be safer 2015-04-26 19:14:56 +01:00
phil235 c00def95a6 Fixes a runtime with pod plants, this should fix the unharvestable podplant issue. 2015-04-26 17:30:07 +02:00
Remie Richards 95e325ee7b Merge pull request #9115 from AnturK/abduction_udpate_dos
Abduction Update 2
2015-04-26 15:38:19 +01:00
Remie Richards 3b14aca5ae Merge branch 'master' of https://github.com/tgstation/-tg-station into PortVGVentcrawling
Conflicts:
	code/ATMOSPHERICS/components/unary/vent_pump.dm
2015-04-26 15:31:45 +01:00
phil235 18b846b124 Removes files that were supposed to be deleted already. 2015-04-26 13:47:17 +02:00
phil235 d66e5bb7b3 Merge pull request #9153 from Iamgoofball/patch-59
Resets Styptic and Silver Sulf back down to the default metabolism rate
2015-04-26 13:01:52 +02:00
phil235 1b7c14fa2f Merge pull request #9154 from Iamgoofball/patch-60
Buffs Charcoal and Silver Sulf.
2015-04-26 12:49:11 +02:00
JJRcop febebbd4e3 TED and Chronosuit tweaks
- TED time to kill has been halved
- TED now continually warps you back if you manage to escape, instead of killing you
- TED field is no longer dense
- Chronosuit now does not carry items with you if they are outside the suit, which is the belt, back, and hands.
  \ The TED is an exception
2015-04-26 02:59:11 -04:00
Ikarrus 8eb4890ede Doubles Initial SMES charge
The station has expanded over the years with more and more rooms (and APCs) added that drain the SMES. Moving the emitters to drain the SMES instead of the APCs probably didn't help, either. Engineers don't get nearly as much time as they should these days, with a loose singularity appearing in the first 10 minutes a lot more common, through no fault of the engineers other than they weren't fast enough.

I've seen the SMES drain approximately 8ish minutes since round start. This boosts it up to ~15 minutes.
2015-04-25 18:40:07 -06:00
Xhuis 8c84b0b5bd Comments out revenant ( ;_; ) 2015-04-25 19:38:14 -04:00
AnturK f4a7b2dbe1 Abduction Update Two:
-SPRITES SPRITES SPRITES
-Hopefully fixes create_antag and team problems
-Fixes the Inactive Eye on follow list
-Removes redundant and adds needed checks
-Neater adv camera code
-Minor balance tweaks
-Fixes instant first activation of glands
-Adds 3 mostly negative glands
-Adds anti-tracking helmet to agent equipment
-Makes experimental dissection ignore clothes
-Way out for trapped humans : Mash random buttons
-Abductors now virus immune (also golems and skeletons)
-File cleanup
-Teleporter functionality for camera
2015-04-26 01:30:59 +02:00
Xhuis 0343040de5 Some more stuff 2015-04-25 19:27:00 -04:00
phil235 9132838420 Merge branch 'master' of https://github.com/tgstation/-tg-station into BundleFix5
Conflicts:
	code/game/machinery/computer/ai_core.dm
	code/game/objects/items.dm
	code/game/objects/items/robot/robot_parts.dm
	code/modules/mob/living/carbon/brain/MMI.dm
2015-04-25 19:52:14 +02:00
phil235 35047e646e Readjusted rad effect from uranium walls.
mob/living/silicon/ai/ai.dm : one simplification plus "Normal" -> "Nominal".
2015-04-25 19:37:38 +02:00
phil235 236db87ac8 Cyborg and AI names are now also chosen in the preferences window, as well as chaplain religion and deity. 2015-04-25 18:28:29 +02:00
Jordie 4e1b27c08b Merge pull request #9135 from Incoming5643/validsalid
Adds Antag Tokens!
2015-04-25 19:14:34 +10:00
Jordie 34c810536c Merge pull request #9124 from naelstrof/master
Fixed being unable to upgrade grabs with hotkey.
2015-04-25 19:14:25 +10:00
Jordie 8ff56a17a1 Merge pull request #9033 from Boggart/guitar
Ports Nienhaus's playable guitar and generalizes instrument code.
2015-04-25 19:13:23 +10:00
Fayrik 80ff5d45d0 Air alarm template still needs a tweak, but it's functional now. 2015-04-25 05:22:00 +01:00
hornygranny 8e8561eb3e Merge pull request #9108 from Xhuis/revenantExplosionFix
Revenant Update II
2015-04-24 20:04:39 -07:00
Xhuis f014a81a29 Adds cultist prayer, removes sound from non-chaps 2015-04-24 22:41:46 -04:00
Boggart 077051626c Ports Nienhaus's guitar, the additional sounds are about ~1mb.
Moves most of the code from violin up to instrument and makes violin a child of it. (Guitar is a child of it as well.)
Fixes violins on Metastation and Box due to the repath, adds the guitar to both.
2015-04-24 19:12:22 -06:00
GunHog 1f6af46a1f Tweaks and changes! 2015-04-24 19:58:05 -05:00
Iamgoofball 7611150360 Buffs Charcoal and Silver Sulf.
As pointed out here, after I ran the numbers, I found that Charcoal and Silver Sulf. under-performed compared to their ancestors.
https://tgstation13.org/phpBB/viewtopic.php?f=10&t=3440&p=83903#p83903
2015-04-24 17:45:06 -07:00
Iamgoofball a58227df12 Resets Styptic and Silver Sulf back down to the default metabolism rate
no clue why it was set this high, i mighta been smoking something or some shit idfk
2015-04-24 17:07:39 -07:00
Incoming a5fc495a27 please don't tell anyone I forgot how to spell salad 2015-04-24 17:55:53 -04:00
Incoming c4f6d85b44 Any roundtype can now take advantage of continuous/non-continuous settings as well as the mulligan antag system. (as a reminder at this point the mulligan system only creates lings and/or traitors)
A generic check for antags now exists in check_finished, and overrides a lot of checks in specific modes. Specific checks are still needed if you have special means of determining antag viability (blob cores), or things to do when specific antags die (summon events).

In situations where mulligans are on but fail, the round will usually lurch on as "extended" but in wizard/malf/blob/ragin mages the round will end then and there. This mirrors current behavior.

Config settings are fully customizable and for the most part defaults mirror existing behaviors:

Revolution, Shadowling, Gang, Ragin Mages and Monkey are noncontinuous and will end with the death of all antagonists.

* There is a change here in shadowling in that rounds with living thralls but no living shadowlings will continue until the thralls are delt with, as they can still raise their dead master.

* Abductors not ending with the death of all ayyliens if there are still probe victims around is likewise a change. If the dev of abduction would rather have it default the other way, we can do that.

* Monkey being noncontinuous is a change, but given how monkey mode works, it really only makes sense.

All modes that are continous use the mulligan system by default, remember that this will only come into effect if EVERY antagonist dies, so modes with many antagonists are very likely to only mulligan extremely rarely because if even one isn't slaughtered and is instead brigged or otherwise neutralized nonfatally the mulligan will never come. A nice little bonus for security not to kill everyone!

Fixes a bug where shuttle stranding could occur in continous rev modes (not something on by default)

Probably buggy as hell in initial commit. Please no quick merge
2015-04-24 15:40:42 -04:00
Cheridan 548e0eb17e Merge pull request #9048 from kingofkosmos/ellipseses
Span class and grammar standardization in messages
2015-04-24 14:10:11 -05:00
kingofkosmos d9b8b146c8 Tried to fix merge conflicts, hopefully worked. 2015-04-24 21:52:36 +03:00
Cheridan d387efd50b Merge pull request #9130 from GunHog/404_Clever_Branch_Name_Not_Found
Adds APC boards to Autolathe!
2015-04-24 13:29:58 -05:00
kingofkosmos 761d31cea0 More visible.message span classes removed. 2015-04-24 21:24:21 +03:00
kingofkosmos de280c72b5 Removed some more spans from visible messages. 2015-04-24 21:06:59 +03:00
kingofkosmos a7bd5f93e1 "You hear something" set to italics. 2015-04-24 21:06:16 +03:00
kingofkosmos 9ebbdb2fb2 span fixes 2015-04-24 20:52:01 +03:00
kingofkosmos 3304ffa45f span fixes 2015-04-24 20:52:01 +03:00
kingofkosmos e371dd9f35 more spans 2015-04-24 20:52:00 +03:00
kingofkosmos 72749392d8 span classes removed from visible.messages 2015-04-24 20:50:51 +03:00
kingofkosmos 1d14471d00 Ellipses to waiting messages. Warning-spanclasses to failing messages with an exclamation mark. 2015-04-24 20:50:50 +03:00
Cheridan 30d160b1d2 Merge pull request #9112 from Ikarrus/gang4
Gang Mode Update 4
2015-04-24 12:11:38 -05:00
GunHog aa59485a58 Positronic Brains!
-Adds positronic brains
- Fixes a runtime in mechs for pilots without DNA
2015-04-24 09:23:20 -05:00
Xhuis 7785351ad6 Adds prayer sound preference 2015-04-23 22:54:58 -04:00
Xhuis 5de3451d67 Prayer refactor 2015-04-23 22:14:13 -04:00
Xhuis efac73a72b Fixes indefinite 'draining' var 2015-04-23 21:18:07 -04:00
Xhuis 0798a873f2 Merge remote-tracking branch 'remotes/upstream/master' into revenant_update_ii 2015-04-23 21:17:15 -04:00
Incoming 6e25a57230 Adds Antag Tokens!
They're a novelty coin with a syndie helmet (valid) on one side and a salid (salid) on the other.
Found as a prize in arcade machines, Sec can also get one from their vendor as a premium item.
2015-04-23 19:08:38 -04:00
phil235 88fd7c44cc Changes clown/mime naming to use preferences. Player will now choose their mime/clown name in the main preference screen and save it, instead of at roundstart.
Adding a config file for random mime names.
2015-04-23 23:18:35 +02:00
Swag McYolosteinen 983e306f23 Merge pull request #9069 from Boggart/allowdisposalpipesonwalls
Fixes being unable to construct disposal pipes on walls, an RPD bug and moves it over to the datum/browser ui.
2015-04-23 20:26:16 +02:00
Boggart ecebb594f9 Fixes being unable to construct disposal pipes on walls and fixes changing the RPD settings while already building affecting the currently building pipes.
Changes the RPD to use the newer datum/browser ui, makes it so that it show's what you have picked and doesn't let you endlessly repick it.

Fixes my wonky check for bins/outlets/chutes on walls, also adds a changelog.

Undefs the defines in RPD.dm at the end of the file.

Changes the "Type:" label to "Category:"
2015-04-23 11:53:27 -06:00