Commit Graph

2262 Commits

Author SHA1 Message Date
Rykka
f059c396eb Adds Spice Resistence/Intolerance Traits, 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.
- 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.
I got tired of keeling over in agony after eating spicy food, and frankly, this is an RP server, so mechanical hardlimits on characters that canonically power down spicy food without giving a shit is frustrating to say the least.

All changes minus the neutral traits will be PR'd to Polaris.
2020-08-17 08:07:03 -04:00
izac112
74d84d2cff Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-08-17 09:44:00 +02:00
ShadowLarkens
f2d180ad09 Address a number of TGUI issues
- SmartFridge has been tweaked to look better
 - ChemMaster no longer puts the units in bottle names by default
 - Trinary filter reads last_flow_rate again
 - Operating computer now works based off percentage of health, rather
   than real health (note, a tesh at -50 won't die until -100, but it'll
   trigger the -100% alarm)
 - Clicking on the knob in the canister UI no longer brings up a number
   input too small to enter values in the valid range. For right now,
   the knob stays, but this may be reconsidered in favor of a
   NumberInput if more people would prefer accessibility over
   skeuomorphism UI design.
 - Pipe dispenser has a bent pipe option again
2020-08-14 10:55:08 -07:00
Novacat
c7a562b53d Merge pull request #8664 from rboys2/clara-dev-pink-moo-drink
Pink Moo Drink
2020-08-13 15:02:11 -04:00
izac112
5c02633707 Merge branch 'izac' of https://github.com/Yawn-Wider/YWPolarisVore; branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-08-13 20:01:22 +02:00
Riley
80bc172478 Merge remote-tracking branch 'VORE_MASTER/master' into clara-dev-pink-moo-drink 2020-08-13 04:08:40 -04:00
ShadowLarkens
41656d298f Fix the reagent grinder 2020-08-13 00:36:31 -07:00
Novacat
e4b5b8ea2d Merge pull request #8661 from ShadowLarkens/med_pass_2
TGUI Medical: Second Pass
2020-08-12 20:01:12 -04:00
Atermonera
ccf38e3c9e Merge pull request #7405 from Mechoid/Mortiferin
Mortiferin
2020-08-12 14:03:17 -04:00
Riley
aacf8c9962 Pink moo drink
this took me too long, me sleepy
2020-08-12 03:32:07 -04:00
izac112
81871a960e Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-08-10 21:50:42 +02:00
ShadowLarkens
9a62ba8cda Chem Master/Chem Dispenser 30/60u, + multibottle 2020-08-10 04:10:36 -07:00
Razgriz
f00fdebbb9 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into August2020UpstreamPull
August2020UpstreamPull
2020-08-09 02:58:18 -07:00
Novacat
2b45a2613c Update Chemistry-Machinery.dm 2020-08-08 23:56:46 -04:00
Atermonera
afb5819c32 Tweak to kitchen machinery: 2020-08-08 23:53:58 -04:00
ShadowLarkens
dc6c47841d TGUI Backend Tweaks & Fixes 2020-08-07 00:29:50 -07:00
Novacat
acbd596f0b Update Chemistry-Reagents-Core.dm 2020-08-06 02:41:05 -04:00
Atermonera
012a4a290c Overdose changes + General chem mods 2020-08-05 20:53:32 -04:00
KotetsuRedwood
7e29a994e9 Adds cinnamon rolls
Precious cinnamon rolls!!
2020-08-05 23:58:18 +01:00
izac112
50834e4a7b Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-08-02 23:52:01 +02:00
izac112
8b15e576d7 Updates plant-b-gone recipe 2020-08-01 18:59:19 +02:00
Novacat
04d19c7cbe Merge pull request #8536 from VOREStation/upstream-merge-7344
[MIRROR] Aurora Cooking Port
2020-07-31 01:34:42 -04:00
Rykka
e8ebaee3dd Fix incoming mirror PR 2020-07-31 01:14:09 -04:00
Atermonera
65cfe5f6e3 Implements Status Indicators 2020-07-30 15:30:44 -04:00
Atermonera
31f04a4975 Aurora Cooking Port 2020-07-30 15:13:46 -04:00
izac112
c6075d1216 Voreupdate (small) 2020-07-30 00:17:26 +02:00
DESKTOP-4BUBN9N\Mike
4f2f60e4bc vr file makes more sense also added comment separator 2020-07-29 22:03:05 +01:00
DESKTOP-4BUBN9N\Mike
438c1e600b adds cool and good new drink recipe 2020-07-29 21:33:08 +01:00
Novacat
ca022164bb Merge pull request #8520 from TeleTubby2/MlemWax
Makes sterilizine actually useful.
2020-07-29 15:09:07 -04:00
Teletubby2
3a367e20fb More reasonable value.
200 steps to see dirt again is a bit excessive.
2020-07-29 15:07:00 -03:00
KotetsuRedwood
34202bce2b Makes the buttspie slicable
You can use a knife on the ~~goatmom~~ pie and make slices of pie now! Numbers are temporary and will be tweaked to make them better, but the functionality's there now
2020-07-29 01:50:58 +01:00
KotetsuRedwood
9a6f8f2154 Some tweaks!
Made the cinnamon growns look more cinnamon-y. Trees look a little funky, but it's 2564 so maybe it's genetically modified for faster growth? Recipes haven't been added yet since they'll be using aurora cooking stuff when that's merged
2020-07-29 01:50:58 +01:00
KotetsuRedwood
12875f68cb Basics for Cinnamon
Added a basic lot of stuff for cinnamon. No recipes yet, haven't tested yet. Fun stuff to do with it will come later!
2020-07-29 01:50:57 +01:00
Rykka
831ba82b7a Merge branch 'master' into shep-dev-aurora-cooking-port 2020-07-28 04:04:39 -04:00
izac112
38288b15c6 Voreupdate (small) 2020-07-27 06:34:28 +02:00
Rykka
15da4a522f Rename Alcoholic Version of Love Potion to The Love Maker
Should prevent the alcoholic version of Love Potion appearing fucking everywhere.
2020-07-26 20:29:10 -04:00
izac112
3236896631 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-07-26 15:12:19 +02:00
Rykka
2df9c9d080 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:25:15 -04:00
Rykka
f18c8bfa0a 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:17:27 -04:00
izac112
93083fc58b Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-07-26 04:53:18 +02:00
Teletubby2
63b9a13124 Makes sterilizine actually do something worthwhile.
Hnnnnnnng. if floor code wasn't ass I'd give this it's own overlay, but it's fine. probably. the reason I'm not throwing this at Polaris is because I can't be assed forking them with my junky, canadian internet.
2020-07-25 21:42:49 -03:00
izac112
601a155b30 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-07-25 15:22:42 +02:00
ShadowLarkens
2579579fd1 TGUI'ified Medical Everything
This converts basically every UI used in the Medical department to use
TGUI instead. Fancy!

