cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-03 22:13:50 +00:00
Code Issues Packages Projects Releases Wiki Activity
63,334 Commits 7 Branches 0 Tags
cb281eb17c99da4b9dcd5edf95b70f4f72dd791d
Commit Graph

2317 Commits

Author SHA1 Message Date
Nadyr
cb281eb17c Delete Chemistry-Holder_ch.dm 2021-05-09 00:56:58 -04:00
Nadyr
8385a60101 Create holder_ch 2021-05-09 00:56:31 -04:00
Nadyr
a1814165ed Update _reagents.dm 2021-05-09 00:45:14 -04:00
Nadyr
d6480ef4c8 Update instant_vr.dm 2021-05-09 00:40:26 -04:00
Nadyr
624be998a3 Update reagent_tank.dm 2021-05-09 00:31:46 -04:00
Nadyr
2870859168 Update holder.dm 2021-05-09 00:25:27 -04:00
Nadyr
79561e789c Delete Chemistry-Recipes.dm 2021-05-09 00:21:49 -04:00
Chompstation Bot
ca996648dd [MIRROR] Oops, I refactored Chemistry! 2021-05-08 23:59:34 -04:00
Nadyr
bef7b25a07 Merge pull request #1891 from CHOMPStationBot/upstream-merge-10234 
[MIRROR] Bringing Back the Bepsi
 2021-05-08 08:32:28 -04:00
Chompstation Bot
dcdd455b84 Bringing Back the Bepsi 2021-05-05 18:46:34 +00:00
ZVB334
64e3ff5fba Moved to _ch file 2021-04-30 07:37:24 -05:00
ZVB334
4f7d894229 Adds Liquid Copper/Aluminium to Sheets Reactions 2021-04-26 20:35:27 -05:00
Razgriz
43df25a5e5 Removed some duplicates 
Removed some teas as they were already in https://github.com/CHOMPStation2/CHOMPStation2/blob/master/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
 2021-04-12 02:32:50 -07:00
Nadyr
663b6cfb82 Merge pull request #1787 from CHOMPStationBot/upstream-merge-10116 
[MIRROR] [MIRROR] Boda Tweaks and Russian Drinks V2
 2021-04-11 06:31:47 -04:00
Nadyr
c160bce0eb Update Chemistry-Reagents-Vore_vr.dm 2021-04-10 23:03:29 -04:00
Nadyr
abb0cf342d Merge branch 'master' into upstream-merge-10092 2021-04-10 22:50:33 -04:00
Novacat
d91ec5f6c1 Merge pull request #10116 from VOREStation/upstream-merge-8023 
[MIRROR] Boda Tweaks and Russian Drinks V2
 2021-04-10 14:32:12 +00:00
Nadyr
5283d9f78c Merge pull request #1769 from CHOMPStationBot/upstream-merge-10103 
[MIRROR] Remove unnecessary 'signatures'
 2021-04-09 02:53:14 -04:00
Novacat
939e4fdecf Merge pull request #10102 from Novacat/nova-ert 
Fixes two bugs
 2021-04-08 21:06:56 +00:00
Chompstation Bot
588179bd66 Remove unnecessary 'signatures' 2021-04-08 16:48:30 +00:00
Chompstation Bot
64990312af Update resize pref and some resizing code 2021-04-07 20:08:32 +00:00
Darlantan
39a376ef2c Revert peridaxon change 2021-04-03 04:35:16 -04:00
Chompstation Bot
0001021815 [MIRROR] Tanning Tweaks 2021-03-30 20:55:26 +00:00
Nadyr
c8321a53df Merge pull request #1617 from CHOMPStationBot/upstream-merge-9960 
[MIRROR] [MIRROR] Added Doctress' Jager drink.
 2021-03-21 04:31:54 -04:00
