Commit Graph

308 Commits

Author SHA1 Message Date
Killian
948d43afec Diet/Allergy Rework & Refactor Pt2 (#7940)
* Diet/Allergy Pt2

* couple more reaction types

* refactor and improve

* Update Chemistry-Reagents.dm
2021-03-07 12:09:18 -09:00
Schnayy
83e0c14bcb adds sugary var (#7897) 2021-02-19 14:41:44 -08:00
Killian
4c4dc6fee1 small update for soft mixed drinks 2021-02-09 20:42:14 +00:00
Killian
2491dc89e9 Update Chemistry-Reagents-Dispenser.dm 2021-02-08 05:23:51 +00:00
Killian
8a8a4ac5b2 Merge remote-tracking branch 'upstream/master' into kk-diet 2021-02-08 05:12:01 +00:00
Killian
bd87eb06b0 extended allergy system first pass 2021-02-08 04:59:21 +00:00
Cerebulon
aa22ef3ef7 Every Food Fix 2021-01-29 10:46:10 +00:00
Atermonera
4fe327583c Space cleaner cleans mobs (#7802) 2021-01-03 15:19:20 -08:00
Mechoid
91aacb3f0f Plainleather & Tobacco (#7762)
* Rebrands leather to plainleather. Add tobacco and red-caps, redwood tallcaps.

* Seedpacket

* Sinks are wet.

* User
2020-12-07 15:48:49 -09:00
Meghan-Rossi
e5db7f8ede Fix fat tasting bitter
*Fat (triglyceride) now tastes greasy instead of bitter
2020-09-19 14:04:03 +01:00
Atermonera
cdd1c024f3 Fixes runtime in Chemistry-Reagents-Food-Drinks.dm,25: bad index (#7654) 2020-09-18 20:28:12 -07:00
Mechoid
f518a31458 Hydro upkeep (#7475)
* Start work on Hydro upkeep.

* Fix Cyborg interactions with kitchen tools.

* Add Wurmwoad to the vendors.

* Map

* changeling
2020-09-16 16:38:43 -07:00
Mechoid
86cd06d283 Distillery Upkeep, Chemistry Tweakening (#7573)
* Distillery For Chemistry

* Synthplasma, Synthblood but not horrifically strong.

* Rectify, I said, damnit!

* Distillery for Chem. Now with STRONG DMM.

* changeling
2020-08-31 19:35:25 -07:00
Rykka Stormheart
301662bd97 Adds Spice Mod to species.dm, Makes Frost Oil COLD (#7516)
* Adds Spice Mod to species.dm, Makes Frost Oil COLD

~~Spice Resistance traits in the same flavor as Booze traits. 
3x, 2x, 1.5x, 0.75x, 0.5x, 0.25x resistance to the effects of capsaicin and frost oil.~~
^ Above changes inapplicable, but you can add traits yourselves if you're interested. Not sure how Polaris does their traits vs Virgo.

- Frost Oil and Capsaicin will now **lower/increase your body temperature by a random amount** during the ingest step if you're over the danger threshold.
- var/spice_mod is added to the species datums, much like alcohol mod.
- Frost Oil will now remove 5 capsaicin on affect_ingest much like capsaicin would remove 5 frostoil.

Not much else to say.

* Forgot the M.Species.

* Removes IS_ALRAUNE from Frostoil
2020-08-22 01:20:33 -07:00
listerla
9b45bc2f27 Skrell blood is now hemocyanin-based (#7492)
* Skrell blood is now hemocyanin-based

Inspired by Aurora

* Update Chemistry-Reagents-Dispenser.dm

* Create Lorilili - hemocyanin.yml
2020-08-20 19:17:04 -07:00
Mechoid
85d13382df FBP Internal Components (#7445)
* Starts work on FBP components

* Complete

* Map

* Tweakening.

* P r e c i s i o n

* P r e c i s i o n Engineering
2020-08-20 18:39:46 -07:00
Atermonera
4a56ad2191 Merge pull request #7449 from Cerebulon/vendEnhance
Flavour Enhancement: Vending
2020-08-20 18:23:54 -07:00
Mechoid
9ec10f97c8 Reagent Hoses (#7386)
* Starts work on basic reagent hose machinery.

* Continue Work, Add Spray Nozzle

* Tubing is craftable.

* Changeling

* Upkeep

* TRUE
2020-08-20 18:22:39 -07:00
Atermonera
2d6a14b581 Merge pull request #7405 from Mechoid/Mortiferin
Mortiferin
2020-08-12 11:01:40 -07:00
Cerebulon
0f146f3349 Flavour Enhancement: Vending 2020-08-09 05:05:43 +01:00
Atermonera
c820021ad6 Merge pull request #7361 from ExabyteDiscord/Upstream-Dog-ChemistryThing
Overdose changes + General chem mods
2020-08-05 17:52:26 -07:00
Mechoid
23c01743ca Adds Mortiferin, bumps Necroxadone in strength so the investment is more worth the result. 2020-07-31 16:28:18 -07:00
Atermonera
55b2c8d6ef Merge pull request #7354 from Neerti/status_indicators
Implements Status Indicators
2020-07-30 12:29:46 -07:00
Rykka
8b56294bc3 Forgot the / 2020-07-30 05:16:18 -04:00
Rykka
ecfe23398b Makes Changes requested by maintainer 2020-07-30 04:59:01 -04:00
Rykka
24f754f558 Fix Recipe Dump + Reagents, reduce # of commits by 1 2020-07-23 23:46:27 -04:00
Erik
f284d6a7b7 Overdose changes + General chem mods 2020-07-21 21:27:58 -07:00
Neerti
94062a21bf Implements status effect icons for various statuses. Cleans up various variable accesses to use setters instead. 2020-07-18 12:53:32 -04:00
Rykka
e56d0d7f1f Remove Alraune Check that would fail, as species doesn't exist here 2020-07-16 20:57:49 -04:00
Rykka
7c37997619 Aurora Commit 3 2020-07-16 20:55:23 -04:00
Rykka
aaf223b256 Aurora Commit 2 2020-07-16 20:52:28 -04:00
BlackMajor
a5f9c6ea59 Self loop man bad 2020-06-09 13:39:42 +12:00
Killian
368315b4db Species Vars Extension (#7249)
* species var extension v1

* Update carbon.dm

* sve v1.2

* sve v1.2a

* Update carbon.dm

* Update carbon.dm

* ain't no party like a bitflag party

* assorted tweaks and refactoring

* Update carbon.dm

* further duration & effect tweaks
2020-06-04 16:51:52 -07:00
Neerti
9ea5363ff7 Update Chemistry-Reagents-Toxins.dm
Resolves mistake in toxin reagents.
2020-04-27 10:00:19 -04:00
Neerti
2dee403370 Removes limits on eating, centralizes nutrition changing. 2020-04-26 05:30:32 -04:00
Atermonera
e5a68312af Ingested ethylredox removes ingested alcohol (#6973) 2020-04-09 22:21:47 -07:00
Atermonera
76b825816c Merge pull request #6865 from Mechoid/FireAndFlameTweaks
Tweak Fire, Flamethrowers, and Water.
2020-03-25 23:16:36 -07:00
Atermonera
c4097a11d0 Besrserkjuice doesn't spam chat (#6893) 2020-03-25 13:36:48 -07:00
Mechoid
0433ee38f6 Water now properly extinguishes again (especially regarding fire modifiers), and won't duplicate itself. Flamethrowers tweaked again to be properly sane. 2020-03-17 02:35:19 -07:00
Atermonera
dcc4d199cc Merge pull request #6803 from Schnayy/CookingUpdate1
Cooking adjustments
2020-03-10 15:40:04 -07:00
Schnayy
4b2a0cc6cf Many small changes. 2020-03-08 10:16:17 -05:00
Cerebulon
7656625987 Fixed menthol cigarette runtime 2020-03-08 15:16:00 +00:00
listerla
02f97a116e Adds ecigs and vaping (#6753)
* Adds ecigs and vaping

* Uncomments ssobj

Co-authored-by: lemon <lemon@localhost.localdomain>
2020-03-06 07:09:24 -08:00
Anon
689f238a80 Merge remote-tracking branch 'origin/master' 2020-02-20 19:09:04 -05:00
Arokha Sieyes
5b15917d32 to_chat replacing stream operator 2020-02-17 13:14:08 -05:00
LeighKnapenberger
d53490639d Fixes Mint Apple Sparkle having a recipe, but no drink 2020-02-10 22:54:16 -05:00
Atermonera
0dbcdf6e55 Merge pull request #6628 from Ketrai/cakebranch
Adds a mega cooking recipe
2020-01-20 20:14:07 -08:00
Ketrai
6db1d29836 Ports deathbell because the recipe requires it. 2020-01-18 12:43:29 +01:00
Mechoid
9699844fc7 Preliminary 2020-01-12 15:29:53 -08:00
Ketrai
d434a9d12b adds gnomes. (#6595)
* adds gnomes

* Makes the house nice and bright.

* copypasta error

* Odd

* makes gnomes adminspawn only.

Co-authored-by: KitKetKetrai <49008286+KitKetKetrai@users.noreply.github.com>
2020-01-08 10:46:42 -08:00