cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
66,269 Commits 5 Branches 0 Tags
e4d8e5263e98d6c5655d292355f17be3e986e45d
Commit Graph

608 Commits

Author SHA1 Message Date
Nadyr
c908563dec powder that makes you say yes 2021-08-25 22:28:33 -04:00
Nadyr
5c5591c16e powder that makes you say yes 2021-08-25 22:26:08 -04:00
Aronai Sieyes
72f5e790db Upstream-11421 2021-08-24 21:10:20 -07:00
Nadyr
d3e639eb83 powder that makes you say yes 2021-08-24 20:37:05 -04:00
Novacat
827f9ebbbf Merge pull request #11477 from VOREStation/upstream-merge-8223 
[MIRROR] Updates wine reagent id to redwine.
 2021-08-24 23:57:24 +00:00
Chompstation Bot
beef8e7f82 Virology Revamp 2021-08-13 15:38:46 +00:00
Aronai Sieyes
eb13ece148 Merge pull request #11356 from VOREStation/Arokha/sipp 
Allows sipping proteans/prometheans
 2021-08-07 21:33:48 +00:00
Aronai Sieyes
4b9e352590 Merge pull request #11340 from GhostActual/recipe-fix 
Fix for issue #11339
 2021-08-04 21:35:28 +00:00
Chompstation Bot
02af50470c 7/23/2021 Drink Revamp 2021-07-27 22:06:30 +00:00
Ghost Actual
50c2de86d2 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 16:51:23 +00:00
ExabyteDiscord
a7c091e001 Merge branch 'master' into upstream-merge-11192 2021-07-21 11:35:25 -07:00
Chompstation Bot
b83a5c7990 These might be bad 2021-07-21 01:38:44 +00:00
Chompstation Bot
15cafbe65b Optimize a couple things 2021-07-20 21:30:20 +00:00
Chompstation Bot
481c0e314e Convert some bools to TRUE/FALSE instead of 1/0. 2021-07-16 17:44:40 +00:00
Chompstation Bot
9acb3a208e Removes unnecessary, unused, and redundant helpers. 2021-07-14 17:57:22 +00:00
Nadyr
48c609ddca Merge pull request #2487 from CHOMPStationBot/upstream-merge-10988 
[MIRROR] Fixes #10885
 2021-07-10 01:38:31 -04:00
Nadyr
3f5ea2e9f5 Merge pull request #2471 from CHOMPStationBot/upstream-merge-10976 
[MIRROR] Fixes blood being not injectable in any container of /food subtype
 2021-07-10 01:35:52 -04:00
Nadyr
2a02b34efc Merge pull request #2480 from CHOMPStationBot/upstream-merge-10981 
[MIRROR] Fixes #10947, adds labels for alt. bottles.
 2021-07-10 01:31:23 -04:00
Nadyr
913a84eb5c Merge branch 'master' into upstream-merge-10976 2021-07-10 01:22:38 -04:00
Nadyr
e48d0aa61c Merge pull request #2463 from CHOMPStationBot/upstream-merge-10971 
[MIRROR] 4 random runtime fixes
 2021-07-10 00:00:30 -04:00
Nadyr
2cad763c26 Merge pull request #2447 from CHOMPStationBot/upstream-merge-10852 
[MIRROR] Use material defines more
 2021-07-09 23:22:03 -04:00
Aronai Sieyes
c495e183a8 Merge pull request #10988 from MarinaGryphon/issue/10885 
Fixes #10885
 2021-07-09 16:18:08 +00:00
Aronai Sieyes
5f4e486b5e Merge pull request #10981 from MarinaGryphon/issue/10947 
Fixes #10947, adds labels for alt. bottles.
 2021-07-09 16:15:19 +00:00
Chompstation Bot
e8c29d4d74 Fixes blood being not injectable in any container of /food subtype 2021-07-08 06:48:44 +00:00
Chompstation Bot
b965d1546c 4 random runtime fixes 2021-07-08 04:54:06 +00:00
Nadyr
a646fe3bd4 Merge pull request #2450 from CHOMPStationBot/upstream-merge-10944 
[MIRROR] Lazy attempt at eating micros inside food
 2021-07-07 23:56:29 -04:00
