Commit Graph

2072 Commits

Author SHA1 Message Date
Atermonera
3be2f30df2 Added Doctress' Jager drink. 2021-03-18 04:37:30 -04:00
Zap-zapper
7d4c5105d2 size update fixes 2021-03-12 14:34:02 +07:00
Little-119
45a66dd872 Reduce calcium bone-healing chance
I could give it an overdose or something, but that's too much effort for a joke
2021-03-11 18:05:50 -05:00
Little-119
e0a6ec7284 add bone healing to calcium (with a 1 in 1000 chance)
Yes it can, Mlem
2021-03-10 19:52:04 -05:00
Little-119
0fb3dac02a add calcium 2021-03-10 19:24:11 -05:00
cadyn
f307124985 Allergens v2 (#7950)
* Allergens v2

* The eggening

Add egg allergen, give it to skrell, apply egg allergen where it belongs.

* Update species_languages.dm
2021-03-10 13:54:13 -05:00
Killian
b14f711aae Update Chemistry-Reagents-Food-Drinks.dm 2021-03-07 21:29:29 +00:00
Killian
56aceb9f28 Diet/Allergy Rework & Refactor Pt2 2021-03-07 16:10:29 -05:00
DESKTOP-4BUBN9N\Mike
fcf6cd9f14 adds cool and fun new interactable environmental object 2021-03-06 18:39:48 +00:00
Killian
e05436a661 morefix 2021-02-27 23:34:33 +00:00
Killian
7727c6c096 Update Chemistry-Reagents-Food-Drinks.dm 2021-02-27 22:29:44 +00:00
Killian
ab8eb11be3 Update Chemistry-Reagents-Food-Drinks.dm 2021-02-27 21:21:09 +00:00
Killian
3d8b60bc3e Merge remote-tracking branch 'upstream/upstream-merge-7864' into kk-traits 2021-02-27 20:59:29 +00:00
Killian
0a51569694 Merge branch 'master' into kk-misc3 2021-02-27 20:01:52 +00:00
MistakeNot4892
3e804dc799 Sideports a couple of init unit tests from Neb. 2021-02-27 13:05:16 -05:00
Novacat
8d3fea472d Merge pull request #9752 from VOREStation/upstream-merge-7897
[MIRROR] Makes some juices not sugary
2021-02-19 18:08:21 -05:00
TheFurryFeline
005af5b454 Buffs Adranol Healing
🆑 
tweak - Buff Adranol healing.
/🆑 

Suggested by Tempest, and upon examination of related code, having it at eights makes reduction of peridaxon-caused eye blurriness or jitteriness reductions take long than one might like since ya can't even see how much Adranol you'd need. This'll just make it more evened out and a bit quicker.
2021-02-19 17:53:16 -05:00
Novacat
c2ca8630e4 Update Chemistry-Reagents-Food-Drinks.dm 2021-02-19 17:45:12 -05:00
Schnayy
1fc5aa0570 Makes some juices not sugary 2021-02-19 17:42:06 -05:00
Atermonera
2cb5ac701d Diet/Allergy System Rework 2021-02-19 15:43:30 -05:00
MarinaGryphon
09f734865a Fixes initialise issues in _vr files. 2021-02-16 11:11:56 -06:00
Verkister
0cd81a905c Merge pull request #9543 from VOREStation/upstream-merge-7802
[MIRROR] Space cleaner cleans mobs
2021-02-09 20:17:04 +02:00
Killian
5d82ea8dca Merge remote-tracking branch 'upstream/master' into kk-misc3 2021-02-08 19:27:24 +00:00
Schnayy
94a1966f3a Absurd Amount of Food Fixes 2021-02-06 20:21:02 -05:00
Killian
17bed359bd Merge branch 'kk-misc3' of https://github.com/KillianKirilenko/VOREStation into kk-misc3 2021-02-05 01:30:59 +00:00
Killian
f98116d32c Update Chemistry-Reagents-Food-Drinks_vr.dm 2021-02-05 01:30:35 +00:00
Killian
0e3bf39431 Merge branch 'master' into kk-misc3 2021-02-05 01:25:56 +00:00
Killian
6baa1afdae new traitified version, with some refactoring
cleans up a couple things too
2021-02-05 01:19:03 +00:00
Atermonera
427ec8adee Space cleaner cleans mobs 2021-01-03 18:21:00 -05:00
lukevale
f27bdf1dc4 Beakres
Adds in beakers. Fully working. As long as I didn't fuck up any pathing that is.
2020-12-17 12:06:36 -06:00
Killian
d470e34bca Merge remote-tracking branch 'upstream/master' into kk-misc3 2020-12-15 06:43:40 +00:00
Novacat
162d018f97 Merge pull request #9431 from Very-Soft/abduct-u
Abductor Ship
2020-12-08 13:55:41 -05:00
VerySoft
ff2fb7069e Abduct-u 2020-12-08 13:10:27 -05:00
Mechoid
b95a10af1a Plainleather & Tobacco (#7762)
* Rebrands leather to plainleather. Add tobacco and red-caps, redwood tallcaps.

* Seedpacket

* Sinks are wet.

* User
2020-12-07 19:50:50 -05:00
Killian
ca6ff09d46 Merge remote-tracking branch 'upstream/master' into kk-misc3 2020-11-25 18:31:10 +00:00
Verkister
ba671e6cf3 Merge pull request #9087 from VictorZisthus/firefoamqol
Added QOL Firefoam recipie
2020-10-18 15:47:07 +03:00
Riley
14e1243a87 Drink addons and sprites 2020-10-16 05:40:14 -04:00
Atermonera
3204c9f9a5 Fixes runtime in add_reagent() (#7676)
Bad index: data["species"] when data is not a list
2020-09-22 23:40:38 -04:00
Victor Zisthus
48d2395a36 Empty Push
Sorta.
2020-09-22 20:03:06 -04:00
Victor Zisthus
d4d8ba6b93 fix3 2020-09-22 12:33:27 -04:00
Victor Zisthus
de9549d019 fix2 2020-09-22 12:11:30 -04:00
Victor Zisthus
1f6a47f547 fixed
oh I can do it from mobile, yay
2020-09-22 11:18:59 -04:00
Victor Zisthus
ee602d4815 Added QOL Firefoam recipie
Dunno why I didn't think of this before.
2020-09-22 08:36:43 -04:00
Novacat
41c8e4a671 Merge pull request #9032 from VOREStation/upstream-merge-7475
[MIRROR] Hydro upkeep
2020-09-21 19:42:43 -04:00
Killian
542595cb5a Update Chemistry-Reagents-Food-Drinks_vr.dm 2020-09-21 21:05:29 +01:00
Killian
06d7b68c49 Update Chemistry-Reagents-Food-Drinks_vr.dm 2020-09-21 20:51:13 +01:00
Killian
46e560dd8e cycler adjustment, charge limit 2020-09-21 20:24:52 +01:00
Killian
398d99913d Merge remote-tracking branch 'upstream/master' into kk-misc3 2020-09-21 19:31:51 +01:00
Novacat
d49640431d Merge pull request #9062 from ShadowLarkens/tgui_finale
NanoUI Goes To Brazil
2020-09-21 14:13:16 -04:00
Novacat
0ed68c9d54 Merge pull request #9078 from VOREStation/upstream-merge-7669
[MIRROR] Fix Beaker Dipping
2020-09-21 14:06:28 -04:00