Cadyn
953b47764c
Cadyn's traits v2
2020-11-11 12:34:31 -08:00
Razgriz
35323d908f
Merge branch 'master' into KotetsuRedwood-CinnamonStuff
2020-11-05 16:09:29 -07:00
Razgriz
54755b9e2b
Port Feeder from Old Chomp
...
FEEEEEEED.
2020-11-04 01:31:11 -07:00
Razgriz
23defa0ac2
Merge pull request #747 from Darlantanis/PitcherPlants
...
Pitcher plants
2020-10-23 19:52:13 -07:00
Nadyr
d708107893
Merge pull request #740 from cadyn/quickarelifix
...
Quick fix for med tweaks typo or some BS
2020-10-22 10:24:16 -04:00
Nadyr
34772675a1
Merge pull request #721 from CHOMPStationBot/upstream-merge-9224
...
[MIRROR] Drink addons and sprites
2020-10-22 10:09:11 -04:00
Nadyr
b2c35bf2b5
Merge pull request #712 from CHOMPStationBot/upstream-merge-9087
...
[MIRROR] Added QOL Firefoam recipie
2020-10-22 09:03:00 -04:00
Darlantan
9ffbd1138f
Pitcher plants
...
Adds the pitcher plant mob, obtainable from hydroponics which produces a reagent which doubles the speed of plant growth. Makes pitchers spawn from vines. Includes all the extra tweaks needed to make this stuff work.
2020-10-22 08:08:19 -04:00
cadyn
0f6a462fa1
Update Chemistry-Recipes.dm
2020-10-20 12:12:38 -07:00
cadyn
04b2e3e44c
Fix this bullshit
2020-10-20 12:11:34 -07:00
Verkister
d8ddcb3026
Merge pull request #9224 from rboys2/clara-dev-more-drinks
...
Drink addons and sprites
2020-10-19 10:39:29 +00:00
Verkister
cee8e5af67
Merge pull request #9087 from VictorZisthus/firefoamqol
...
Added QOL Firefoam recipie
2020-10-19 10:38:21 +00:00
Cadyn
92c7b82b05
Areli's med tweaks v2
2020-10-14 08:16:33 -07:00
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
