Jordie0608
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
Razharas
d7107264aa
Merge pull request #12429 from Shadowlight213/Kittygobyebye
...
Fixes the roundstart catperson exploit.
2015-10-18 00:42:38 +03:00
Cheridan
d7936ae52b
Merge pull request #12431 from Incoming5643/blaze_it
...
Removes Plantpeople
2015-10-17 10:16:04 -05:00
Cheridan
cb7642b969
Merge pull request #12417 from phil235/SmokeChange
...
Changes smoke to behave more like foam.
2015-10-17 10:07:04 -05:00
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
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
Incoming
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
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
Shadowlight213
88e23b3003
Overrides human feature loading if mutant humans disabled.
2015-10-15 22:46:11 -07: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
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
phil235
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
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
Jordie0608
cea729db60
Merge branch 'master' of https://github.com/tgstation/-tg-station into thetitanichadabettersafetyrecordthannanotrasen
2015-10-16 01:14:17 +11:00
Jordie0608
39410d355c
ministation pass
2015-10-16 01:01:11 +11: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
