504a139364
Reworked remove_ventcrawl() to be safer
2015-04-26 19:14:56 +01:00
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
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
1b7c14fa2f
Merge pull request #9154 from Iamgoofball/patch-60
...
Buffs Charcoal and Silver Sulf.
2015-04-26 12:49:11 +02:00
16a681cda1
Merge pull request #9144 from Incoming5643/communism_joke
...
Latejoin Rev Head: Fix n' Tweak
2015-04-25 20:21:12 +02:00
4e1b27c08b
Merge pull request #9135 from Incoming5643/validsalid
...
Adds Antag Tokens!
2015-04-25 19:14:34 +10:00
34c810536c
Merge pull request #9124 from naelstrof/master
...
Fixed being unable to upgrade grabs with hotkey.
2015-04-25 19:14:25 +10:00
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
8e8561eb3e
Merge pull request #9108 from Xhuis/revenantExplosionFix
...
Revenant Update II
2015-04-24 20:04:39 -07:00
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
c6a22a98c9
Renames Violin.dm to Instruments.dm in preparation for generalizing the code and to preserve the git history.
2015-04-24 19:12:16 -06:00
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
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
a5fc495a27
please don't tell anyone I forgot how to spell salad
2015-04-24 17:55:53 -04:00
548e0eb17e
Merge pull request #9048 from kingofkosmos/ellipseses
...
Span class and grammar standardization in messages
2015-04-24 14:10:11 -05:00
d9b8b146c8
Tried to fix merge conflicts, hopefully worked.
2015-04-24 21:52:36 +03:00
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
761d31cea0
More visible.message span classes removed.
2015-04-24 21:24:21 +03:00
de280c72b5
Removed some more spans from visible messages.
2015-04-24 21:06:59 +03:00
a7bd5f93e1
"You hear something" set to italics.
2015-04-24 21:06:16 +03:00
9ebbdb2fb2
span fixes
2015-04-24 20:52:01 +03:00
3304ffa45f
span fixes
2015-04-24 20:52:01 +03:00
e371dd9f35
more spans
2015-04-24 20:52:00 +03:00
72749392d8
span classes removed from visible.messages
2015-04-24 20:50:51 +03:00
1d14471d00
Ellipses to waiting messages. Warning-spanclasses to failing messages with an exclamation mark.
2015-04-24 20:50:50 +03:00
30d160b1d2
Merge pull request #9112 from Ikarrus/gang4
...
Gang Mode Update 4
2015-04-24 12:11:38 -05:00
cd9669bc76
tweaks the midround rev head promotion to only pick revs that have the flag for roundstart rev head on
...
fixes a bug that could have led to there being four or five head revs in certain rare(ish) circumstances
2015-04-24 01:22:11 -04:00
efac73a72b
Fixes indefinite 'draining' var
2015-04-23 21:18:07 -04:00
0798a873f2
Merge remote-tracking branch 'remotes/upstream/master' into revenant_update_ii
2015-04-23 21:17:15 -04:00
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
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
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
02b8400c1f
Ensure Entered() procs are called on exiting pipe system
2015-04-23 18:46:05 +01:00
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
d420e3f467
Pistols -> 25 Cost
2015-04-23 09:23:27 -06:00
5ee50a387f
Tweak to Login() call of update_pipe_vision()
2015-04-23 15:25:56 +01:00
cd7abf9942
Fixes cases of mobs not seeing pipe vision.
2015-04-23 15:23:46 +01:00
ca5d1d133e
Merge pull request #9107 from Incoming5643/neverendingplaytesting
...
Now leaving fightvale
2015-04-23 21:20:56 +10:00
a8dd7060d6
Fixed being unable to upgrade grabs with hotkey.
2015-04-22 22:39:12 -06:00
d97268f24b
Fixed switchblade hitsound not starting in its retracted state
2015-04-22 21:13:14 -06:00
1a1b906eec
- Switchblade changes hitsounds now if it's not extended.
...
- Reverted the boss icon back to use a B. I changed it for a different idea I had but I never went through with it but I forgot to change the icon back
- Price tweaks
2015-04-22 20:02:50 -06:00
f23db26b6a
Merge pull request #9085 from kingofkosmos/weldmaskbuckelefix
...
Welding mask toggling while buckeled fix
2015-04-22 21:37:31 +02:00
d54509c23f
Fix for watertank toggling while buckled.
2015-04-22 18:17:35 +03:00
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
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
0fa584263c
Merge pull request #9095 from phil235/BundleFix4
...
Telecom machines and reagent fixes
2015-04-22 08:42:42 -05:00
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
ea9b15780c
Merge pull request #9086 from phil235/BundleFix3
...
bodytemperature and other fixes
2015-04-22 17:50:39 +10:00
8a8579d039
Merge pull request #9079 from Thunder12345/mines_refactor
...
Refactors landmines
2015-04-22 17:50:31 +10:00
25d8633300
Merge pull request #9057 from cdepatie/shadowling_fix
...
fixes shadowling veil not resetting luminosity
2015-04-22 17:50:22 +10:00
Remie Richards
phil235
Jordie
hornygranny
Boggart
Iamgoofball
Incoming
Cheridan
kingofkosmos
Xhuis
Swag McYolosteinen
GunHog
Ikarrus
Dalton Nell