Commit Graph

151 Commits

Author SHA1 Message Date
Aurorablade
25876fd036 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2016-02-02 15:35:54 -05:00
Crazylemon64
9072a7075d Skrell's alcohol weakness is tracked on the liver 2016-01-28 20:17:00 -08:00
Aurorablade
b2881bdc94 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2016-01-26 21:17:25 -05:00
Fox-McCloud
45433edc73 Fixes Kahlua, Silencer, and BananaHonk 2016-01-25 19:06:27 -05:00
Aurorablade
51013b97c0 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2016-01-15 08:10:24 -05:00
Fox-McCloud
a746786ee0 Clone Damage Fix 2016-01-11 20:56:00 -05:00
Fox-McCloud
ebdd9d3897 Timestop Spell Port and Sepia Slimes 2016-01-06 03:30:08 -05:00
Fox-McCloud
44fe321366 cleaner 2016-01-05 20:14:10 -05:00
Fox-McCloud
4221d033ab Slipping Refactor and Floors 2016-01-04 21:22:59 -05:00
Aurorablade
bd19dc6942 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2016-01-01 22:38:23 -05:00
Fox-McCloud
4908b32727 A few Overdose Reagent Tweaks 2015-12-29 00:56:08 -05:00
Aurorablade
2146cc0d3d things
and stuff...gonna need to get to those merge conflicts eventually. also
purged all mention of internal_organs by name from the face of the
earth. we have get_int_organ now...i may need to tweak shit. oh and i
broke some things...
2015-12-26 17:34:38 -05:00
Aurorablade
80eb828563 this shit dosen't even compile yet... 2015-12-19 22:39:47 -05:00
TheDZD
3986cbe698 Merge pull request #2813 from Fox-McCloud/antihol-fix
Reagent Fixes and Tweaks
2015-12-12 23:28:47 -05:00
Fox-McCloud
5d1e24bc53 tweaks 2015-12-12 18:03:37 -05:00
Fox-McCloud
b84f31ac5c painkiller tweak 2015-12-12 16:51:37 -05:00
Fox-McCloud
1d6f5e07ad rezadone tweak 2015-12-12 02:27:22 -05:00
Fox-McCloud
068bfd10ba TG Mining Update 2015-12-10 21:35:02 -05:00
Fox-McCloud
59a929cd34 Ports over TG Sentience Potion 2015-11-26 12:08:16 -05:00
TheDZD
3211ba3a28 Merge pull request #2646 from Fox-McCloud/soy-sauce
Soy Sauce Recipe Change
2015-11-24 21:39:33 -05:00
Fox McCloud
c7ae3c0233 Merge pull request #2640 from FalseIncarnate/master
Random Chem Blacklists, Strange Plant Fixes
2015-11-24 21:38:22 -05:00
Tastyfish
317760a7de Merge remote-tracking branch 'upstream/master' into path_cleanups
Conflicts:
	code/modules/examine/descriptions/atmospherics.dm
2015-11-24 18:05:01 -05:00
Fox-McCloud
2ba8854329 Soy Sauce Recipe Change 2015-11-23 21:13:10 -05:00
FalseIncarnate
7780b75429 Random Chem Blacklists, Strange Plant Fixes
Revival and expansion of #1002 (thanks Iamgoofball!)

Creates a reagent blacklist for use with random chem stuff like pills!
- Currently blacklists admin-only, antag-only, and other bad-times chems
like mutationtoxin.

Creates a SECOND blacklist for further refinement, intended for use with
strange plants in botany.
- Currently just blocks alcohol / alcoholic bar drinks from the random
chems to avoid "watering down" the selections

Creates a new helper proc/get_random_chemical() to return a randomly
selected chemical/reagent that is not blacklisted.
- If passed with no arguments, will only look at the first blacklist.
- If passed with an argument, will also include the second "plant"
blacklist
- Will attempt to select a random chemical, then compare it to the
blacklisted chems to see if it is acceptable
- If the chem is on the blacklist, it will start over until it finds an
acceptable one

Rewrote the random chemical portion of Strange Plants to utilize the new
get_random_chemical proc rather than rely on a hardcoded "whitelist"

Updates Strange Plants to not only contain Nutriment
- They can now contain Nutriment, Plant-Matter, Protein... OR A COMBO OF
THEM!

Hydro trays and soil now recognize Nutriment, Plant-Matter, and Protein
as actual nutrients for plants, as well as (slightly) improving yield
modifiers.

