Commit Graph

20093 Commits

Author SHA1 Message Date
Razharas
f87d72571e Merge pull request #12420 from phil235/TransferAmountChange
Set Transfer Amount for reagent containers now uses attack_self() instead of object verb
2015-10-17 18:06:39 +03:00
Razharas
fb294b81e2 Merge pull request #12419 from Robustin/master
Buffs Shadowling scaling to actually be a threat
2015-10-17 18:05:17 +03:00
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
cf302d227f Merge pull request #12399 from Xhuis/pneumatic_cannon_optimization
Pneumatic cannon fixes and optimizations
2015-10-16 17:43:06 +03:00
Razharas
fce9bcc646 Merge pull request #12340 from Shadowlight213/Mirrormagic
Adds a lesser magic mirror limited to human and lizard race
2015-10-16 09:31:16 +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
c44c6d90be Merge pull request #12350 from AnturK/ironwall
Rough Metal Walls
2015-10-16 09:08:00 +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
0f6d83f635 Merge pull request #12398 from Fox-McCloud/floor-tile-destruction
Makes Built-in Floor Tiles Pass through the GC
2015-10-16 09:02:56 +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
Aranclanos
962b088bb7 Merge pull request #12406 from bgobandit/borgycutters
Engiborgs can no longer make stunprods with their wirecutter module.
2015-10-15 23:14:03 -03:00
The Half-Finished
461726b9cc Update pneumaticCannon.dm 2015-10-15 21:16:14 -04:00
phil235
5907b8b288 Changes the volume threshold for reagent absorption via VAPOR. 2015-10-16 01:15:30 +02:00
phil235
dce2027d01 Changing the transfer amount of all reagent containers (beaker, bucket, glass) is now done by clicking them, similar to spray. Reagent dispensers (watertank, fueltank, pepperspray dispenser) no longer have their own transfer amounts and use the reagent container's transfer amount instead (except for sprays which get 50u for faster refilling).
Removed object verb "Set Amount per transfer from this" for both reagent containers and reagent dispensers.
2015-10-16 01:07:10 +02:00
Xhuis
d09224e267 Changes 2015-10-15 17:26:32 -04:00
Robustin
23c6ea53ce Buffs Shadowling scaling to actually be a threat
2 shadowlings for a 55 person crew is a joke. This will get you 3 slings by default, 4 at 56 players, and one more for every 14 more players beyond that. 

This is a HUGE issue for shadowlings that makes the game type pathetic and difficult to enjoy. Plus nobody is going to learn how to play the damn role if getting picked is almost as rare as being a wizard.
2015-10-15 17:15:05 -04:00
Xhuis
463e80ed62 Restores knockdown for high pressure setting 2015-10-15 17:09:48 -04: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
8b1608d45b Merge pull request #12394 from bgobandit/grossmaymays
Toilet related tweaks and fixes
2015-10-15 16:07:29 +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
c716c5eaeb Merge pull request #12356 from bgobandit/plasmarecyclingfix
Fixes recycler not recycling plasma.
2015-10-15 16:03:52 +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
8a63e50b51 Stunprod making now checks for NODROP. 2015-10-14 21:10: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
Xhuis
39daad8d21 Pneumatic cannon optimization 2015-10-14 17:31:58 -04:00
Fox-McCloud
13f901f6ab Makes Built-in Floor Tiles Pass through the GC 2015-10-14 17:13:05 -04:00
Steelpoint
0070b9911d InitalCommit 2015-10-15 01:51:54 +08:00
bgobandit
8b60afcaf2 toilet related tweaks and fixes 2015-10-14 11:48:47 -04:00
KorPhaeron
645c7ab9e3 Removes extra srcs 2015-10-14 03:52:24 -05:00