klaasjared
2391957b4e
Base Commit
2021-11-23 18:00:23 -05:00
Casey
d10dfa773f
Merge pull request #11895 from Heroman3003/choccy
...
Makes Chocolate Bar recipies require 5 Enzyme catalyst
2021-11-22 23:36:01 -05:00
Heroman
e8a1248016
Makes Chocolate Bar recipies require 5 Enzyme catalyst
2021-11-22 06:59:29 +10:00
Heroman
38f81c636a
Makes Bitters inhibit Martini Classic reaction
2021-11-21 15:33:27 +10:00
Heroman
ca98c642c7
Adds cooking oil, replaces usages of corn oil
2021-11-09 05:50:16 +10:00
Aronai Sieyes
a9ef29776c
Merge pull request #11681 from VOREStation/upstream-merge-8326
...
[MIRROR] You can't feed drinks to borgs
2021-10-27 21:24:45 -04:00
atermonera
bdf63a9d4b
Adds can_feed proc
2021-10-27 20:58:13 -04:00
Schnayy
c08df74d82
fixes some drinks
2021-10-27 20:44:43 -04:00
Hatterhat
2897b47a11
Merge branch 'master' of https://github.com/VOREStation/VOREStation into brrrrped
2021-10-27 16:43:45 -05:00
Casey
72a0e86484
Merge pull request #11705 from GhostActual/brainfood
...
Brainfood
2021-10-27 12:05:14 -04:00
klaasjared
3ebc4c1803
Base Commit
2021-10-22 23:21:29 -04:00
Aronai Sieyes
2ae7e1bf05
fixmerge-prerebase
2021-10-22 14:47:28 -04:00
Schnayy
02d0e04ed4
Stimulant allergen for Tajaran
2021-10-22 14:47:00 -04:00
Aronai Sieyes
7ef4a5b686
Merge pull request #11541 from VOREStation/upstream-merge-8249
...
[MIRROR] A Hint Of Lime
2021-10-22 14:11:51 -04:00
Hatterhat
a98dda289f
oh fuck i don't know
2021-10-09 01:38:50 -05:00
Casey
dec01f9010
Merge pull request #11582 from PastelPrinceDan/autoinjectors
...
Adds large autoinjectors to autolathes
2021-09-23 23:55:04 -04:00
Casey
bce22f0f78
Merge pull request #11558 from VOREStation/upstream-merge-8274
...
[MIRROR] Gives the baristas sugar in their dispenser
2021-09-23 23:44:38 -04:00
PastelPrinceDan
8e53affbe4
woo yeah hypos
2021-09-10 23:16:57 +01:00
MistakeNot4892
5b93765401
Merge pull request #8274 from lbnesquik/Kot-polarsi-barista-sugar
...
Gives the baristas sugar in their dispenser
2021-09-03 01:34:46 -04:00
MistakeNot4892
3a70b6b468
Merge pull request #8249 from Cerebulon/cubalibre
...
A Hint Of Lime
2021-08-31 20:26:15 -04:00
klaasjared
04d1cda468
Base Commit
2021-08-30 18:03:33 -04:00
Aronai Sieyes
e5c108269d
Merge pull request #11454 from VOREStation/Arokha/stacks
...
Make stack amount var private
2021-08-26 11:38:33 -04:00
Schnayy
5d3f6cea02
Merge pull request #8223 from MistakeNot4892/fixes
...
Updates wine reagent id to redwine.
2021-08-22 20:16:38 -04:00
Aronai Sieyes
e52031d6aa
Make stack amount var private
2021-08-19 21:06:46 -04:00
Sym
ed7f4b9e75
Fixes corrosive acid, makes most important things unacidable
...
Makes pretty much anything important to the crew unacidable, fixes how acid interacts with floors.
2021-08-14 10:49:44 -04:00
Ghost Actual
257f18b7ed
Virology Revamp ( #11384 )
...
* Base Commit
* The Manual
* Small Fix
Overlay issue discovered while testing
* Small Fix
* Small Fix
Forgot the Virgo effects in the book
2021-08-13 11:37:41 -04:00
klaasjared
201a752543
Base Commit
2021-08-06 14:45:14 -04:00
Aronai Sieyes
bc129a1124
Merge pull request #11338 from GhostActual/new-tanks
...
New Floor Tanks
2021-08-06 11:37:46 -04:00
David Winters
963b722b12
why did this add a newline?
2021-08-05 14:18:38 -04:00
David Winters
75cdb121e3
dependencies
2021-08-05 14:13:53 -04:00
klaasjared
6a64aa6c5b
Small Fix
2021-08-02 19:01:46 -04:00
klaasjared
2c92a2a4ac
Base Commit
2021-08-02 18:53:36 -04:00
Ghost Actual
9ee28de20e
7/23/2021 Drink Revamp ( #11218 )
...
* Base Commit
* Small Fix
* Moves a file
* Small Fix
* Required Fix
* Fix?
* Maybe?
* Delete undies_wardrobe.dmi
* whoops
* Create undies_wardrobe.dmi
2021-07-27 18:05:39 -04:00
Ghost Actual
c8be420fbe
7/22/2021 Food Revamp ( #11210 )
...
* Base Commit
* Forgot the New Chips
* Forgot Chicken Fillet
* Base Commit
* Forgot the New Chips
* Forgot Chicken Fillet
* Conflict Fix
* Oopsie
* Fixes known issues
* Uploads Files for Remote Work
* Small Fix
* Final Commit (hopefully)
* Small Fix
2021-07-26 12:51:00 -04:00
Atermonera
6c0484eae9
Merge pull request #8180 from GhostActual/Chemsprayer
...
Chemsprayer Update
2021-07-24 19:42:06 -04:00
Aronai Sieyes
669d23322c
Change various things to subtypesof()
2021-07-20 12:54:59 -04:00
Aronai Sieyes
34982728cb
Add 'as anything' to various for loops
2021-07-20 12:39:59 -04:00
Aronai Sieyes
2d3139da0d
Supermatter vial
2021-07-19 17:49:52 -04:00
Aronai Sieyes
4428e45814
Allow grinding supermatter
2021-07-19 13:46:12 -04:00
Aronai Sieyes
1772da3acd
Fixes #11102
2021-07-18 12:54:18 -04:00
MarinaGryphon
f5db6b47e8
Catches the rest, unfortunately including some comments. Oh well!
2021-07-16 15:58:57 -05:00
MarinaGryphon
577b986ba6
Convert some bools to TRUE/FALSE instead of 1/0. ( #11100 )
...
Co-authored-by: Aronai Sieyes <arokha@arokha.com >
2021-07-16 13:43:25 -04:00
MarinaGryphon
d0d8e42edc
unify crash_with and stack_trace
2021-07-13 15:46:52 -05:00
Heroman
439a1fe8b1
Fixes blood being not injectable in any container of /food subtype
2021-07-08 16:36:19 +10:00
Aronai Sieyes
846b0bfd9c
Missing an indent here
2021-07-08 00:42:25 -04:00
Aronai Sieyes
8bcd31c91e
Merge branch 'master' into Arokha/matdefs
2021-07-07 14:29:30 -04:00
MarinaGryphon
e41c2ecfd7
first pass (emotification, some \the -> \The)
2021-07-05 09:42:48 -05:00
Aronai Sieyes
b71c7e7271
Use material defines more
2021-07-03 18:18:05 -04:00
Aronai Sieyes
be4caefccc
Merge pull request #10802 from VOREStation/Icons/food
...
Port several foods and food sprites
2021-07-03 16:30:55 -04:00
Aronai Sieyes
3f77fd1376
Swap chemmaster, port beaker sprites
2021-07-03 16:22:02 -04:00
