cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 03:33:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
57,310 Commits 5 Branches 0 Tags
c85bf8104cde3e6578045e49d15c36b3533f540a
Commit Graph

2151 Commits

Author SHA1 Message Date
izac112
50834e4a7b Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-08-02 23:52:01 +02:00
izac112
8b15e576d7 Updates plant-b-gone recipe 2020-08-01 18:59:19 +02:00
Novacat
04d19c7cbe Merge pull request #8536 from VOREStation/upstream-merge-7344 
[MIRROR] Aurora Cooking Port
 2020-07-31 01:34:42 -04:00
Rykka
e8ebaee3dd Fix incoming mirror PR 2020-07-31 01:14:09 -04:00
Atermonera
65cfe5f6e3 Implements Status Indicators 2020-07-30 15:30:44 -04:00
Atermonera
31f04a4975 Aurora Cooking Port 2020-07-30 15:13:46 -04:00
izac112
c6075d1216 Voreupdate (small) 2020-07-30 00:17:26 +02:00
DESKTOP-4BUBN9N\Mike
4f2f60e4bc vr file makes more sense also added comment separator 2020-07-29 22:03:05 +01:00
DESKTOP-4BUBN9N\Mike
438c1e600b adds cool and good new drink recipe 2020-07-29 21:33:08 +01:00
Novacat
ca022164bb Merge pull request #8520 from TeleTubby2/MlemWax 
Makes sterilizine actually useful.
 2020-07-29 15:09:07 -04:00
Teletubby2
3a367e20fb More reasonable value. 
200 steps to see dirt again is a bit excessive.
 2020-07-29 15:07:00 -03:00
izac112
38288b15c6 Voreupdate (small) 2020-07-27 06:34:28 +02:00
Rykka
15da4a522f Rename Alcoholic Version of Love Potion to The Love Maker 
Should prevent the alcoholic version of Love Potion appearing fucking everywhere.
 2020-07-26 20:29:10 -04:00
izac112
3236896631 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-07-26 15:12:19 +02:00
Rykka
f18c8bfa0a Fix batter and all subtypes of it being unmake-able. 
Add water or beer BEFORE adding egg + flour together to avoid messing it up.
 2020-07-26 00:17:27 -04:00
izac112
93083fc58b Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-07-26 04:53:18 +02:00
Teletubby2
63b9a13124 Makes sterilizine actually do something worthwhile. 
Hnnnnnnng. if floor code wasn't ass I'd give this it's own overlay, but it's fine. probably. the reason I'm not throwing this at Polaris is because I can't be assed forking them with my junky, canadian internet.
 2020-07-25 21:42:49 -03:00
izac112
601a155b30 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-07-25 15:22:42 +02:00
ShadowLarkens
2579579fd1 TGUI'ified Medical Everything 
This converts basically every UI used in the Medical department to use
TGUI instead. Fancy!

ParadiseSS13/Paradise#13738
 2020-07-25 00:44:51 -07:00
Rykka
2b8b58433c Aurora Cooking Recipe Fixes 
Includes runtime fixes to recipe dump - now if a reagent is invalid, it will skip that item and runtime it so you can identify why.

Re-adds Peanut Oil and hotspot math for oil spills.
 2020-07-23 22:13:43 -04:00
Rykka
886ab72289 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 21:34:13 -04:00
Rykka
3974d7e87f Last Push - Everything is working, just needs testing! 2020-07-16 19:52:20 -04:00
Rykka
9f935ff59d Second Half of Aurora Cooking Initial Port - All files added 
Now onto the bugfixing nightmares!
 2020-07-16 00:37:22 -04:00
izac112
1456af50f7 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-07-14 00:21:02 +02:00
Rykka
0ae99a1407 Fix Slow Comfortable Screw Against the Wall 
The drink was set to strength = 0 resulting in a multiply by 0 and infinite alcoholism. You'd literally commit alcohol coma and instant liver death on drinking this.
 2020-07-12 12:11:42 -04: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
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