cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-05-18 12:50:29 +01:00
Code Issues Packages Projects Releases Wiki Activity
72,974 Commits 8 Branches 26 Tags
e6f679d147c75a405b080aa41e5b64158366b114
Commit Graph

2562 Commits

Author SHA1 Message Date
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
Killian a8e0d4bd85 Update syringes.dm 
another one slipped through the cracks
 2022-03-23 04:57:18 +00:00
Killian 421f7f1d53 sleep-to-spawn fix 
definitely didn't forget to remove a quick debug-test change
 2022-03-23 04:50:35 +00:00
Killian a7bb0213dc sleep-to-spawn 2022-03-23 04:48:43 +00:00
Novacat 4dbc7fe6bf Merge branch 'master' into upstream-merge-8298 2022-03-22 08:53:45 -04: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
Novacat dda7396cfe Merge branch 'master' into upstream-merge-8298 2022-03-04 09:57:28 -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