Commit Graph

9081 Commits

Author SHA1 Message Date
TheVekter 07afe76f8c Fixes #9098 and #9077. 2015-04-27 01:41:12 -05:00
TheVekter 36a8405056 Fixes #9184 and #9122 2015-04-27 00:54:55 -05:00
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
Remie Richards 504a139364 Reworked remove_ventcrawl() to be safer 2015-04-26 19:14:56 +01: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 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
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
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
hornygranny 8e8561eb3e Merge pull request #9108 from Xhuis/revenantExplosionFix
Revenant Update II
2015-04-24 20:04:39 -07: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
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
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
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
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
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
Dalton Nell a8dd7060d6 Fixed being unable to upgrade grabs with hotkey. 2015-04-22 22:39:12 -06:00
phil235 f23db26b6a Merge pull request #9085 from kingofkosmos/weldmaskbuckelefix
Welding mask toggling while buckeled fix
2015-04-22 21:37:31 +02: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
Swag McYolosteinen 0e9f2695b1 Merge pull request #9080 from Ikarrus/gangtweaks3
Gang mode changelog and minute tweaks
2015-04-21 17:10:14 +02:00