Nadyr
eca4718bdc Update Chemistry-Reagents-Vore_vr.dm 2021-03-21 04:13:47 -04:00
Nadyr
e3622cd0a9 Update Chemistry-Reagents-Vore_vr.dm 2021-03-21 04:12:26 -04:00
Novacat
f2fc4c8be7 Merge pull request #9960 from VOREStation/upstream-merge-7974 
[MIRROR] Added Doctress' Jager drink.
 2021-03-18 14:40:00 +00:00
Chompstation Bot
59fdeb2e8e [BUG] Size update fixes 2021-03-12 13:28:52 +00:00
Nadyr
01033e9e58 Merge pull request #1590 from CHOMPStationBot/upstream-merge-9908 
[MIRROR] add c a l c i u m
 2021-03-12 01:53:49 -05:00
Nadyr
e4b0879ab4 Update Chemistry-Holder.dm 2021-03-12 00:35:16 -05:00
Nadyr
110bb457e9 Update Chemistry-Holder.dm 2021-03-11 23:41:37 -05:00
Novacat
e8415fe5da Merge pull request #9908 from Little-119/calcium 
add c a l c i u m
 2021-03-12 01:52:58 +00:00
Chompstation Bot
d79e318320 [MIRROR] Allergens v2 2021-03-10 19:07:12 +00:00
Novacat
efd4408d5b Merge pull request #9873 from VOREStation/upstream-merge-7940 
[MIRROR] Diet/Allergy Rework & Refactor Pt2
 2021-03-07 22:01:53 +00:00
Novacat
264c00589a Merge pull request #9861 from Screemonster/barrelsoffun 
adds cool and fun new interactable environmental object
 2021-03-06 23:22:46 +00:00
Nadyr
49d8ede34f Merge branch 'master' into upstream-merge-9751 2021-03-06 02:31:39 -05:00
Nadyr
f583753342 Update Chemistry-Reagents-Food-Drinks.dm 2021-03-06 01:23:32 -05:00
Nadyr
06749f842d Merge branch 'master' into upstream-merge-8808 2021-03-06 00:55:02 -05:00
Nadyr
396f0ea1e9 Merge branch 'master' into upstream-merge-9751 2021-03-06 00:05:57 -05:00
Nadyr
70aead609e Update Chemistry-Reagents-Food-Drinks.dm 2021-02-28 08:02:50 -05:00
Nadyr
87020fc5fa Merge pull request #1375 from CHOMPStationBot/upstream-merge-9754 
[MIRROR] Buffs Adranol Healing
 2021-02-28 07:28:34 -05:00
Nadyr
3239ff7623 Update Chemistry-Reagents-Medicine_vr.dm 2021-02-28 07:14:43 -05:00
Chompstation Bot
d642cbee1c [MIRROR] Diet/Allergy System Rework 2021-02-28 00:36:58 +00:00
Chompstation Bot
cfa8b5d5c4 FBP Munchies 2021-02-27 20:13:56 +00:00
Chompstation Bot
ad57e1ad13 [MIRROR] Sideports a couple of init unit tests from Neb. 2021-02-27 18:45:36 +00:00
Chompstation Bot
3d652f9791 Buffs Adranol Healing 2021-02-19 23:09:22 +00:00
Novacat
87ade37649 Merge pull request #9752 from VOREStation/upstream-merge-7897 
[MIRROR] Makes some juices not sugary
 2021-02-19 23:09:06 +00:00
Novacat
6b62269885 Merge pull request #9734 from MarinaGryphon/init_fixes 
Fixes init issues in _vr files.
 2021-02-16 17:59:00 +00:00
Razgriz
ebe5c88699 Merge pull request #1273 from CHOMPStationBot/upstream-merge-9543 
[MIRROR] [MIRROR] Space cleaner cleans mobs
 2021-02-13 15:52:23 -07:00
Verkister
3e2d6f6f76 Merge pull request #9543 from VOREStation/upstream-merge-7802 
[MIRROR] Space cleaner cleans mobs
 2021-02-09 18:18:03 +00:00