Aronai Sieyes
2e0f953d5e Merge pull request #10944 from VOREStation/Arokha/smoleat 
Lazy attempt at eating micros inside food
 2021-07-07 19:04:28 +00:00
Chompstation Bot
287a5deee3 Use material defines more 2021-07-07 19:02:05 +00:00
Aronai Sieyes
81e3ff6bc0 Merge pull request #10936 from MarinaGryphon/burg 
Fixes packaged burger sprite
 2021-07-07 19:01:49 +00:00
Aronai Sieyes
1974a32d1e Merge pull request #10918 from VOREStation/Arokha/smartdrinksfix 
Remove unneeded update_icon() override
 2021-07-05 23:58:11 +00:00
Chompstation Bot
14129d60cf Converts visible_message notice spans to look more like emotes 2021-07-05 20:30:12 +00:00
Razgriz
1a3c753f4a Merge pull request #2346 from CHOMPStationBot/upstream-merge-10802 
[MIRROR] Port several foods and food sprites
 2021-07-03 14:49:34 -07:00
Razgriz
2d4fe9edef Merge pull request #2348 from CHOMPStationBot/upstream-merge-10806 
[MIRROR] Port Eris, /tg/ vendors
 2021-07-03 14:37:20 -07:00
Razgriz
034b57077d Merge pull request #2347 from CHOMPStationBot/upstream-merge-10800 
[MIRROR] Swap chemmaster, port beaker sprites
 2021-07-03 14:36:22 -07:00
Aronai Sieyes
ecc9cf97df Merge pull request #10806 from VOREStation/Icons/vendors 
Port Eris, /tg/ vendors
 2021-07-03 20:32:22 +00:00
Aronai Sieyes
67e370b0cf Merge pull request #10800 from VOREStation/Icons/chemistry 
Swap chemmaster, port beaker sprites
 2021-07-03 20:31:14 +00:00
Aronai Sieyes
64db1a458b Merge pull request #10802 from VOREStation/Icons/food 
Port several foods and food sprites
 2021-07-03 20:31:07 +00:00
Aronai Sieyes
145b19c173 Merge pull request #10771 from Heroman3003/un-nerf-snacks 
Undoes global food nutriment nerf
 2021-07-03 20:14:43 +00:00
Nadyr
1236fda644 powder that makes you say yes 2021-07-01 19:44:44 -04:00
Chompstation Bot
b6e1989a01 The One Where I Port Modals 2021-06-30 19:29:34 +00:00
Razgriz
4ce93fa001 Merge pull request #2281 from CHOMPStationBot/upstream-merge-10743 
[MIRROR] Adds Mug with Text to loadout
 2021-06-25 00:33:56 -07:00
Novacat
35177da700 Merge pull request #10743 from Heroman3003/M-U-G 
Adds Mug with Text to loadout
 2021-06-24 07:24:20 +00:00
Chompstation Bot
fb343cec6c [MIRROR] Linter diagnostics + bans non-var relative pathing 2021-06-22 22:17:02 +00:00
Novacat
cd5eec8835 Merge pull request #10716 from VOREStation/upstream-merge-8144 
[MIRROR] Indescribable! - A Food Flavor Fixing Pass
 2021-06-21 02:40:24 +00:00
Razgriz
b287747d4e Merge branch 'master' into upstream-merge-10683 2021-06-20 17:17:44 -07:00
Razgriz
082de27539 Merge pull request #2192 from CHOMPStationBot/upstream-merge-10648 
[MIRROR] [MIRROR] Makes the chaos cake cheaper.
 2021-06-20 16:02:41 -07:00
Razgriz
d69f6bea8d Update thecake.dm 2021-06-19 21:50:43 -07:00
Nadyr
e806c02be9 Merge branch 'master' into upstream-merge-10707 2021-06-19 22:01:52 -04:00
Nadyr
a9d5ef0fbc Merge pull request #2241 from CHOMPStationBot/upstream-merge-10694 
[MIRROR] [MIRROR] Refactors utensils to use weakrefs
 2021-06-19 21:59:34 -04:00
Nadyr
3e28ef7ce2 Merge pull request #2235 from CHOMPStationBot/upstream-merge-10695 
[MIRROR] [MIRROR] Improves select_recipe.
 2021-06-19 21:49:54 -04:00