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
Chompstation Bot
c11124cb58
[MIRROR] Absurd Amount of Food Fixes
2021-02-08 04:59:38 +00:00
Erik
0b315e6284
Single proc arg patch size chem animation removal
...
fumk
2021-01-23 04:21:01 -08:00
Novacat
e481ed54e5
Merge pull request #9474 from lukevale/master
...
Adds in Measuring cups, and nickname's to the character load selection.
2020-12-18 19:32:12 +00:00
Chompstation Bot
ae92942bde
Abductor Ship
2020-12-08 18:56:09 +00:00
Novacat
cd1ad32cb2
Merge pull request #9422 from VOREStation/upstream-merge-7762
...
[MIRROR] Plainleather & Tobacco
2020-12-08 03:38:26 +00:00
Cadyn
953b47764c
Cadyn's traits v2
2020-11-11 12:34:31 -08:00
Razgriz
35323d908f
Merge branch 'master' into KotetsuRedwood-CinnamonStuff
2020-11-05 16:09:29 -07:00
Razgriz
54755b9e2b
Port Feeder from Old Chomp
...
FEEEEEEED.
2020-11-04 01:31:11 -07:00
Razgriz
23defa0ac2
Merge pull request #747 from Darlantanis/PitcherPlants
...
Pitcher plants
2020-10-23 19:52:13 -07:00
Nadyr
d708107893
Merge pull request #740 from cadyn/quickarelifix
...
Quick fix for med tweaks typo or some BS
2020-10-22 10:24:16 -04:00
Nadyr
34772675a1
Merge pull request #721 from CHOMPStationBot/upstream-merge-9224
...
[MIRROR] Drink addons and sprites
2020-10-22 10:09:11 -04:00
Nadyr
b2c35bf2b5
Merge pull request #712 from CHOMPStationBot/upstream-merge-9087
...
[MIRROR] Added QOL Firefoam recipie
2020-10-22 09:03:00 -04:00
Darlantan
9ffbd1138f
Pitcher plants
...
Adds the pitcher plant mob, obtainable from hydroponics which produces a reagent which doubles the speed of plant growth. Makes pitchers spawn from vines. Includes all the extra tweaks needed to make this stuff work.
2020-10-22 08:08:19 -04:00
cadyn
0f6a462fa1
Update Chemistry-Recipes.dm
2020-10-20 12:12:38 -07:00
cadyn
04b2e3e44c
Fix this bullshit
2020-10-20 12:11:34 -07:00
Verkister
d8ddcb3026
Merge pull request #9224 from rboys2/clara-dev-more-drinks
...
Drink addons and sprites
2020-10-19 10:39:29 +00:00
Verkister
cee8e5af67
Merge pull request #9087 from VictorZisthus/firefoamqol
...
Added QOL Firefoam recipie
2020-10-19 10:38:21 +00:00
Cadyn
92c7b82b05
Areli's med tweaks v2
2020-10-14 08:16:33 -07:00
Cadyn
1d0e69633f
Fix silly stuff
2020-10-05 19:46:50 -07:00
Cadyn
07775449d7
Fixing conflicts
2020-10-05 18:10:53 -07:00
Razgriz
54e632ebf2
September 2020 Upstream Merge
2020-09-25 23:07:08 -07:00
