Commit Graph

1722 Commits

Author SHA1 Message Date
klaasjared
a0ff9a0aa0 Boda Tweaks and Russian Drinks V2 (#8023)
* Adding Cans

Adds the following cans
-Boda
-Kvass
-Kompot

* Adds Russian Reagents

Adds the following reagents
-Kompot
-Kvass

* Fills the cans

Adds the code needed for the can additions

* Updates the BODA Machine

Removes the old products and contraband and replaces them with the new cans
2021-04-09 22:37:35 -09:00
Atermonera
003d47fbbc Tanning Tweaks (#7965)
* Tanning Tweaks

* tanning racks remove from SSobj on destroy
2021-03-29 20:48:11 -09:00
Atermonera
81ae48ba93 Merge pull request #7974 from MistakeNot4892/jager
Added Doctress' Jager drink.
2021-03-17 23:37:02 -09:00
MistakeNot4892
ca38755c7a Added Doctress' Jager drink. 2021-03-14 08:13:18 +11:00
cadyn
75dbadd12e Allergens v2 (#7950)
* Allergens v2

* The eggening

Add egg allergen, give it to skrell, apply egg allergen where it belongs.

* Update species_languages.dm
2021-03-10 09:53:07 -09:00
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
MistakeNot4892
b22a0568a3 Sideports a couple of init unit tests from Neb. (#7893)
* Sideports a couple of init unit tests from Neb.

* Trying to unfuck initialize logic.

* Removing del()s.

* Adjusting return values to Initialize().

* Moving some dangerous object logic from obj onto the two types that use it.

* Rolling back some init changes and commenting out initialized atom unit test.

* this comment formatting is a minor war crime

* Removed sleep() from signaler circuit Initialize().

* Additional Init fixes post-rebase.

* Uncomments subsystem test since that's passing.
2021-02-21 12:03:34 -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
Atermonera
b592ac3f7e Fixes runtime in add_reagent() (#7676)
Bad index: data["species"] when data is not a list
2020-09-22 20:39:25 -07:00
Atermonera
05795bda4d Merge pull request #7672 from Meghan-Rossi/triglyceride_taste
Fix fat tasting bitter
2020-09-21 09:54:26 -07:00
Atermonera
a9e34c8e9f Merge pull request #7669 from Mechoid/FixBeakerdipping
Fix Beaker Dipping
2020-09-21 09:48:15 -07:00
Atermonera
6bd15bc200 Merge pull request #7625 from ShadowLarkens/tgui_med
TGUI Medical Conversion
2020-09-19 18:52:23 -07: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
eb86ea9cd7 Dipping things into beakers now does not occur on help, since you're probably being careful. 2020-09-16 22:07:48 -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
ShadowLarkens
44f65e2602 TGUI Medical Conversion 2020-09-04 16:25:32 -07:00
Atermonera
24e638c433 Merge pull request #7583 from KillianKirilenko/kk-misc2
FBP Internals Additions
2020-08-31 20:24:17 -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
f7fcdf2458 Reverts #7560, Adds Proper check to syringes.dm and flora.dm for borgs
ACTUALLY fixes problems with borgs permanently breaking their syringes and being able to put modules into potted plants, which causes unwanted fuckery.

Reverts #7560
2020-08-27 20:17:24 -04:00
Atermonera
d63d05acbd Merge pull request #7560 from cadyn/cadyn-bugfixes
Some borg bugfixes
2020-08-27 16:59:27 -07:00
Atermonera
4bf64e6b2a Merge pull request #7459 from Rykka-Stormheart/shep-dev-sound-overhaul
Massive Ambience and Sound Overhaul + Addition
2020-08-27 16:23:38 -07:00
Killian
d8a711021d can inject synths, fix borghypo filename 2020-08-27 23:22:33 +01:00
Cadyn
9f3fe77be0 Following feedback 2020-08-24 14:20:41 -07:00
Cadyn
12c77bd905 Cyborg bugfixes 2020-08-23 20:15:20 -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
Rykka
0c7a7fd2b8 Massive Ambience and Sound Overhaul + Addition, Squashed Commit Edition 2020-08-21 06:53:05 -04:00
atermonera
c9a892f591 Emergency Travis Appeasement: One Giant Spider 2020-08-20 20:01:44 -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
864135b032 Merge pull request #7425 from lbnesquik/Kot-Cooking-tweak
Tweak to kitchen machinery:
2020-08-08 20:53:30 -07: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
lbnesquik
728699f1f7 Tweak to kitchen machinery:
- Add some extra indications to the new cooking machinery for how you use it
- Tad of feedback for the grinder and oven.
2020-08-04 21:45:20 +02: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
dd3cd72908 Fix batter and all subtypes of it being unmake-able.
Add water or beer BEFORE adding egg + flour together to avoid messing it up.
2020-07-26 00:28:08 -04:00
Rykka
24f754f558 Fix Recipe Dump + Reagents, reduce # of commits by 1 2020-07-23 23:46:27 -04:00