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
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
Heroman3003
f5f707030c
Merge pull request #16506 from Darlantanis/RecordSaving
...
Ports in-round record updating
2024-11-30 14:42:17 +10:00
Heroman3003
a15578d8fd
Merge pull request #16597 from Kashargul/miscGripper
...
up ports misc gripper, gargoyle, petrification, some message fixes
2024-11-30 14:41:36 +10:00
Heroman3003
96cd99127a
Merge pull request #16618 from ShadowLarkens/ui
...
Kitchen UI Update
2024-11-30 14:41:27 +10:00
Heroman3003
6a78aaa65a
Merge pull request #16653 from KillianKirilenko/kk-sdspawns
...
Space Ghost and SD Mining spawn tweaks
2024-11-30 14:41:11 +10:00
Heroman3003
3237ba8169
Merge pull request #16654 from KillianKirilenko/kk-rocks
...
Samples from Strange Rocks
2024-11-30 14:40:50 +10:00
Heroman3003
38e4aa874b
Merge pull request #16648 from ShadowLarkens/paicard
...
Allow pAIs to attack_ai the machine they're inside,
2024-11-30 14:40:41 +10:00
Heroman3003
90dc2821e9
Merge pull request #16649 from ShadowLarkens/microwave_improvemenets
...
Make the microwave preview what it'll (probably) create
2024-11-30 14:40:36 +10:00
Killian
633cc9514c
samples from strange rocks
2024-11-29 06:46:30 +00:00
Killian
5c81b06c74
space ghost and mining spawn tweaks
2024-11-28 23:33:43 +00:00
Heroman3003
10de4fc09f
Merge pull request #16511 from VOREStation/verb-subsystem
...
Verb manager subsystem & Speech controller
2024-11-28 14:43:53 +10:00
Heroman3003
ed9824415a
Merge pull request #16635 from Kashargul/voteTimer
...
fixes vote announce time
2024-11-28 14:40:35 +10:00
Heroman3003
8516e0f5db
Merge pull request #16633 from Kashargul/agentCard
...
fix agent card for modify robot
2024-11-28 14:40:17 +10:00
Heroman3003
dde8601c84
Merge pull request #16629 from Kashargul/planet-time
...
Planet time debug uncapping and broken weapon chat output
2024-11-28 14:40:05 +10:00
Heroman3003
f552b4bdde
Merge pull request #16624 from Kashargul/RS_Ports
...
Ports RS 658, 661 and some minor things
2024-11-28 14:39:22 +10:00
Kashargul
d560b0f567
Merge branch 'master' into agentCard
2024-11-28 00:17:28 +01:00
Kashargul
8b8cef516b
Merge branch 'master' into planet-time
2024-11-28 00:11:21 +01:00
Kashargul
938ab8af7c
Merge branch 'master' of github.com:Kashargul/VOREStation into usr-to-user-up-to-player_effects
2024-11-27 23:53:06 +01:00
Heroman3003
05b28bac9e
Merge pull request #16647 from Cameron653/Janihud-OP
...
Ports Janihud rework from Outpost 21.
2024-11-28 06:05:21 +10:00
Heroman3003
6f020343bb
Merge pull request #16650 from Heroman3003/thanksgivingturkey
...
Adds a turkey mob and reworks regular Turkey recipe
2024-11-28 05:53:12 +10:00
Heroman3003
3a77e0b747
Merge pull request #16619 from SatinIsle/let-me-wear-wristbands
...
Allows wristbands and bracelets to attach to uniforms again
2024-11-28 05:35:27 +10:00
Heroman
0b10e7770b
Adds a turkey mob and reworks regular Turkey recipe
2024-11-28 05:35:09 +10:00
Heroman3003
fa5a178010
Merge pull request #16515 from ShadowLarkens/zas
...
Some ZAS tweaks and minor optimizations
2024-11-28 05:34:47 +10:00
Heroman3003
7e696cd850
Merge pull request #16586 from Kashargul/spritesheet
...
Spritesheet
2024-11-28 05:34:29 +10:00
Heroman3003
8d70180e87
Merge pull request #16588 from ShadowLarkens/merk_skills
...
Completely merk all traces of the skill system
2024-11-28 05:34:18 +10:00
Heroman3003
9bc748eb8e
Merge pull request #16611 from TankTheBirb/fix-blindfold
...
Hides your eyes when wearing blindfolds
2024-11-28 05:33:30 +10:00
Heroman3003
6e811b3c86
Merge pull request #16621 from Darlantanis/HandImplantFix
...
Hand implants can go in hands
2024-11-28 05:33:17 +10:00
Heroman3003
5cd0d2afd1
Merge pull request #16646 from ShadowLarkens/microwave
...
Add emotes to ding and make microwave noises.
2024-11-28 05:30:47 +10:00
Heroman3003
8cfc30fb0d
Merge pull request #16637 from KillianKirilenko/kk-gloves
...
Recolourable fingerless gloves parity
2024-11-28 05:29:16 +10:00
Heroman3003
8ea468707d
Merge pull request #16636 from Kashargul/no
...
no old spans
2024-11-28 05:29:04 +10:00
Heroman3003
1f90da0eca
Merge pull request #16627 from TheCaramelion/viro-fix-4
...
Virology Patch 4
2024-11-28 05:28:23 +10:00
ShadowLarkens
49d0d773e5
Make the microwave preview what it'll (probably) create
2024-11-26 11:12:56 -08:00
C.L.
65c640cd68
Janihud rework
...
From Outpost21
2024-11-26 10:46:05 -05:00
ShadowLarkens
34be5fef53
Add emotes to ding and make microwave noises.
2024-11-25 07:33:59 -08:00
ShadowLarkens
51653714f6
Allow pAIs to attack_ai the machine they're inside, this literally just means rn microwaves can be triggered by them
2024-11-24 11:22:09 -08:00
Killian
c80b0df3d4
recolourable fingerless gloves parity
2024-11-23 22:45:20 +00:00
Kashargul
3dc0636ebb
no old spans
2024-11-23 19:01:23 +01:00
Kashargul
9e0bd9d237
fixes vote announce time
2024-11-23 03:25:23 +01:00
Kashargul
9b727577f9
.
2024-11-23 00:37:58 +01:00
Kashargul
6b185918ef
-
2024-11-23 00:37:41 +01:00
Kashargul
e310d20287
sane removal
2024-11-23 00:36:43 +01:00
Kashargul
2675977768
.
2024-11-23 00:32:00 +01:00
Kashargul
72a4cb2411
.
2024-11-23 00:31:22 +01:00
Kashargul
7f754506cb
.
2024-11-23 00:30:25 +01:00
Kashargul
6cea41a28a
.
2024-11-23 00:29:26 +01:00
Kashargul
048337ed4a
fix agent card for modify robot
2024-11-23 00:16:17 +01:00
Kashargul
7454a10ce0
.
2024-11-22 21:24:32 +01:00
Kashargul
9d738334db
really...
2024-11-22 21:22:32 +01:00
Kashargul
58a694b69d
fix that here too
2024-11-22 21:13:37 +01:00
