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
57,620 Commits 5 Branches 0 Tags
c27b2d2234f008b249f200df28e6bb45a8d1994d
Commit Graph

2160 Commits

Author SHA1 Message Date
Rykka
c27b2d2234 Huge Bundle of Fixes, Update Cooking to current Aurora 
Cooking times are now no longer 10-15 minutes per item, the LARGEST items will take around ~4-5 minutes, 6 at the maximum in the case of the superbigbite (one of the most filling food items in the game).
Cooking oil tanks added
Appliances are now constructible instead of being eldritch black magic
Recipes are now reorganized to either fryer/oven/grill based on where they're made (Although recipes_microwave still needs a LOT more sorting)
Critical time bug with cooking fixed, AND you can now upgrade your appliances for even higher efficiencies!
 2020-07-22 22:14:04 -04:00
Razgriz
575b1f4f33 Merge branch 'master' into shep-dev-aurora-cooking-port 2020-07-22 18:51:09 -07:00
Razgriz
1dd26b35c8 Remove phorochem line 2020-07-22 18:23:52 -07:00
Rykka
8103e0c02c Commit 3 2020-07-19 16:28:59 -04:00
Rykka
ed573739ae Commit 2 2020-07-19 16:27:36 -04:00
Rykka
5ce2caba73 Port fix of Slow Comfortable Screw Against the Wall 
The drink was set to strength = 0 resulting in a divide by 0 and infinite alcoholism. You'd literally commit alcohol coma and instant liver death on drinking this, and it'd CONTINUE because it'd persist in your blud.
 2020-07-19 15:36:53 -04:00
Razgriz
02421b075e Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into July2020UpstreamPull 2020-07-12 16:14:45 -07:00
izac112
22880f526d Voreupdate 2020-07-02 15:39:00 +02:00
SweetBlueSylveon
6cf4275e52 Quickfix 
Fixes bulldox, puts a cluwne on the guttersite properly, and fixes a spelling error.
 2020-06-17 21:49:05 -07:00
izac112
4864ad384d Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-06-17 04:30:06 +02:00
Atermonera
678f441458 Merge pull request #7285 from BlackMajor/patch-1 
Fixes a crash exploit.
 2020-06-16 03:31:56 -04:00
SplinterGP
c8b4b944ec adds drinks from yw 2020-06-12 20:05:09 -03:00
SplinterGP
c99ca9a04b puts strawberry love potion back 2020-06-12 17:11:00 -03:00
SplinterGP
5736094ff5 quick fix for bulldog drink 2020-06-12 11:39:38 -03:00
SweetBlueSylveon
70ae37f28c Bulldog Fix 
Previous recipe of the bulldog conflicted with white russian recipe. New one should not.
 2020-06-10 19:09:34 -07:00
izac112
7ad2832f14 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-06-08 21:49:14 +02:00
Aronai Sieyes
a5a56fe6db Merge pull request #8200 from VOREStation/upstream-merge-7261 
[MIRROR] Another Lesser Rotation
 2020-06-05 15:52:40 -04:00
Atermonera
e13927d412 Merge pull request #7261 from Cerebulon/rotationpart2 
Another Lesser Rotation
 2020-06-04 22:25:21 -04:00
Arokha Sieyes
ad119f676d Species Vars Extension 2020-06-04 21:02:56 -04:00
izac112
79abbcbc2f Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-06-03 18:30:13 +02:00
SweetBlueSylveon
6a2788f204 Update Chemistry-Recipes_vr.dm 2020-05-31 16:20:46 -07:00
SweetBlueSylveon
21198ba8df Update Chemistry-Recipes_vr.dm 2020-05-31 16:18:09 -07:00
SweetBlueSylveon
c766de0a92 Drink update Patch 
Fixes 4 recipes
Fixes missing metaglass icon bug.
 2020-05-31 16:14:36 -07:00
SweetBlueSylveon
2c3c8e8450 Patch 2 
Fixed indentations.
Removed "Icon_state" and "center_of_mass" where stated a second time.
 2020-05-30 15:57:03 -07:00
SweetBlueSylveon
003dc4205d Patch 1 
Some files didn't transfer over for some reason. This fixes that.
 2020-05-30 15:04:31 -07:00
izac112
e807b80281 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-05-27 20:10:55 +02:00
Aronai Sieyes
aede2b3dcd Merge upstream PR 2020-05-26 09:58:33 -04:00
Atermonera
f0f70a2b48 The Great Rotation (And water cooler fix) 2020-05-25 20:05:18 -04:00
lm40
de8ed367e6 removes stacking eye_blurry 2020-05-25 18:51:04 -04:00
izac112
e684df5236 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-21 21:17:58 +02:00
Razgriz
3dabdca3f3 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into May2020UpstreamPull2-2 2020-05-21 03:20:13 -07:00
Aronai Sieyes
09074eaabb Alter playsound paradigm 2020-05-18 23:42:15 -04:00
Repede
3f4f33bbd8 Merge branch 'release' of https://github.com/VOREStation/VOREStation into morevoreupdates 
# Conflicts:
#	code/modules/mob/living/carbon/human/emote_vr.dm
 2020-05-18 20:30:52 -04:00
Aronai Sieyes
3f4fd59bd0 VS: Fix weird leather thing 2020-05-18 10:28:27 -04:00
izac112
c14d144d45 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-18 16:05:36 +02:00
Arokha Sieyes
e91418fa6d Add protean shakes 2020-05-17 00:05:01 -04:00
izac112
bba0a05f5f Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-13 10:21:49 +02:00
Razgriz
d4366494aa [EARLY PORT] Fix an exploit 
Early port of https://github.com/VOREStation/VOREStation/pull/7809
 2020-05-12 14:36:54 -07:00
Aronai Sieyes
31d69d016d Fix an exploit 2020-05-12 14:21:10 -04:00
izac112
2b3fc9a740 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-11 18:20:43 +02:00
Razgriz
81ad690b89 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into May2020UpstreamPull 2020-05-06 22:36:01 -07:00
Atermonera
9c32a0e2b3 Updates machines to use default_apply_parts() 2020-05-07 00:40:34 -04:00
izac112
e28994b7be Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 
All conflicts resolved

Signed-off-by: izac112 <izac10@live.com>
 2020-05-06 21:53:03 +02:00
Aronai Sieyes
b3c1cfd29d Merge pull request #7516 from VOREStation/upstream-merge-7045 
[MIRROR] Removes limits on eating, centralizes nutrition changing.
 2020-04-29 19:23:55 -04:00
Novacat
c70af70266 Merge pull request #7463 from Novacat/nova-ert 
Overhauls First Aid Kits
 2020-04-29 18:44:43 -04:00
Aronai Sieyes
893130bdff Merge nutrition refactor for vorestation 2020-04-29 18:34:22 -04:00
Atermonera
f1cabd6742 Removes limits on eating, centralizes nutrition changing. 2020-04-29 17:15:15 -04:00
Aronai Sieyes
6ebd249748 Rewrite examine() to pass a list around 2020-04-29 16:42:50 -04:00
Unknown
1048a969d4 Admin discussion changes 2020-04-29 15:23:01 -04:00
Unknown
31fbcefac9 Additional tweaks 2020-04-27 00:52:08 -04:00