Commit Graph

1670 Commits

Author SHA1 Message Date
Cheridan 12d1562005 Merge pull request #16365 from Supermichael777/patchpatch
Adds delay to patches
2016-03-26 20:12:15 -05:00
Supermichael777 621b2ec948 fixes from local testing 2016-03-25 15:37:45 -04:00
Supermichael777 80688df26c and adds the actual delay 2016-03-25 15:00:35 -04:00
Supermichael777 c141cc59a2 updates pills to alow for a delay because inheritance 2016-03-25 14:58:35 -04:00
AnturK 209884a516 Merge pull request #16262 from RemieRichards/BEES_glorious_BEES
Reagent Bees Revengenace
2016-03-24 21:45:31 +01:00
phil235 7c2203857c Merge pull request #16147 from Xhuis/bacchus_approves
Alcohol Refactor (Merge-Ready)
2016-03-24 19:05:56 +01:00
Remie Richards b9a2c7fdfe Merge branch 'master' of https://github.com/tgstation/-tg-station into BEES_glorious_BEES
Conflicts:
	icons/mob/head.dmi
2016-03-23 15:41:58 +00:00
Iamgoofball c22fa4b907 Buffs CLF3
>maxcap CLF3 foam
>thunderdome
>total of 2 burned tiles and a single plating was made

yeah no

this is CLF3

🆑
rscadd: CLF3 now melts, burns, and destroys floors a lot more often, as it should be.
rscadd: CLF3 now makes 3x3 fireballs on tiles it touches now, instead of a single fireball.
/🆑
2016-03-21 23:51:01 -07:00
Xhuis 916e1cada0 Modifies alcohol poisoning formula, thanks to @phil235 2016-03-21 17:03:19 -04:00
Remie Richards ed8ca553b4 Fixes, Improvements, Feedback - Wave 1 2016-03-21 18:05:28 +00:00
Cheridan a29aba94e9 Merge pull request #16206 from JJRcop/JJRcop-patch-1-1
buffs milk for skeletons and plasmamen (not stolen)
2016-03-21 03:59:54 -05:00
Remie Richards be0b16a6aa Reagent Bees! Bees come from a beebox and pollinate nearby hydroponics plants, improving the health/yield/removing pests from the plants. While pollinating they build up resources to build honeycomb, honeycomb contains honey (a mild healing reagent that is very nutritious) any spare resources (50 bee_resources) are converted into new bees. honeycombs can be ground up to get the honey and other reagent inside them in an All In One Grinder.
Beeboxes have honey_frames which determine the amount of honeycomb+bees they can maintain.
Bees now have a beegent (Bee reagent, geddit?) that they use during their attacks AND that their produced honeycomb contains, this allows you to farm chemicals using bees.
2016-03-21 04:51:16 +00:00
Xhuis 28a767043a A few more optimizations 2016-03-20 12:21:14 -04:00
Xhuis 0b28d11e48 Fun removal 2016-03-19 23:38:06 -04:00
Xhuis ce7118c893 Implements @phil235's recommended changes 2016-03-19 23:37:10 -04:00
Cheridan 9a6e95e336 Merge pull request #16047 from RandomMarine/hallelujah
Adds holy hand grenades.
2016-03-19 21:43:48 -05:00
Xhuis b5f0726028 Code optimization 2016-03-19 17:34:42 -04:00
Xhuis c461128a56 Alcohol refactor 2016-03-19 16:09:43 -04:00
JJRcop 7336988381 maybe this will work 2016-03-19 13:30:37 -04:00
JJRcop f2c45014fc buffs milk for skeletons and plasmamen 2016-03-19 02:26:23 -04:00
Joan Lung f3f598225e Merge pull request #16129 from KorPhaeron/mutagen
Adds a mutagen dispenser
2016-03-17 17:46:37 -04:00
KorPhaeron 4cb3a2b9be Mutagen Dispenser 2016-03-15 09:37:43 -05:00
Nerd Lord 3b49362183 full damage 2016-03-12 23:52:42 -05:00
Nerd Lord bd9ec70179 blob tuning 2016-03-12 23:34:29 -05:00
KorPhaeron ee61367807 Merge pull request #16040 from Boredone/master
Replaces Mediborg Acid Spray with Poison Hypospray
2016-03-12 13:54:54 -06:00
RandomMarine 93e418dbb7 Holy explosions do bad things to unholy things. 2016-03-11 14:52:55 -08:00
Boredone 198e81d82f Switched out Teslium for Lexorin 2016-03-11 14:38:14 -07:00
RandomMarine 18e9976567 Adds holywater/potassium reaction 2016-03-11 10:54:19 -08:00
AnturK 1f2a9811ff Merge pull request #16020 from ChangelingRain/bonuschemtweaks
Tweaks Boiling Oil and Flammable Goo
2016-03-11 17:34:52 +01:00
Boredone 6bfe0e921a This replaces the FAcid spray on Mediborgs with a Poisonous Hypospray 2016-03-11 01:52:59 -07:00
Joan Lung d24dd3e8db Merge pull request #15989 from RandomMarine/copysplosion
De-copypastas explosive reagent reactions.
2016-03-10 11:06:46 -05:00
Nerd Lord d5840cdb44 Boiling Oil does slightly more damage, takes slightly less when extinguished
Flammable Goo applies firestacks to targets, but doesn't ignite them.
2016-03-10 10:47:21 -05:00
RandomMarine fb011a475a Fix my goof 2016-03-09 02:50:14 -08:00
RandomMarine 3cfc1f2626 Remove copypasta 2016-03-09 01:59:41 -08:00
Nerd Lord 3031953f68 ) 2016-03-08 20:51:30 -05:00
Nerd Lord 1424548e14 The blob can now be shocked by the tesla
Strong blobs are now much more resistant to brute damage. Don't even bother hitting them with a wrench.

