cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-05 13:50:08 +00:00
Code Issues Packages Projects Releases Wiki Activity
68,836 Commits 8 Branches 26 Tags
cf224b6d124db92ffefa27ab3160c625f380ad06
Commit Graph

32879 Commits

Author SHA1 Message Date
Kashargul
cf224b6d12 . 2024-12-08 05:51:39 +01:00
Kashargul
1a2c2c0764 plants 2024-12-08 05:51:35 +01:00
Kashargul
4e7742e3c8 food.dm 2024-12-08 04:26:19 +01:00
Kashargul
e9550345d2 half of the food and drinks 2024-12-08 01:14:10 +01:00
Kashargul
5d14c2affa only food left... 2024-12-07 02:16:23 +01:00
Kashargul
1d8d5b34b5 medicine.dm 2024-12-07 02:10:10 +01:00
Kashargul
a12a4d2d5e toxins.dm 2024-12-07 01:03:25 +01:00
Kashargul
2bd0f9c14d other.dm 2024-12-07 00:12:42 +01:00
Kashargul
0b303a3ae5 bunch of fixes 2024-12-06 23:29:36 +01:00
Kashargul
c64a251504 mecdicine_vr 2024-12-06 22:47:10 +01:00
Kashargul
5398ec84bf few more 2024-12-06 22:26:07 +01:00
Kashargul
e0972e8325 virology 2024-12-06 22:12:35 +01:00
Kashargul
939fcbb488 Merge branch 'master' into reagentToDefines 2024-12-06 21:57:14 +01:00
Kashargul
429398bdd7 some moire 2024-12-06 21:54:05 +01:00
Heroman3003
5092af9321 Merge pull request #16672 from Kashargul/areaStuff 
converts area booleans to flags
 2024-12-07 05:20:02 +10:00
Heroman3003
9941ffa8dc Merge branch 'master' into areaStuff 2024-12-07 05:14:52 +10:00
Heroman3003
619364a073 Merge branch 'master' into headset 2024-12-07 05:13:21 +10:00
Heroman3003
910e591986 Merge pull request #16673 from Kashargul/robotGlamour 
fix subtype handling for robot extra icons
 2024-12-07 05:12:33 +10:00
Heroman3003
d51e74479e Merge pull request #16671 from ReoDaProtovali/Corrupted-Beeps 
Corrupt hounds have EAL.
 2024-12-07 05:11:34 +10:00
Heroman3003
fd4f187ea1 Merge pull request #16669 from SatinIsle/coffeeeeeee 
Barista love
 2024-12-07 05:08:01 +10:00
Heroman3003
a827a8b5b2 Merge pull request #16667 from Kashargul/appearance 
rework appearance changer
 2024-12-07 05:07:30 +10:00
Heroman3003
16190a59c6 Merge pull request #16663 from SatinIsle/pai-sleep 
Allows pAI's to wake up
 2024-12-07 05:06:48 +10:00
Heroman3003
146c3f4140 Merge pull request #16659 from TheCaramelion/Viro-Update-1 
Virology Update 1
 2024-12-07 05:06:20 +10:00
Heroman3003
edd99b63cf Merge pull request #16639 from KillianKirilenko/kk-charpod 
"Maint Lurker" Hole
 2024-12-07 05:05:22 +10:00
Heroman3003
6253051c21 Merge pull request #16598 from Kashargul/protRig 
Prot rig up port
 2024-12-07 05:04:29 +10:00
Heroman3003
60fd487c76 Merge pull request #16655 from Kashargul/jobtitle 
tragedian gets its name back
 2024-12-07 05:04:05 +10:00
Kashargul
80edcd2c3d Converts gas, mat and reagent strings to defines 2024-12-06 17:26:00 +01:00
Kashargul
f7a221698c allow explicit path checks 2024-12-06 00:57:08 +01:00
Kashargul
592c313c83 . 2024-12-05 23:50:44 +01:00
Kashargul
2d2dd81a76 fix subtype handling for robot extra icons 2024-12-05 23:48:45 +01:00
Kashargul
cc22c4efbe 2 em is much larger than thought.... 2024-12-04 23:20:02 +01:00
Kashargul
bbe48ee9b4 use defines 2024-12-04 22:47:42 +01:00
ShadowLarkens
9a940834b4 Enable creation of cycling airlocks 2024-12-04 13:45:19 -08:00
Kashargul
ead0180057 converts area vars to flags 2024-12-04 22:21:38 +01:00
SatinIsle
b1c1ab88ac Cargo orderable and a couple more flavours 2024-12-04 18:13:25 +00:00
ReoDaProtovali
cc216940c3 Beep. 2024-12-04 11:35:20 -06:00
Killian
01813cd4d0 maint lurker setup 2024-12-04 12:22:40 +00:00
Kashargul
1c55054c6f . 2024-12-04 02:10:37 +01:00
Kashargul
3835042996 . 2024-12-04 02:07:46 +01:00
Kashargul
1d324ada51 . 2024-12-04 02:05:46 +01:00
Kashargul
a99ea4f3d7 . 2024-12-04 02:03:45 +01:00
Kashargul
37ad0acf01 that 2024-12-04 02:03:07 +01:00
Kashargul
9cb06747fb some robot interacts for closeby things 2024-12-04 01:49:13 +01:00
Kashargul
e56d2c4712 fix the tf pref 2024-12-04 01:09:29 +01:00
Kashargul
a6571a4ab2 reassign 2024-12-04 00:59:55 +01:00
SatinIsle
4cf5beeabe Added more cup sizes 
Added tall, grande and venti cups that get named similarly to the normal cups.

Added ginger and gingerbread syrups, on request of my wife, lol.
 2024-12-03 20:06:57 +00:00
Kashargul
0da06e773c here too 2024-12-03 20:35:45 +01:00
Kashargul
aa01526a26 fix secondary ear options 2024-12-03 18:22:33 +01:00
SatinIsle
35503f3113 Barista love 
Added a new dispenser to cafes on each station, the syrup dispenser. These just add flavoured syrups to your drinks, but don't do much unique by themselves. This allows people to customise their coffee more.

Added a whole bunch of flavoured syrups, such as pumpkin spice, chocolate, irish cream and more.

Added new coffee recipes, including things like americano, macchiato, breve, cappuccino and mocha. Unfortunately flat white and latte would cannibalise other recipes if they just used milk and coffee, so they use drip coffee instead.

Added a few new coffee reagents, drip brewed coffee and milk foam.

Changed coffee cups to now include the name or description (in the var cup_prefix) of certain additional reagents. For example, if you have a cup with 25u of mocha and 5u of pumpkin spice, it will take the name "cup of pumpkin spice mocha". A lot of existing reagents have had these added too.

Added a wall locker with additional cups to every station cafe.

Added pineapple juice as an option to the soda vendor.
 2024-12-03 14:35:45 +00:00
Kashargul
e179521918 . 2024-12-03 11:53:06 +01:00