Commit Graph

11271 Commits

Author SHA1 Message Date
Razharas d809f57de7 Merge pull request #12172 from MrStonedOne/webclientconfig
Adds config option for allowing webclient.
2015-10-16 21:49:50 +03:00
Razharas 831f279865 Merge pull request #12415 from bgobandit/cuteshrooms
Walking mushroom fixes/tweaks
2015-10-16 21:48:30 +03:00
Razharas 4dca285198 Merge pull request #12390 from KorPhaeron/AP2
Another slight tweak to armour penetration
2015-10-16 20:09:02 +03:00
Razharas 52a82ff165 Merge pull request #12396 from Steelpoint/RiflesMan
Auto Rifle Balance Changes
2015-10-16 20:07:46 +03:00
Razharas c7fc833c8b Merge branch 'bloodtomatotypes' of https://github.com/bgobandit/-tg-station into bgobandit-bloodtomatotypes 2015-10-16 18:14:18 +03:00
Razharas 15e07b8a55 Merge pull request #12339 from Shadowlight213/Grindering
Fixes Meat grinder and immortality from the Wild West away mission.
2015-10-16 09:30:21 +03:00
Razharas 0889ec6651 Merge pull request #12407 from Xhuis/fuck_vampires_make_silly_hats_instead
Allows you to wear buckets as hats
2015-10-16 09:11:28 +03:00
Razharas 257af908fb Merge pull request #12284 from KorPhaeron/spookyscary
Night Vision for revanants
2015-10-16 09:08:56 +03:00
Razharas 653dcbc0f4 Merge pull request #12380 from MrPerson/alert_rewrite
Mild rewrite of screen alerts to enable more functionality
2015-10-16 09:04:50 +03:00
Razharas 39b655219a Merge pull request #12411 from bgobandit/grapesetc
Adds recipes for grapes and grape juice.
2015-10-16 09:00:38 +03:00
Aranclanos d1cac57f96 Merge pull request #12405 from feemjmeem/bugfixes-oct14
Some itty bitty bugfixes (Oct 14)
2015-10-15 23:47:31 -03:00
Aranclanos 601bcbc250 Merge pull request #12401 from KorPhaeron/cakehat
Buffs Cakehat
2015-10-15 23:44:46 -03:00
Aranclanos 5cb4375d4d Merge pull request #12404 from bgobandit/barechests
Adjusting your jumpsuit now properly exposes your chest and/or arms as applicable.
2015-10-15 23:14:27 -03:00
bgobandit cdd1cac39a walking mushroom stuff 2015-10-15 14:43:43 -04:00
bgobandit fbdbe43118 adds grappa and grape tarts, fixes typos O NO 2015-10-15 13:25:59 -04:00
Razharas 40037855bf Merge pull request #12285 from KorPhaeron/corpses
Corpse Spawner Update
2015-10-15 16:10:40 +03:00
Razharas 6f2527ed7d Merge pull request #12379 from optimumtact/fixclowntypesteal
Removes clown..
2015-10-15 16:08:24 +03:00
Razharas 1bbc8944b3 Merge pull request #12387 from Shadowlight213/Revmes
Makes revenant malfunction ability not affect SMES
2015-10-15 16:05:15 +03:00
Razharas cea2a5ad22 Merge pull request #12358 from bgobandit/xenowhisperfix
Fixes xenos being able to whisper to ghosts, for real this time.
2015-10-15 16:04:33 +03:00
Razharas 9f492ea30f Merge pull request #12352 from KorPhaeron/parasitefix
Guardian/Parasite Fixes
2015-10-15 16:03:36 +03:00
bgobandit 2bb40e9e86 Adds recipes for grapes and grape juice. 2015-10-15 00:33:59 -04:00
Xhuis 713a0b99ef Buffs melee resistance on the TACTICAL BUCKETS 2015-10-14 21:58:15 -04:00
Xhuis d07f749145 Conflicts 2/3 2015-10-14 21:56:18 -04:00
Xhuis 14c21cf2a2 Allows you to equip buckets as hats 2015-10-14 21:51:42 -04:00
bgobandit b48129203e clearer var name per aranclanos and mso. also porn 2015-10-14 20:36:11 -04:00
Marc R. Uchniat 4fa1d75f36 Fixes #12188, ' no longer breaks AI hrefs in binary chat 2015-10-14 16:42:29 -07:00
bgobandit 95988191d8 Sets proper covered body part flags for adjusted jumpsuits. 2015-10-14 19:36:57 -04:00
Marc R. Uchniat b97a8b536d Fixes #12095, chance for EMP to call shuttle restored 2015-10-14 16:09:45 -07:00
KorPhaeron 7f6dc9555f Fixed 2015-10-14 17:21:08 -05:00
Steelpoint 0070b9911d InitalCommit 2015-10-15 01:51:54 +08:00
KorPhaeron 645c7ab9e3 Removes extra srcs 2015-10-14 03:52:24 -05:00
KorPhaeron 064cae7ed6 AP2 2015-10-14 03:44:11 -05:00
Shadowlight213 99d1c92af5 Makes revenant malfunction ability not affect SMES 2015-10-13 21:41:02 -07:00
Razharas 07bf763656 Removes obsolete comment
Removes obsolete comment
2015-10-14 07:17:24 +03:00
Razharas dc356edc6b Merge branch 'master' of https://github.com/tgstation/-tg-station into MapShitFix 2015-10-14 07:07:29 +03:00
Razharas 63741ea07c Added loads of defines for everything
Added loads of defines for everything
2015-10-14 07:07:06 +03:00
Cheridan f56e012d87 Merge pull request #12331 from phil235/AdminTopicFix
Fixes some admin buttons in certain admin messages
2015-10-13 21:41:06 -05:00
MrPerson 610483ea1e Mild rewrite of screen alerts to enable more functionality
Specifically I wanted to allow #12043 to correctly implement clicking an "on fire" alert to call resist without affecting other alerts which is currently impssible. Plus this whole mess was stupid and bothering me so here we go.
2015-10-13 17:16:23 -07:00
bgobandit 3dd8262e93 the honkmother is ashamed of this typo 2015-10-14 13:11:02 +13:00
Remie Richards 58e6c40e16 Merge pull request #12322 from phil235/ExperimentorThrowFix
Fixes experimentor throwing stuff around one item at a time instead o…
2015-10-13 23:10:13 +01:00
Remie Richards 86c0a1805f Merge pull request #12321 from phil235/RuntimeFixA
Fixes some runtimes
2015-10-13 23:09:48 +01:00
Remie Richards 61d23d8c11 Merge pull request #12354 from KorPhaeron/AP
Adds armour penetration checks to shields, adds armour penetration to simple animals
2015-10-13 23:08:52 +01:00
Cheridan b847f6c91f Merge pull request #12323 from phil235/BugFixBoogalooE
Bugfixes, again
2015-10-13 17:08:37 -05:00
Remie Richards 16db6f8cc0 Merge pull request #12299 from phil235/SlimeFeedBuckling
Slime feed buckling
2015-10-13 23:08:06 +01:00
Remie Richards fac1403423 Merge pull request #12324 from KorPhaeron/firingpins
Syndicate simple mob hotfix
2015-10-13 23:06:32 +01:00
Remie Richards f15e858799 Merge pull request #12307 from optimumtact/autholathe
Port pizzastation autolathe improvements
2015-10-13 23:06:12 +01:00
Remie Richards 844f8e84fb Merge pull request #12271 from CosmicScientist/LarvaMe
Adds me to larva
2015-10-13 23:05:26 +01:00
Remie Richards ebff3936b7 Merge pull request #12221 from Xhuis/im_here
Restores the Nar-Sie sound to "I'm here"
2015-10-13 23:04:56 +01:00
Remie Richards 55287c3eb9 Merge pull request #12314 from AnturK/morphfix
Fixes morph examine infinite loop
2015-10-13 23:04:15 +01:00
Remie Richards 9a7091cc5f Merge pull request #12346 from MrPerson/lighting_runtime_maybe
Disallow nulls in the lighting system's lights list
2015-10-13 23:03:46 +01:00