cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-28 18:23:10 +00:00
Code Issues Packages Projects Releases Wiki Activity
51,946 Commits 8 Branches 0 Tags
fab4ecff1d56bc34b6a71ba767fa943ebbc8f8ab
Commit Graph

304 Commits

Author SHA1 Message Date
Razgriz
ca8e9dd2d2 Merge pull request #157 from Rykka-Stormheart/shep-dev-round-end-stats 
Port over Roundstats System
 2020-01-17 00:14:21 -07:00
Rykka
4a78b14451 Port over Roundstats System 2020-01-15 16:42:41 -07:00
Ketrai
b3de238a35 fex 2020-01-15 23:09:48 +01:00
Razgriz
de24521619 First merge from upstream 2020-01-13 17:23:01 -07:00
Hawk_v3
20596d9787 Merge remote-tracking branch 'upstream/master' 2020-01-13 00:01:47 +00:00
Ketrai
7d7ce8b716 Moves files to a ch file 2020-01-11 20:36:53 +01:00
Ketrai
f16cccc582 Attempts to fix indentation errors 2020-01-11 17:47:11 +01:00
Ketrai
e1ade7153b Refactors cake 2020-01-11 17:36:57 +01:00
Razgriz
aa71656f97 Standards conformation 2020-01-11 03:50:10 -07:00
Razgriz
9cb8d1eaab Standards conformation 2020-01-11 03:49:05 -07:00
Sharkmare
f568be89d9 The cake, Serg event. (#120) 
Adds items for an event, Made by Shadowfire117 and Ketrai
 2020-01-11 00:20:57 +01:00
Ketrai
28eb142141 Adds a recipe for food cubes 2020-01-08 19:45:49 +01:00
Ketrai
c8531c827f Fixed conflicts. Adds water bottle to the machine coz logic. 2020-01-07 23:07:50 +01:00
Ketrai
9112a9a2b6 Food cubes 
woop


removes a line of unneeded code
 2020-01-07 22:51:12 +01:00
Kazzc
9d8084f4eb Ported in some food items from our old code. 
created three files: food_cm, recipes_microwave_cm & snacks_cm
Added food sprites for: tocino, pandenata, garlicbread, bigos, tamales & sauerkraut.
programmed food items for: tocino, pandenata, garlicbread, bigos, tamales & sauerkraut.
 2020-01-02 06:32:38 -06:00
Razgriz
da08830c0b Infinite feeding 2020-01-01 23:16:29 -07:00
Hawk_v3
70711c03e1 Merge remote-tracking branch 'upstream/master' 2019-12-29 20:34:58 +00:00
Novacat
f2fb0d9f6a Merge pull request #6360 from Ketrai/sharksbranch 
Adds a new fish, measelsharks!
 2019-12-29 15:11:46 -05:00
Hawk_v3
a48b6f7cb2 Merge remote-tracking branch 'upstream/master' 2019-12-29 19:01:58 +00:00
Ketrai
15c1c45b34 Makes it so you can use sharkmeat for fish-dishes 2019-12-23 17:57:13 +01:00
Cerebulon
183b1d99b1 Coffee Shop Revamp 2019-12-22 22:54:01 -05:00
Ketrai
0e65a0b8a6 Adds sharks 2019-12-22 17:32:49 +01:00
Hawk_v3
5b13642c12 Merge remote-tracking branch 'upstream/master' 2019-12-08 18:15:35 +00:00
TheFurryFeline
9c830286ef Food Trash Fixy 
Helllloooo? Roast beef's on a plate, not a hecking tray! Fixing the resulting trash.

Changelog notes: 
- Changes Roast Beef trash to a plate, not waffles.
 2019-11-30 15:23:55 -05:00
Hawk_v3
f976948ce3 Merge remote-tracking branch 'upstream/master' 2019-11-07 19:54:10 +00:00
Atermonera
a45472b446 Update Chat System to use to_chat(src, "") instead of src << "" 2019-11-05 19:22:38 -05:00
Hawk_v3
3c8cd11eac Reupdated Station 1 map 2019-10-24 21:57:58 +01:00
Mechoid
169d8acedd Medical Expansion 2019-10-19 23:28:38 -04:00
Unknown
9fbb5c247e Glucose Container 2019-10-13 16:14:59 -04:00
Hawk_v3
b22f2284fe Merge remote-tracking branch 'upstream/master' 2019-09-23 20:55:18 +01:00
Heroman
d82c986d0a Makes sushi require fish meat 2019-09-20 05:59:16 +10:00
Hawk_v3
6d4ec50e08 Merge remote-tracking branch 'upstream/master' 2019-09-01 19:02:01 +01:00
Unknown
853f3964a3 Pathing errors 2019-08-31 00:57:37 -04:00
Unknown
9467621800 Fixes some errors 2019-08-31 00:35:19 -04:00
Unknown
0d73c8ad76 Early Polaris Ports 
Ports Polaris PRs 6424, 6426, 6428, 6430, 6431, 6432, 6433, and 6434

No vorestation edit markings because they are polariscode ports.
 2019-08-30 23:55:58 -04:00
Hawk_v3
0f3c802427 Merge remote-tracking branch 'upstream/master' 2019-08-22 21:32:01 +01:00
Mechoid
ae48659a68 Exploration Expansion 1: Or, How I Learned To Love The Tree 2019-08-21 17:23:07 -04:00
Heroman
4dc79f669e Ports early fixes 2019-08-19 10:00:46 +10:00
Hawk_v3
0c85b3a4dd Merge remote-tracking branch 'upstream/master' 2019-08-09 21:35:04 +01:00
Atermonera
0469a309cc Adds NOCONDUCT to Some Items 2019-08-08 16:07:50 -04:00
Unknown
fb61850896 Mining/Explorer Tweaks 
- ORM Vendor no longer provides phase pistols
- Steel Machete renamed to Plasteel Machete
- Industrial Hardsuit modules renamed to simply Hardsuit modules
- Adds some of the new mining stuff to the explorer vendor
- Fixes missing survivalfood flag from liquidprotein rations
 2019-08-01 16:25:58 -04:00
Anewbe
ffeb6ba7eb Merge pull request #6349 from MagmaRam/b52fix 
Fixes the metamorphic glass sprite for the B-52
 2019-07-28 14:00:16 -04:00
Hawk_v3
2a73ca4304 Merge remote-tracking branch 'upstream/master' 2019-07-23 22:51:24 +01:00
Atermonera
a78cdc85cc Merge pull request #6308 from Heroman3003/kitchenfixes 
Fixes some kitchen screwery
 2019-07-22 00:43:05 -04:00
Hawk_v3
8654b6bdf4 Merge remote-tracking branch 'upstream/master' 2019-07-19 22:05:31 +01:00
Novacat
b039eacdd7 Merge pull request #5429 from Novacat/nova-basicfixes 
Ease of Eating Changes
 2019-07-17 17:35:58 -04:00
Atermonera
d987e1e7fd Merge pull request #6301 from Cerebulon/saltoid 
Salt is Salt
 2019-07-16 00:49:52 -04:00
Hawk_v3
4668b23fea Merge remote-tracking branch 'upstream/master' 2019-07-10 01:50:50 +01:00
Atermonera
1472642b88 Merge pull request #6262 from Mechoid/CivilianExpansion1 
Civilian Expansion 1: The Plantening
 2019-07-07 17:29:32 -04:00
Unknown
45577f8c34 Microwave was too fast, fixed. 2019-07-04 21:48:36 -04:00