d216e60477
Merge pull request #11612 from Iamgoofball/patch-117
...
Buffs the fuck out of Changeling Armor
2015-09-10 17:10:41 +02:00
f13f6b6acf
Merge pull request #11652 from Shadowlight213/Docyborgsdreamofelectricgreentext
...
Cyborgs no longer count against escape alone
2015-09-10 22:01:34 +10:00
f587588eb9
Merge pull request #11636 from duncathan/lol
...
distro fix + fixes runtimes
2015-09-09 20:37:51 -03:00
fbbdbe17ed
Merge pull request #11666 from tgstation/Fixing_bugs_from_browser_with_edit_button
...
Fixes blood mixing not merging symptoms properly
2015-09-09 12:48:52 -03:00
304d91fa2c
Merge pull request #11606 from Firecage/gunnames
...
This gives most projectile guns less generic names.
2015-09-09 10:45:18 -05:00
b7cbf7f940
Just a name change to uplink items.
2015-09-09 17:38:22 +02:00
2a90cd109e
Stetchkin pistol rename.
2015-09-09 17:36:14 +02:00
c40dea1ebd
Removes src and renames the argument
...
Removes src and renames the argument
2015-09-09 16:36:40 +03:00
5b3517eff4
honk
2015-09-09 07:23:06 -06:00
b86464f573
woo more runtimes
2015-09-08 22:59:18 -06:00
44033427a9
Merge pull request #11630 from bgobandit/slimepotionfixfuck
...
Fixes/tweaks slime potions.
2015-09-08 20:11:31 -05:00
dbcc6aeed8
Merge pull request #11650 from optimumtact/patch-9
...
Better error messages for start game verb
2015-09-08 20:06:14 -05:00
6b1e20ea19
Changed the switch to an istype check. Also modified the clone hijack objective for consistency.
2015-09-08 17:09:54 -07:00
524186e4db
Merge pull request #11569 from Anonus/blobchemtweaks
...
Changes blob chemicals
2015-09-09 02:44:34 +03:00
161156cffc
Merge pull request #11585 from bgobandit/legitposters
...
Poster changes!
2015-09-09 02:38:56 +03:00
54a58ddbf5
Fixes blood mixing not merging symptoms properly
...
Fixes blood mixing not merging symptoms properly
Fix #11482
2015-09-09 01:46:04 +03:00
71270764da
Merge pull request #11571 from xxalpha/airlocking
...
Fixed a couple of bugs with airlocks.
2015-09-08 20:49:40 +02:00
5adb732a66
Changed asteroid plating singularity pull to do nothing.
...
Changed singularity act on asteroid plating to do nothing.:
2015-09-08 15:59:35 +01:00
1794cfcf49
Merge pull request #10915 from optimumtact/patch-5
...
Add a game log entry for damp rags
2015-09-08 13:37:07 +03:00
83f144a236
Fixes tcoms crashing the server.
2015-09-07 21:49:36 -07:00
9d8391d846
Merge pull request #11619 from optimumtact/patch-8
...
remove commented out code
2015-09-08 00:06:07 -03:00
01a4e6653d
Cyborgs no longer count against escape alone
2015-09-07 17:58:43 -07:00
966ec11958
Adds game and attack logging to rags
...
This adds a proc to help print reagent lists nicely
2015-09-08 12:39:48 +12:00
a9e4429d57
Better error messages for start game verb
2015-09-08 11:30:15 +12:00
bcdf5666e8
Fixes Orion Trail properly the error was a rogue ! in the top of the topic that was added by accident
2015-09-07 18:37:41 +01:00
36ba00fa6e
distro fix
2015-09-07 11:19:01 -06:00
2cee8c85dc
Reworks the poster lists per cheridan
2015-09-07 12:18:06 -04:00
daa5b5b48e
Merge pull request #11599 from Firecage/Spiderwerbs
...
Adds do_after to the spider verbs.
2015-09-07 09:08:25 -05:00
dc16dfbcc2
Fixes/tweaks slime potions.
2015-09-07 09:48:31 -04:00
9f0f1a9234
Merge pull request #11531 from RemieRichards/Bloody_footprints
...
Bloody footprints!
2015-09-07 16:07:03 +03:00
f0d0a4bf2d
Merge pull request #11528 from Aranclanos/undergoingevacuations
...
Undergoing evacuations latejoin message fix
2015-09-07 13:54:54 +01:00
27f33581d2
Merge pull request #11518 from xxalpha/xenoweedspread
...
Changed weed spread to be like gas spread.
2015-09-07 13:51:52 +01:00
8b899636b2
Merge pull request #11604 from duncathan/itwaslessthan300000runtimessofranklyIammorethanokwiththis
...
Fixes a BUNCH of atmos shit
2015-09-07 13:49:01 +01:00
a4b0a7e1bf
fixes roundstart atmos
2015-09-07 06:40:04 -06:00
72ac379bbf
henk
2015-09-07 07:18:58 -04:00
f0834b4ed5
Revert "Fixes more than one prize win in Orion Trail"
2015-09-07 09:44:00 +01:00
42a28af718
Updated gun names.
2015-09-07 10:06:14 +02:00
c05dc7ef93
remove commented out code
2015-09-07 17:14:42 +12:00
732aa1f5be
Merge pull request #11600 from octareenroon91/patch-6
...
Correct 'You inject' text
2015-09-06 20:29:28 -03:00
0371f0318a
Buffs the fuck out of Changeling Armor
...
Feedback says it's complete garbage for 2 DNA, so here's some proposed buffs.
Cut the cost in half
Increased the armor values of most the armor types for ling
This probably won't get accepted but at least this PR will get attention drawn to the problem.
2015-09-06 14:10:59 -07:00
580e889e7d
Merge pull request #11590 from joonoro/turbinefix
...
Fix turbine
2015-09-07 00:08:30 +03:00
50fc7578f7
fixes TEG
2015-09-06 13:16:00 -06:00
4595563ab9
fixes another runtime (I think)
2015-09-06 12:38:43 -06:00
fd5e854118
IF TRAVIS DOES NOT WORK AFTER THIS I SWEAR TO CLOWN
2015-09-06 14:02:10 -04:00
c5984f4359
Merge branch 'master' of https://github.com/tgstation/-tg-station into legitposters
...
Conflicts:
_maps/map_files/MetaStation/MetaStation.v41G.dmm
2015-09-06 13:27:51 -04:00
63657bb2e7
Adjusts some gun names like sugggested.
2015-09-06 18:09:42 +02:00
1b119f6aef
Fixes the russian revolver name, my mistake.
2015-09-06 14:30:43 +02:00
56925928eb
places /improper in the gun names.
2015-09-06 14:27:54 +02:00
9c341fb128
This gives most projectile guns less generic names.
2015-09-06 13:43:38 +02:00
0b15cffcad
Merge pull request #11588 from Xhuis/shadowling_bugfix
...
Fixes a gamebreaking bug with shadowling
2015-09-06 10:55:34 +02:00
Swag McYolosteinen
Jordie
Aranclanos
Cheridan
Firecage
Razharas
duncathan
palpatine213
xxalpha
Kyle Spier-Swenson
oranges
blah
bgobandit
Remie Richards
Jalleo
Iamgoofball