cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-01-30 10:53:24 +00:00
Code Issues Packages Projects Releases Wiki Activity
62,892 Commits 8 Branches 26 Tags
0648943790813b3845ba76710bfa86bffbe7e93f
Commit Graph

2218 Commits

Author SHA1 Message Date
liache
0648943790 Cargo-Orderable-Coffee-Dispenser 
Simply adds the coffee dispenser as an orderable item from cargo!
 2022-06-29 16:17:59 -04:00
ItsSelis
af64bcf406 More Input Conversion 2022-06-19 12:21:51 +02:00
ItsSelis
2d7b081a55 Input Conversion Part 2 2022-06-19 03:40:24 +02:00
Somememeguy
c96152408f Make Cooking Great Again [Tedium Update] 
Makes cooking less tedious.
 2022-05-09 14:22:14 -04:00
Heroman
329a6ac8d3 Adds chemistry kits 2022-05-08 09:22:55 +10:00
Casey
ea8767a53c Merge pull request #12819 from GhostActual/powder_drugs 
Pharma Fix
 2022-04-24 03:16:36 -04:00
GhostActual
09c4f357da Base Commit 2022-04-23 23:19:32 -04:00
Killian
28fb1f3151 remove workaround chem 2022-04-21 07:39:33 +01:00
lm40
f6ca92f699 Fixes bar dispenser lemon juice 2022-04-19 03:19:29 -04:00
Casey
592913160c Merge pull request #12604 from VOREStation/upstream-merge-8431 
[MIRROR] Allergen CE Conversion
 2022-04-17 18:40:34 -04:00
Casey
e5324f9aa9 Merge pull request #12768 from GhostActual/pocky_stick_fix 
Pocky Fix
 2022-04-17 17:16:50 -04:00
Casey
b042467fe4 Merge pull request #12767 from GhostActual/powder_drugs 
Big Pharma's Blessing: Snorting Mechanics
 2022-04-17 17:16:33 -04:00
GhostActual
5dcea6ff9d Base Commit 2022-04-17 13:31:31 -04:00
GhostActual
2892390cb3 Base Commit 2022-04-17 13:15:30 -04:00
GhostActual
86ce9c5f5a Base Commit 2022-04-17 12:20:03 -04:00
Killian
d897561aba allergen CE conversion fix 2022-04-10 21:12:38 +01:00
GhostActual
937e8303f3 Base Commit 2022-04-04 15:43:46 -04:00
Killian
316137137d Allergen CE Conversion 2022-04-02 21:29:06 -04:00
Casey
8182a57fea Merge pull request #12545 from BonniePandora/unfucks-engraving 
Makes engraving no-longer cause rage when trying to cut wires, amongst other things.
 2022-03-27 14:59:24 -04:00
Heroman
56849e7a71 Reworks xenobio extract rewards 2022-03-27 14:17:41 +10:00
Pandora
2d25fe7155 Update syringes.dm 2022-03-27 05:00:40 +01:00
Atermonera
a7ed6aca2b Merge pull request #8425 from Verkister/patch-85 
fixes puke coating stealing nutriment reagent's id
 2022-03-20 14:54:50 -04:00
Heroman
17208385cb Allows synths to process food in bloodstr too 2022-03-20 09:32:43 +10:00
Heroman
4e6c965074 Adjustments to synthetic food processing 2022-03-20 09:31:52 +10:00
GhostActual
b53e4fe7c9 Base Commit 2022-03-07 01:52:24 -05:00
Killian
2bc22f9226 more allergen tweaks, pt2 2022-02-28 04:53:55 +00:00
Killian
cb6ebb49a9 more allergen tweaks 2022-02-28 04:31:48 +00:00
TheObserver-sys
d7c663327b some fixes for foxes 2022-02-25 14:04:40 -05:00
TheObserver-sys
da394d5c69 pain? 2022-02-25 13:41:39 -05:00
TheObserver-sys
aef8b5f77b liquid carpet and recipes. initial. 2022-02-25 13:33:32 -05:00
Heroman3003
3c62f555c7 Merge branch 'master' into 8316-fix 2022-02-20 08:15:09 +10:00
Heroman3003
9a5708ef66 Merge branch 'master' into branch 2022-02-20 07:27:34 +10:00
Heroman
d788a61aa4 Compile error resolution 2022-02-19 19:42:32 +10:00
Heroman
0563c28c59 Merge branch 'master' into 7914-fix 2022-02-19 19:02:20 +10:00
Heroman
ae267030eb Merge branch 'master' into upstream-merge-8222 2022-02-19 18:41:29 +10:00
klaasjared
7b52c0abfe Base Commit 2022-02-18 01:04:34 -05:00
Heroman
19e522b437 Adds vendor refill cartridges to cargo 2022-02-15 07:08:16 +10:00
Heroman
438ea2ba72 Makes xenochimera able to eat raw fish 2022-02-09 15:54:10 +10:00
Casey
6e1a8935d4 Merge pull request #12173 from KillianKirilenko/kk-test 
Allergen Reaction Tuning
 2022-02-07 18:16:45 -05:00
Killian
5eac0aea1a confusion addon 2022-02-07 10:29:03 +00:00
Killian
121f36b8c8 allergen reaction tuning 2022-02-07 10:10:21 +00:00
Casey
567101288c Merge pull request #12142 from Heroman3003/foodtweak 
Minor food tweaks
 2022-02-03 01:30:33 -05:00
Heroman
4955d31ddd Minor food tweaks 2022-02-03 10:31:22 +10:00
The0bserver
0a04a97efd tweak 2 2022-01-29 04:54:21 -05:00
The0bserver
45c13a3432 experimental 2022-01-29 02:24:23 -05:00
The0bserver
85b9078fb9 feedback tweaks 2022-01-29 01:57:53 -05:00
The0bserver
2ba6263d7f Work work work. Organic Carpets (maybe!) 2022-01-28 21:12:34 -05:00
The0bserver
2a5e1f518b shuffle.... (also some more stuff that needed to be ensured) 2022-01-24 01:13:54 -05:00
The0bserver
c5bfe85ff7 tweak 2022-01-23 22:42:14 -05:00
The0bserver
d977496bca A smidgen of number tweaking. 2022-01-23 22:37:04 -05:00