Commit Graph

14295 Commits

Author SHA1 Message Date
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
GunHog cf6e5ff1cd Adds APC boards to Autolathe
- I have also drawn up a changelog, written in my own blood to appease
the God of Changelogs.
2015-04-23 12:44:15 -05:00
Incoming f59c01e721 sets hardset_dna to clear exotic blood on race changes
sets every instance of race changes to use hardset_dna instead of directly replacing the datum (needs more testing to be sure I didn't break shit)
removes the invisible man race (aka the generic) and shadowlings from the new green slime mutation toxin while I'm in the area
2015-04-23 12:35:37 -04:00
Remie Richards 5ee50a387f Tweak to Login() call of update_pipe_vision() 2015-04-23 15:25:56 +01:00
Remie Richards cd7abf9942 Fixes cases of mobs not seeing pipe vision. 2015-04-23 15:23:46 +01:00
Jordie0608 15718c515d fixes opening lockers, atmos locker sprite and misc logging bug 2015-04-23 20:46:40 +10:00
Dalton Nell a8dd7060d6 Fixed being unable to upgrade grabs with hotkey. 2015-04-22 22:39:12 -06:00
phil235 6aadd8df8d Merge branch 'master' of https://github.com/tgstation/-tg-station into BundleFix5
Conflicts:
	code/modules/mob/living/carbon/life.dm
2015-04-23 01:32:20 +02:00
phil235 21b0750283 Changing cyborg unconsciousness to be more like the other mobs. Cyborgs out of power are now able to move, hear, talk and interact but their speed is decreased. You can put inactive brains into MMIs again but not inactive MMIs into borg shells. Examining an MMI tells you if its brain is active. 2015-04-23 01:29:07 +02:00
phil235 f23db26b6a Merge pull request #9085 from kingofkosmos/weldmaskbuckelefix
Welding mask toggling while buckeled fix
2015-04-22 21:37:31 +02:00
xxalpha 32746ba73a Merge remote-tracking branch 'upstream/master' into fixfixfix 2015-04-22 18:03:35 +01:00
Ikarrus e811eac22e Resolve Conflicts:
icons/mob/inhands/items_lefthand.dmi
	icons/mob/inhands/items_righthand.dmi
	icons/obj/weapons.dmi
2015-04-22 08:14:05 -06:00
Ikarrus 2343579a48 - Increased pen cost to 60, mostly so you can't be buying one every 5 minutes late round
- Increased pen cooldown to (15*Gang size)+45 seconds
- Promotion cost now counts how many times you bought that item instead of how many bosses you have, so you can't stockpile on cheap gangtools before promoting anyone
2015-04-22 08:08:13 -06:00
Cheridan 0fa584263c Merge pull request #9095 from phil235/BundleFix4
Telecom machines and reagent fixes
2015-04-22 08:42:42 -05:00
Jordie 0364a8a1d1 Merge pull request #9091 from xxalpha/fixsyringethrower
Fixed syringes being chambered when stored in a backpack.
2015-04-22 17:50:51 +10:00
Jordie ea9b15780c Merge pull request #9086 from phil235/BundleFix3
bodytemperature and other fixes
2015-04-22 17:50:39 +10:00
Jordie 4c575acbfe Merge pull request #9044 from Incoming5643/donks_will_be_put
Adds the "set round end sound" button to the fun tab
2015-04-22 17:50:10 +10:00
Jordie 1f9351c3fd Merge pull request #8925 from xxalpha/ripped
Low pressure environment Ripley buff & Mecha Mining Scanner.
2015-04-22 17:49:57 +10:00
Ikarrus c771d30986 Gang Mode Update 4
**Major Changes**
- Increased win condition to require 66%
- Added a switchblade. A relatively cheap and decently robust melee weapon for gangsters.
- Capped how much influence you can get every income at 50
- Limited gang spraycan use to 15
- Pistol cost increased to 30 Influence
- Promotion cost now scales to how many bosses you already have. The more bosses, the more expensive it will be. It starts off cheap at 20 influence now.

**Minor Changes**
- Tagging a territory now tells you what territory you actually tagged!
- Added an option to silence the verbose territorial updates you get from gangtools
- Capped how much influence you can get every income at 50
- Updated Centcom report on gangs
- Spraycans always show their inhands now, instead of only when uncapped
- Antag panel now shows how much influence each gang has
- Cleaned up gang code in the traitor panel
- Fixed non-gangers getting gang messages when trying to spray on an invalid territory
2015-04-21 23:23:15 -06:00
Xhuis 6eec44430a Lots of updates 2015-04-21 20:17:10 -04:00
Xhuis da2ee12552 Fixes revenants being affected by explosions 2015-04-21 18:13:58 -04:00
phil235 d6cc2c07c6 Fix mmi deafened indefinitely. 9078
Fix carp knocking borg. 7394
Replace carp knockdown by stamina dmg (for human only) (now 5 bites instead of 7 to go from 100% to crit w/o armor) 7905
Fix being stunned as a borg causing temporary blindness, deafness and muteness. 9061
Change robot out of power: now only stunned, can talk but not move or interact. Adding feedback in examine. 6170
Robots now take damage in the hottest of inferno (35,000+ K)  8840
Nerfs uranium wall radiation: 6 times less radiation (just double the effect of urafloor), chain reaction range down to 1. 6841
Fixes putting braindead/notincorpse/ghosted brains in mmi, and same for mmi in borgs, the action fails and sends a message to the ghost. 4841 7447
Fixes brains taking eye damage and becoming blind. 6039
2015-04-21 23:35:12 +02:00
Swag McYolosteinen 0e9f2695b1 Merge pull request #9080 from Ikarrus/gangtweaks3
Gang mode changelog and minute tweaks
2015-04-21 17:10:14 +02:00