cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-01-30 02:44:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
58,115 Commits 8 Branches 26 Tags
ea42ee23034ef841302aa49742ebebfb0198242a
Commit Graph

2089 Commits

Author SHA1 Message Date
Neerti
767e655310 Linter Introduction + Cleanup 2021-05-25 23:19:34 -04:00
Novacat
dc043a8f53 Update dispenser.dm 2021-05-15 11:03:48 -04:00
Aronai Sieyes
a29a081d3e Fix a couple places that might cause belly emotes 2021-05-15 10:58:26 -04:00
Unknown
d1437121f2 Merge remote-tracking branch 'VOREStation/master' into personal_crafting 2021-05-06 00:34:56 -04:00
ShadowLarkens
1da76ed2b4 Personal Crafting & Dependencies 2021-05-02 18:10:59 -07:00
klaasjared
af70b4ae5c Adds the cans and vendor code 
Codes in the cans and the code for the Bepis vendor.
 2021-04-29 14:10:41 -04:00
klaasjared
df46033fb5 Adds drink code... and more drinks 
Adds
-Buzz Fuzz
-Shambler's
-Sprited Cranberry
 2021-04-29 14:10:40 -04:00
Unknown
3c8efc3787 Compatibility 2 2021-04-22 22:52:49 -04:00
Unknown
81a9b59c46 Compatibility Patch 1 2021-04-22 22:41:27 -04:00
Atermonera
c99e44ab22 Oops, I refactored Chemistry! 2021-04-20 23:33:41 -04:00
Novacat
3a9791f0c9 Update Chemistry-Reagents-Food-Drinks.dm 2021-04-10 09:54:48 -04:00
klaasjared
801fde168b Boda Tweaks and Russian Drinks V2 2021-04-10 03:39:14 -04:00
Novacat
82a1307945 Merge pull request #10102 from Novacat/nova-ert 
Fixes two bugs
 2021-04-08 17:06:02 -04:00
Aronai Sieyes
4690411915 Remove unnecessary 'signatures' 2021-04-08 12:39:14 -04:00
Unknown
22610828be Fixes two bugs. 
-Fixes a typo in chems
-Fixes NIFs not appearing on health scanners
 2021-04-08 12:28:37 -04:00
Aronai Sieyes
081b100e10 Update resize pref and some resizing code 2021-04-07 15:15:51 -04:00
Atermonera
72d1741b6b Tanning Tweaks 2021-03-30 01:50:39 -04:00
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