cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-06 07:23:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
73,197 Commits 7 Branches 0 Tags
6d51b51abb6be4aadab9247d38b2ea517f11bb12
Commit Graph

695 Commits

Author SHA1 Message Date
Nadyr
bc18ea17fd Merge pull request #5647 from CHOMPStation2/upstream-merge-14419 
[MIRROR] Adds Food Stuffer trait
 2023-02-07 13:25:22 -05:00
Novacat
64b0693f63 Merge pull request #14441 from Heroman3003/runtime-fixes 
Some runtime fixes
 2023-02-05 03:15:24 +00:00
Casey
c5cd0a7eb9 Merge pull request #14419 from Heroman3003/send-help-brad-and-duke-are-holding-me-hostage-and-making-me-code-stuffing-features 
Adds Food Stuffer trait
 2023-02-04 05:37:53 +00:00
Heroman3003
165d947e91 Fixes autolathe, material and smartfridge issues 2022-12-28 21:48:06 +00:00
Casey
32ce0772e9 Merge pull request #14225 from Heroman3003/ali-burnout 
Adds new bar drink, Burnout
 2022-12-23 16:25:07 +00:00
Nadyr
a0e22e6d30 powder that makes you say yes 2022-12-15 21:51:20 -05:00
Novacat
1e7cbec2e3 Missing href token adds 2022-12-15 20:43:47 +00:00
Heroman3003
151e5fdb91 Merge pull request #14067 from VOREStation/upstream-merge-8817 
[MIRROR] Naming Food & Blood Cakes
 2022-12-03 21:18:26 +00:00
Casey
10e697c6fe Merge pull request #14136 from Heroman3003/altevian-thanksgiving 
Adds more altevian things
 2022-11-26 22:41:43 +00:00
Casey
0552773770 Merge pull request #13935 from VOREStation/upstream-merge-8760 
[MIRROR] Adds the requested club sandwich. [READY FOR MERGE]
 2022-10-23 18:49:46 +00:00
C.L
70d12b326b bugtest your stuff lol 
shame bell
 2022-10-04 18:30:20 -04:00
MeepleMuncher
7d0b28b96e Merge branch 'CHOMPStation2:master' into appliancefix 2022-09-24 16:23:04 +03:00
MeepleMuncher
2144b8d2e2 Fixes (hopefully) 2022-09-24 16:20:41 +03:00
MeepleMuncher
6867abfb81 Fixes (hopefully) 2022-09-24 16:19:51 +03:00
Casey
e3262b10a0 Merge pull request #13779 from Heroman3003/ascended-fix 
Fixes ascended donk pocket
 2022-09-23 00:57:39 +00:00
Nadyr
8e50c6cfd9 Merge pull request #4960 from CHOMPStation2/upstream-merge-13750 
[MIRROR] Adds more altevian content
 2022-09-18 21:13:27 -04:00
Nadyr
afbd5fa20c Merge pull request #4945 from CHOMPStation2/upstream-merge-13725 
[MIRROR] Fixes bottle throwing
 2022-09-18 20:39:02 -04:00
Casey
f2716e95ae Adds more altevian content 2022-09-18 09:39:22 +00:00
Casey
8d0e07839a Merge pull request #13725 from Heroman3003/bottlefix 
Fixes bottle throwing
 2022-09-18 09:33:05 +00:00
MeepleMuncher
7810024c01 Update grill.dm 2022-09-14 15:18:04 +03:00
MeepleMuncher
dcc780f36e allows for deconstruction of kitchen appliances 
should also hopefully allow for kitchen appliances to be upgraded
 2022-09-14 15:14:44 +03:00
Casey
6928dd3d9f Merge pull request #13719 from Runa-Dacino/appleberry-fix2 
Fixes appleberry bits disappearing
 2022-09-11 19:38:00 +00:00
Nadyr
d46d8dc33c Merge pull request #4782 from CHOMPStation2/upstream-merge-13570 
[MIRROR] Adds Altevian cuisine
 2022-08-28 19:26:06 -04:00
Nadyr
408bf4de39 Merge pull request #4767 from Holdelta/BarUpdate 
Refactoring existing CHOMPStation drinks into the modular folder, visual update to some drinks, and adding new drinks from other servers.
 2022-08-28 19:06:15 -04:00