ParadiseSS13/Paradise#13738
2020-07-25 00:44:51 -07:00
Rykka
96f179aebd Recipe Dump Verb Fixes, Add Grill to Appliance List for Sort, fix Oils 2020-07-24 00:00:03 -04:00
Rykka
2b8b58433c Aurora Cooking Recipe Fixes
Includes runtime fixes to recipe dump - now if a reagent is invalid, it will skip that item and runtime it so you can identify why.

Re-adds Peanut Oil and hotspot math for oil spills.
2020-07-23 22:13:43 -04:00
Razgriz
5fe45fc4d6 Merge pull request #422 from Shadowfire117/goiaanddrinks
Casino updoot!
2020-07-23 13:34:00 -07:00
Shadowfire
7fc2c5e092 Casino updoot
New features:

New category of prizes; Pets! Anything from a tame chicken or goose all the way up to absolute unit Oties and Zorgoias!
New custom looking spawner grenades for casino mobs, dont flash and blind people, perfect for a party trick!
New casino security id card!
Zorgoias have a chance to show up in predator crate!
Two gorgeous new crowns, the crowns of the king goose and the queen goose, sprited by our lovely artist Kassc!

bug fixes and edits:
Renamed Jack's brew to Rush hour... What was I thinking calling it that?
fixed casino prize dispenser flashing 'price' instead of 'prize'
Fiddled with slot machine, hopefully not everyone will constantly get the platinum chip, might need more adjustments
Fixed wrong access requirements in casino bar
Put access restrictions on the windoors to the prize booth
sunglasses in casino recroom
Fixed casino wallets, now they can hold what normal can hold AND card decks, casino chips, casino manual and platinum chip!
Put a resleeving pod in the casino medbay, for easier resleeving during events!
Reworked access restrictions to casino security area, casino security uses 201 as their access number
2020-07-23 14:57:13 +02:00
Rykka
c27b2d2234 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 22:14:04 -04:00
Razgriz
575b1f4f33 Merge branch 'master' into shep-dev-aurora-cooking-port 2020-07-22 18:51:09 -07:00
Rykka
886ab72289 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:34:13 -04:00