cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-16 13:13:03 +00:00
Code Issues Packages Projects Releases Wiki Activity
60,262 Commits 6 Branches 0 Tags
e900aa66d174cb270f15738df36701aae37a73f6
Commit Graph

2245 Commits

Author SHA1 Message Date
Cadyn
1d0e69633f Fix silly stuff 2020-10-05 19:46:50 -07:00
Cadyn
07775449d7 Fixing conflicts 2020-10-05 18:10:53 -07:00
Razgriz
54e632ebf2 September 2020 Upstream Merge 2020-09-25 23:07:08 -07:00
Atermonera
3204c9f9a5 Fixes runtime in add_reagent() (#7676) 
Bad index: data["species"] when data is not a list
 2020-09-22 23:40:38 -04:00
Novacat
41c8e4a671 Merge pull request #9032 from VOREStation/upstream-merge-7475 
[MIRROR] Hydro upkeep
 2020-09-21 19:42:43 -04:00
Novacat
d49640431d Merge pull request #9062 from ShadowLarkens/tgui_finale 
NanoUI Goes To Brazil
 2020-09-21 14:13:16 -04:00
Novacat
0ed68c9d54 Merge pull request #9078 from VOREStation/upstream-merge-7669 
[MIRROR] Fix Beaker Dipping
 2020-09-21 14:06:28 -04:00
Atermonera
797873c769 Merge pull request #7672 from Meghan-Rossi/triglyceride_taste 
Fix fat tasting bitter
 2020-09-21 12:55:01 -04:00
Atermonera
84b9867fd0 Merge pull request #7669 from Mechoid/FixBeakerdipping 
Fix Beaker Dipping
 2020-09-21 12:49:38 -04:00
ShadowLarkens
3f191e4204 NanoUI Goes To Brazil 2020-09-20 02:36:46 -07:00
Atermonera
c48cd56583 Fixes runtime in Chemistry-Reagents-Food-Drinks.dm,25: bad index (#7654) 2020-09-18 23:29:41 -04:00
Mechoid
68a37c64fa Hydro upkeep 2020-09-16 19:40:41 -04:00
Victor Zisthus
0dc862584b Added Fire Fighting Foam Recipie 
For when you want to play around with the nifty water foam without draining all the actual tanks. Have fun with spray bottles and chem sprayers!
 2020-09-16 15:56:18 -04:00
izac112
4b051c23fc Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-09-13 15:05:53 +02:00
Repede
1aed482d7d Fixes some M << to to_chat references. 2020-09-01 23:16:25 -04:00
Novacat
070a3489fe Merge pull request #8940 from VOREStation/upstream-merge-7583 
[MIRROR] FBP Internals Additions
 2020-09-01 00:51:59 -04:00
Atermonera
a5c829ea53 FBP Internals Additions 2020-08-31 23:25:13 -04:00
Mechoid
97831abf14 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 22:37:18 -04:00
cadyn
860615c70c Upstream oopsie-fixes 2020-08-28 13:00:42 -07:00
Novacat
f6e61ea8f1 Merge pull request #8658 from Rykka-Stormheart/shep-dev-ambience-additions 
Massive Ambience and Sound Overhaul + Addition
 2020-08-28 00:47:23 -04:00
Atermonera
4acd8a7a87 Merge pull request #7584 from Rykka-Stormheart/shep-dev-borgo-fixes 
Reverts #7560, Adds Proper check to syringes.dm and flora.dm for borgs
 2020-08-27 21:45:33 -04:00
Rykka
d2fb9a7691 Rebase onto Master for Volume Control Panel, Squash Commits 2020-08-27 19:47:38 -04:00
Heroman3003
dbf373c6a7 Makes Liquid Protean and Repair Nanites affect synths 2020-08-27 14:46:18 +10:00
Cadyn
7139225191 Following feedback 2020-08-24 14:23:08 -07:00
Cadyn
5e02857320 Many bugfixes! 2020-08-23 19:54:11 -07:00
izac112
48af4c881c Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-08-22 20:07:45 +02:00
Novacat
a6efe9acbb Merge pull request #8756 from VOREStation/upstream-merge-7449 
[MIRROR] Flavour Enhancement: Vending
 2020-08-21 13:32:37 -04:00
Novacat
1b27dffb9d Merge pull request #8757 from VOREStation/upstream-merge-7445 
[MIRROR] FBP Internal Components
 2020-08-21 13:32:02 -04:00
Verkister
929ce6c728 Merge branch 'master' into upstream-merge-7386 2020-08-21 14:12:26 +03:00
Novacat
c55f47fe64 Merge pull request #8778 from VOREStation/upstream-merge-7534 
[MIRROR] Emergency Travis Appeasement: Sacrifice of one Giant Spider, one HMS Jolly Pip, and one Capital City sacked and looted by Cultists
 2020-08-21 01:41:39 -04:00
Atermonera
e89409e64b Emergency Travis Appeasement: Sacrifice of one Giant Spider, one HMS Jolly Pip, and one Capital City sacked and looted by Cultists 2020-08-21 00:12:11 -04:00
listerla
85536ea0fd 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 22:17:58 -04:00
Mechoid
170b9a7513 FBP Internal Components 2020-08-20 21:40:15 -04:00
Atermonera
1e9e8c2c60 Flavour Enhancement: Vending 2020-08-20 21:25:31 -04:00
Mechoid
496322f4f1 Reagent Hoses 2020-08-20 21:24:06 -04:00
Rykka
d21151062f VOREStation Edit - Remove Spices canceling each other out 2020-08-17 08:25:37 -04:00
Rykka
38dcada5d8 Forgot the M.species. 2020-08-17 08:14:58 -04:00
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