35ca96331e
Adds jobban support to syndicate borg
...
Adds jobban and pref checking to various events
Adds support for alien jobbans
Adds feedback to alien infestation event.
2015-10-18 15:25:14 -07:00
2ad2cc83e7
Merge branch 'master' of https://github.com/tgstation/-tg-station into thetitanichadabettersafetyrecordthannanotrasen
...
Conflicts:
_maps/map_files/DreamStation/dreamstation04.dmm
2015-10-18 17:27:24 +11:00
d7107264aa
Merge pull request #12429 from Shadowlight213/Kittygobyebye
...
Fixes the roundstart catperson exploit.
2015-10-18 00:42:38 +03:00
d7936ae52b
Merge pull request #12431 from Incoming5643/blaze_it
...
Removes Plantpeople
2015-10-17 10:16:04 -05:00
cb7642b969
Merge pull request #12417 from phil235/SmokeChange
...
Changes smoke to behave more like foam.
2015-10-17 10:07:04 -05:00
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
fb294b81e2
Merge pull request #12419 from Robustin/master
...
Buffs Shadowling scaling to actually be a threat
2015-10-17 18:05:17 +03:00
8281e505ff
bird and discstation pass, replaces z2 airlocks with poddoors
2015-10-18 01:52:22 +11:00
d809f57de7
Merge pull request #12172 from MrStonedOne/webclientconfig
...
Adds config option for allowing webclient.
2015-10-16 21:49:50 +03:00
831f279865
Merge pull request #12415 from bgobandit/cuteshrooms
...
Walking mushroom fixes/tweaks
2015-10-16 21:48:30 +03:00
4dca285198
Merge pull request #12390 from KorPhaeron/AP2
...
Another slight tweak to armour penetration
2015-10-16 20:09:02 +03:00
52a82ff165
Merge pull request #12396 from Steelpoint/RiflesMan
...
Auto Rifle Balance Changes
2015-10-16 20:07:46 +03:00
c7fc833c8b
Merge branch 'bloodtomatotypes' of https://github.com/bgobandit/-tg-station into bgobandit-bloodtomatotypes
2015-10-16 18:14:18 +03:00
cf302d227f
Merge pull request #12399 from Xhuis/pneumatic_cannon_optimization
...
Pneumatic cannon fixes and optimizations
2015-10-16 17:43:06 +03:00
fb8002f583
Removes Plant People as a race
...
Plantpeople are just podpeople without the "healing in light" mechanic. I believe they were originally included in case someone wanted to develop them into a roundstart race, but since no one's done that they've just been doing two things in the code:
1. Tricking wizards who use the magic mirror into picking plant over pod and then getting confused why they aren't healing.
2. Making turning into a plant based human slightly too likely in the staff of change.
2015-10-16 03:57:54 -04:00
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
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
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
257af908fb
Merge pull request #12284 from KorPhaeron/spookyscary
...
Night Vision for revanants
2015-10-16 09:08:56 +03:00
c44c6d90be
Merge pull request #12350 from AnturK/ironwall
...
Rough Metal Walls
2015-10-16 09:08:00 +03:00
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
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
39b655219a
Merge pull request #12411 from bgobandit/grapesetc
...
Adds recipes for grapes and grape juice.
2015-10-16 09:00:38 +03:00
88e23b3003
Overrides human feature loading if mutant humans disabled.
2015-10-15 22:46:11 -07:00
d1cac57f96
Merge pull request #12405 from feemjmeem/bugfixes-oct14
...
Some itty bitty bugfixes (Oct 14)
2015-10-15 23:47:31 -03:00
601bcbc250
Merge pull request #12401 from KorPhaeron/cakehat
...
Buffs Cakehat
2015-10-15 23:44:46 -03:00
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
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
461726b9cc
Update pneumaticCannon.dm
2015-10-15 21:16:14 -04:00
5907b8b288
Changes the volume threshold for reagent absorption via VAPOR.
2015-10-16 01:15:30 +02:00
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
d09224e267
Changes
2015-10-15 17:26:32 -04:00
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
463e80ed62
Restores knockdown for high pressure setting
2015-10-15 17:09:48 -04:00
47909d525f
Changes smoke to behave more like foam. Each covered tile has one smoke cloud. This makes smoke clouds much less random, especially in terms of reagent application.
...
Also smoke reaction now uses the TOUCH method instead of VAPOR, to differentiate smoke and foam. Mob without internals or gas masks also ingests reagents in the smoke.
Moved nanofrost smoke code to effects/effect_system/effects_smoke.dm
2015-10-15 21:52:37 +02:00
cdd1cac39a
walking mushroom stuff
2015-10-15 14:43:43 -04:00
fbdbe43118
adds grappa and grape tarts, fixes typos O NO
2015-10-15 13:25:59 -04:00
cea729db60
Merge branch 'master' of https://github.com/tgstation/-tg-station into thetitanichadabettersafetyrecordthannanotrasen
2015-10-16 01:14:17 +11:00
39410d355c
ministation pass
2015-10-16 01:01:11 +11:00
40037855bf
Merge pull request #12285 from KorPhaeron/corpses
...
Corpse Spawner Update
2015-10-15 16:10:40 +03:00
6f2527ed7d
Merge pull request #12379 from optimumtact/fixclowntypesteal
...
Removes clown..
2015-10-15 16:08:24 +03:00
8b1608d45b
Merge pull request #12394 from bgobandit/grossmaymays
...
Toilet related tweaks and fixes
2015-10-15 16:07:29 +03:00
1bbc8944b3
Merge pull request #12387 from Shadowlight213/Revmes
...
Makes revenant malfunction ability not affect SMES
2015-10-15 16:05:15 +03:00
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
c716c5eaeb
Merge pull request #12356 from bgobandit/plasmarecyclingfix
...
Fixes recycler not recycling plasma.
2015-10-15 16:03:52 +03:00
9f492ea30f
Merge pull request #12352 from KorPhaeron/parasitefix
...
Guardian/Parasite Fixes
2015-10-15 16:03:36 +03:00
b919eed9cc
pass for metastation, code improvement
2015-10-15 19:06:53 +11:00
2bb40e9e86
Adds recipes for grapes and grape juice.
2015-10-15 00:33:59 -04:00
713a0b99ef
Buffs melee resistance on the TACTICAL BUCKETS
2015-10-14 21:58:15 -04:00
d07f749145
Conflicts 2/3
2015-10-14 21:56:18 -04:00
Shadowlight213
Jordie0608
Razharas
Cheridan
Razharas
Incoming
Aranclanos
The Half-Finished
phil235
Robustin
bgobandit