Extension of #2596 (thanks Fox for the temp-fix)
Fixes #2416
Fixes #2439 (again)
2015-11-23 01:26:11 -05:00
Tastyfish
85d651b781 refactored datum/effect/system because it was a complete mess 2015-11-22 19:43:01 -05:00
Fox-McCloud
3522d1f9bd TG Slime Extracts Port 2015-11-22 03:05:29 -05:00
Fox McCloud
d440f9df3f Merge pull request #2578 from FalseIncarnate/master
Overdose Change, Reagent Tweaks and Fixes, IPC Damage Fixes
2015-11-17 17:30:11 -05:00
FalseIncarnate
cd1527a05f Overdose Change, Reagent Tweaks and Fixes, IPC Damage Fixes
Adjusts how Overdosing works
- Overdose effects now stop if you have less than the overdose threshold
for the given reagent in your system
- Previously, overdose effects would continue until all of the reagent
was removed from the body
- After dropping below the overdose threshold, reagents will process as
normal as long as they do not surpass the threshold again.

Tweaked some Synthetic-oriented reagents
- Synthetic drugs no longer will cause Toxins damage
- The toxins damage for these has been replaced with either another form
of damage or side-effect
- Degreaser no longer cures Toxins Damage in Synthetics
- Degreaser still acts as a chemical purgative and lube cleaner, but
helps cure certain side-effects much like Coffee does for organics.

Sterlizine recipe changed to require antihol and chlorine
- Effectively the same as the old recipe, except actually mixable
- Fixes #2030

Increases max_damage of MMI Holders to 200 (from 60)
- Now matches the max_damage for organic brains
- Should make IPC brain damage more consistent with organic brain damage

Gives IPCs the NO_POISON flag
- This should make IPCs immune to toxins damage again, as intended
originally.
- Fixes #2151.
2015-11-16 16:37:33 -05:00
Aurorablade
bc7a0864d5 Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into TooSpoopy 2015-11-16 01:15:41 -05:00
Fox-McCloud
ab3ed53734 Kitchen Updates 2015-11-09 01:09:59 -05:00
Aurorablade
f5f7c0cde9 might not be doing this right but eh 2015-11-02 21:58:15 -05:00
Aurorablade
570cfbe566 Spoopy 2015-10-29 12:32:38 -04:00
TheDZD
d681cefa03 Merge pull request #2362 from Fox-McCloud/gc-everything
Garbage Collect Everything
2015-10-18 16:44:35 -04:00
Fox-McCloud
e60edf9345 Garbage Collect Everything 2015-10-13 20:23:26 -04:00
Fox-McCloud
e19a8a405b mitocholide buff 2015-10-12 23:17:13 -04:00
Fox-McCloud
e83ebc3d52 Eyes Fixes and Chem Tweaks 2015-10-12 19:39:12 -04:00
Markolie
f052512578 Fixes 2015-10-02 01:34:37 +02:00
Mark van Alphen
44fc7e80e2 Merge pull request #2103 from Fox-McCloud/reagent-balance
Reagent Balance Tweaks
2015-09-21 02:10:36 +02:00
Fox-McCloud
9b5d15b0a6 Reagent Balance Tweaks 2015-09-19 08:48:10 -04:00
Fox-McCloud
705fb90b76 Reagent Skin Penetration Rework 2015-09-19 07:19:06 -04:00
Mark van Alphen
739e820faa Merge pull request #2078 from Fox-McCloud/experimentor
EXPERI-Mentor Addition--Telesci Removal
2015-09-18 07:18:55 +02:00
Fox-McCloud
02b0edb6ed Fixes Reagents GCing and Runtimes 2015-09-17 03:00:05 -04:00
Fox-McCloud
d41b09c0a6 Experimentor Addition--Telesci Removal 2015-09-17 00:59:38 -04:00
Fox-McCloud
844d203d0e cleanup and restructure 2015-09-15 06:52:06 -04:00
Fox-McCloud
9d2dab6917 Reagents Performance and Garbage Collection 2015-09-14 04:49:29 -04:00
Fox-McCloud
f31bf75764 Blob Rebalance 2015-09-10 19:12:59 -04:00
Fox-McCloud
385dc0d47b Space Cleaner Lighting Fix 2015-09-09 18:52:27 -04:00
Tigercat2000
ee32c0a35a Merge branch 'master' into intent_define
Conflicts:
	code/modules/reagents/Chemistry-Reagents.dm
2015-09-08 04:43:13 -07:00
Tigercat2000
f7f19eac59 Merge branch 'master' into reageaaaannntttttts
Conflicts:
	code/modules/reagents/Chemistry-Reagents.dm

+ apply cleaner patch manually
2015-09-07 16:02:17 -07:00
Tigercat2000
e30ae7dbc3 Whoops, tabbing. 2015-09-06 21:04:51 -07:00