Tweaks blob reagents;
Removes Ripping Tendrils and Draining Spikes
Sporing Pods now does much less damage, and is less likely to produce spores when killed
Replicating Foam now takes increased brute damage and when expanding from damage, will not expand again
Energized Fibers no longer heals when hit with stamina damage, and is instead immune to the tesla
Boiling Oil takes damage from extinguisher blasts. Its blobbernauts, however, do not
Flammable Goo takes 50% increased burn damage
Regenerative Materia, Hallucinogenic Nectar, and Envenomed Filaments each do less toxin damage
Poisonous Strands applies its damage over a longer period of time
Explosive Lattice now takes much higher damage from fire, flashbangs, and the tesla
Reactive Gelatin now has a lower minimum damage
Electromagnetic Web takes full brute damage, lasers will now one-hit normal blobs, and the death EMP is smaller
Cryogenic Liquid does less burn damage
Pressurized Slime does less brute damage
2016-03-08 20:27:57 -05:00
c0 08bdcc3024 Plant Refactor 4 2016-03-07 12:46:12 +03:00
tkdrg 96d8652ec4 Merge pull request #15885 from phil235/ReagentMobUpdateFix2
Health update from reagent metabolization now only happens once. Part 2
2016-03-04 22:18:39 -03:00
Cheridan 519a517206 Merge pull request #15901 from ChangelingRain/chemfixes
Fixes and tweaks blob chemicals
2016-03-04 16:08:21 -06:00
Nerd Lord eaf0c3443c don't code when nauseated for like a month kids 2016-03-03 19:59:58 -05:00
Nerd Lord 594322b2e6 oh wow jeez whoops 2016-03-03 19:30:38 -05:00
Nerd Lord 12d0d82cd6 Synch mesh won't split damage to cores or nodes 2016-03-03 19:17:24 -05:00
Nerd Lord 2b405d7db1 Tweaks blob chems slightly 2016-03-03 10:41:50 -05:00
Cheridan aa9196a725 Merge pull request #15880 from Core0verload/plantrefactor1
Plant Refactor: Revenge of the Grown
2016-03-03 00:16:34 -06:00
phil235 e5c3011148 Fixes incorrect argument given to Weaken() and adjustWeakened() in some cases. 2016-03-02 20:04:37 +01:00
phil235 c07a48a84d Moved changeling adrenaline and shadowling blindness smoke reagent to the proper reagent files.
Fixes these two reagents calling mob update procs when they shouldn't.
2016-03-02 19:55:55 +01:00
Cheridan ffb14ed84d Merge pull request #15788 from Shadowlight213/Oldcultredo
Remake of #15690. Replaces newcult with oldcult.
2016-03-01 22:37:58 -06:00
c0 0e1ae09e92 Plant Refactor: Revenge of the Grown 2016-03-02 07:30:06 +03:00
tkdrg ef1f9845dc Merge pull request #15412 from LanCartwright/toxinvirology
New virology chems. Makes virus food actually useful. Adds uranium to virology uses.
2016-02-29 23:41:28 -03:00
Akke 97f2a423de fixes other_reagents.dm to be children of their original reagent. 2016-03-01 00:03:13 +00:00