Commit Graph

1758 Commits

Author SHA1 Message Date
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
Rykka
b367193908 Huge Bundle of Fixes, Update Cooking to current Aurora
Cooking times are now no longer 10-15 minutes per item, the LARGEST items will take around ~4-5 minutes, 6 at the maximum in the case of the superbigbite (one of the most filling food items in the game).
Cooking oil tanks added
Appliances are now constructible instead of being eldritch black magic
Recipes are now reorganized to either fryer/oven/grill based on where they're made (Although recipes_microwave still needs a LOT more sorting)
Critical time bug with cooking fixed, AND you can now upgrade your appliances for even higher efficiencies!
2020-07-22 21:45:03 -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
Atermonera
2596679bf4 Merge pull request #7261 from Cerebulon/rotationpart2
Another Lesser Rotation
2020-06-04 19:24:34 -07: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
Atermonera
55e12aad7b Merge pull request #7210 from VOREStation/vplk-static-power
[PORT] Static Machinery Power
2020-05-30 21:18:27 -07:00
Cerebulon
551f000643 Another Lesser Rotation 2020-05-29 01:23:28 +01:00
Atermonera
6ab622a2b5 Merge pull request #7205 from VOREStation/Arokha/playsound
Alter playsound paradigm
2020-05-28 16:05:59 -07:00
Cerebulon
6620284acb Rotates so much. 2020-05-25 01:41:58 +01:00
Leshana
ccef6cc908 Implements "static" area machinery power usage
- Instead of using auto_use_power to re-tally up machinery's power usage every cycle, track the steady "static" load separately from the transient "oneoff" usage.  Machines then only need to inform the area when they use oneoff power or *change* their steady usage.
- Remove auto_use_power and stop SSmachines from calling it.
- Add vars to track "static" usage for each of the three power channels to /area
- Rename the existing three vars to "oneoff" so its clear what they mean (and to catch people accidentally updating them directly)
- Update area power procs and APCs to use the new variables.
- Rename /area/proc/use_power() to use_power_oneoff() to make it clear what it is doing.
- Deprecate /obj/machinery/use_power() in favor of use_power_oneoff() but don't delete yet.  Can transition gradually.
- Add logic to the update_power procs on machines to calculate the deltas and update static area power whenever their usage changes.
- Add logic to machines to update area power when they are created, destroyed, or move.
- Moved /obj/machinery procs related to area power usage into machinery_power.dm to make them easier to find.
- Added or updated comments in several places to explain what is going on and how to use it.
2020-05-19 20:17:48 -04:00