cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-01-30 02:44:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
61,898 Commits 8 Branches 26 Tags
5d9f0462c19c2b7fb53bab24ef4d54b87f455ba6
Commit Graph

2200 Commits

Author SHA1 Message Date
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
The0bserver
add8836b58 made a smidgen oops, earthsblood exists now too 2022-01-23 22:28:40 -05:00
Casey
89d5b8ec9c Merge pull request #11944 from Heroman3003/nifnerf 
Makes NIFs not get automatically lost (hopefully)
 2022-01-08 12:39:30 -05:00
Heroman
9106a08f1a Makes NIF save on every durability change 2021-12-26 05:57:32 +10:00
Heroman
0982194642 Makes Universal Enzyme inhibit choccy milk reaction 2021-12-09 14:32:44 +10:00
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
Atermonera
2ffc99cc95 Refactors reagent pump code 2021-10-31 16:09:19 -04: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
Aronai Sieyes
9744067634 Fix merge 2021-10-27 13:51:21 -04:00
Aronai Sieyes
5ebd0a4185 Merge branch 'master' into upstream-merge-7914 2021-10-27 13:45:09 -04: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