Casey
85cf31f79c Merge pull request #13570 from Heroman3003/altevian-foods 
Adds Altevian cuisine
 2022-08-25 23:00:13 +00:00
Test Turtle
5f314473ba Refactoring existing CHOMPStation drinks and adding new ones. 2022-08-23 02:12:28 -07:00
Nadyr
8f83c4a018 Merge pull request #4707 from CHOMPStation2/upstream-merge-13490 
[MIRROR] Makes brainzsnax actually snacks
 2022-08-14 17:47:27 -04:00
Casey
660e9df072 Merge pull request #13490 from Screemonster/pickupthatcan 
Makes brainzsnax actually snacks
 2022-08-14 20:38:24 +00:00
Casey
812757bd38 Merge pull request #13470 from Runa-Dacino/Appleberry-bits-nutrient-adjustment 
Adds sugar to appleberry bits
 2022-08-14 05:38:57 +00:00
Casey
48f835f41f Fixes in-chat icons being broken in oldchat 2022-07-20 17:24:27 +00:00
Nadyr
726fb9422b Merge pull request #4523 from CHOMPStation2/upstream-merge-13284 
[MIRROR] Fixes spam of 'you finished drinking' when trying to drink from empty glass
 2022-07-11 20:58:06 -04:00
Casey
677e1fece3 Merge pull request #13284 from Heroman3003/drinkfix 
Fixes spam of 'you finished drinking' when trying to drink from empty glass
 2022-07-08 00:31:22 +00:00
Casey
f2a4447329 Merge pull request #13282 from Heroman3003/diy-food-fix 
Fixes DIY foods not getting reagents from ingridients
 2022-07-08 00:29:49 +00:00
Casey
53bf600190 Merge pull request #13196 from ItsSelis/selis-worm-fix 
(Raw) Meat does not taste like Slimy Dirt anymore
 2022-06-28 22:28:30 +00:00
Nadyr
e81e1f4faf Merge branch 'master' into upstream-merge-13112 2022-06-22 21:58:12 -04:00
Casey
928a321b5f TGUI Input Conversions 2022-06-19 03:59:14 +00:00
Novacat
47c92f2581 [MIRROR-FIX] Cooking QOL V2 2022-06-18 14:45:56 +00:00
Novacat
6d7fb6d42e Merge pull request #12966 from lm40/master 
Fixes potential divide by zero in gibber
 2022-05-13 23:50:38 +00:00
Casey
a5ed33a2e1 Merge pull request #12944 from Somememeguy/MakeCookingGreatAgain 
Make Cooking Great Again [Tedium Update, Rebalance some cooking aspects]
 2022-05-12 19:26:08 +00:00
Razgriz
c3fdc6d677 Merge pull request #4227 from CHOMPStation2/upstream-merge-12934 
[MIRROR] Chest -> Torso Targeting Fixes
 2022-05-11 10:04:45 -07:00
Novacat
2bf16244eb Merge pull request #12936 from FartMaster69420/microwave-patch 
Patching microwave recipes
 2022-05-10 14:57:20 +00:00
Novacat
24aa127d67 Chest -> Torso Targeting Fixes 2022-05-09 01:08:04 +00:00
Casey
fbd967128d Merge pull request #12888 from FartMaster69420/pai_and_bots 
The pAI, Bot, and Microwave Tweaks
 2022-05-08 09:46:55 +00:00
TheGreatKitsune
85b7fc2d58 Add Sorbitol 2022-04-23 21:26:28 -05:00
Nadyr
d45c7b7eed Merge branch 'master' into upstream-merge-12767 2022-04-17 23:33:35 -04:00
Casey
c9eb919583 Big Pharma's Blessing: Snorting Mechanics 2022-04-17 21:17:05 +00:00
Casey
abea22deec Merge pull request #12765 from GhostActual/Lettuce-Eat 
Lettuce Eat
 2022-04-17 17:55:59 +00:00
Casey
61ea8e3f3d New Donk-pockets 2022-04-06 02:12:51 +00:00
Nadyr
8ad19a97dd powder that makes you say yes 2022-03-25 18:47:44 -04:00
Casey
e71a04a991 Merge pull request #12504 from GhostActual/Robs-You-In-Public 
Robs You In Public
 2022-03-21 20:21:21 +00:00