Commit Graph

2383 Commits

Author SHA1 Message Date
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
fd4f187ea1 Merge pull request #16669 from SatinIsle/coffeeeeeee
Barista love
2024-12-07 05:08:01 +10:00
Heroman3003
146c3f4140 Merge pull request #16659 from TheCaramelion/Viro-Update-1
Virology Update 1
2024-12-07 05:06:20 +10:00
Kashargul
80edcd2c3d Converts gas, mat and reagent strings to defines 2024-12-06 17:26:00 +01:00
SatinIsle
b1c1ab88ac Cargo orderable and a couple more flavours 2024-12-04 18:13:25 +00: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
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
Guti
3cf6aa9f2a Size stuffs 2024-11-30 17:06:02 +01:00
Heroman3003
96cd99127a Merge pull request #16618 from ShadowLarkens/ui
Kitchen UI Update
2024-11-30 14:41:27 +10:00
Guti
823db69af5 Merge branch 'master' into Viro-Update-1 2024-11-29 22:56:42 +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
Guti
9f52fc0b1c Sick stuff 2024-11-25 17:05:54 +01:00
ShadowLarkens
1ee1e40993 Make the grinder always show a radial menu, no autopick 2024-11-18 05:49:25 -08:00
Heroman3003
8d24db7be4 Merge pull request #16512 from Darlantanis/OreGrinding
Ports grindable ores
2024-11-17 20:58:33 +10:00
Guti
57ac142d1e Fixes (#16596) 2024-11-13 18:26:00 +01:00
Kashargul
32c9f971bc tgui usr to ui.user 2024-11-13 00:49:17 +01:00
SatinIsle
7013ff1e53 Allow pouring stuff into tanks (#16576)
Added the ability to alt-click a reagent dispenser (such as a water or fuel tank) to open the input. When the input is open, reagent containers (such as buckets and beakers) will pour their contents into the dispenser to refill it.
2024-11-09 15:48:35 +01:00
Guti
7175a48c8d Virology Patch 1 (#16581)
* Update

* Small oopsies
2024-11-09 01:18:07 +01:00
Guti
9077c940c4 Better Viro (#16536)
* Better Viro

* Quarantine ship

* Lazy...

* Roanoake prep

* Roanoake

* Verbs

* Verbs + Logging

* Virus breath check
2024-11-05 12:40:02 +01:00
Kashargul
4879a52633 Server maint subsystem (#16518)
* upports server maint subsystem

* fix runtime in admin z narrate

* .

* sorts them verbs

* .

* .

* Update code/controllers/subsystems/statpanel.dm

Co-authored-by: Selis <12716288+ItsSelis@users.noreply.github.com>

* Update code/controllers/subsystems/server_maint.dm

Co-authored-by: Selis <12716288+ItsSelis@users.noreply.github.com>

---------

Co-authored-by: Selis <12716288+ItsSelis@users.noreply.github.com>
2024-11-04 11:44:44 +01:00
Nadyr
f4e2e68a79 Fixes fluid pump (#16541) 2024-10-31 09:29:12 +01:00
Killian
eaaf58b9be water cooler tweaks (#16548) 2024-10-31 09:14:35 +01:00
Nadyr
1dc68072f2 fix rainbow toxin overdose (#16538) 2024-10-29 01:48:24 +01:00
Nadyr
ba998786d7 grindable ores, more grindable stacks, blacklisted slag 2024-10-22 21:19:23 -04:00
Kashargul
b594520a74 next set of spans (#16434)
* next set of spans

* some more

* next

* next

* next

* .

* text...

* next... rest soon

* .

* .

* ok last set for the night

* .

* .

* .

* .

* some more

* next

* next

* all for now

* .

* some more easy ones

* some more easy ones

* .

* .

* some more bolds

* oups auto complete moment

* add the remaining spans

* this as well

* this as well

* .

* .,

* resync them properly
2024-10-16 23:37:27 +02:00
ShadowLarkens
c07027136e Port tg statpanel (#16463)
* Port tg statpanel

* Add verb descriptions using the title attribute

* Fix a dreamchecker error

* Remove chomp edits

* Add mentor tickets to ticket panel

---------

Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
2024-10-16 19:39:06 +02:00
Nadyr
7a74bab92a makes leporazine respect species body temp (#16452) 2024-10-12 16:38:08 +02:00
Nadyr
018da812e2 chem master 2x bottle option 2024-10-04 16:57:01 -04:00
Heroman3003
8aeb7b5707 Merge pull request #16423 from Darlantanis/IngestFixes
Fixes bad affect_ingest paths
2024-10-05 06:18:31 +10:00
Nadyr
089c746acf Fixes bad affect_ingest paths 2024-10-04 13:48:13 -04:00
Nadyr
7e50bd3143 fixes bad decaf reactions 2024-10-04 13:19:30 -04:00
Kashargul
a2c673ab7a refactors most spans 2024-10-02 21:10:31 +02:00
Kashargul
e0d694e8ac rid of old span macros 2024-10-01 23:51:48 +02:00
Guti
e3fdfbd9be Milking thing 2024-09-25 16:13:49 +02:00
Guti
dc7ad02813 Deconf 2024-09-22 15:01:10 +02:00
ShadowLarkens
23c81bab19 Add venom milking to beakers 2024-09-20 08:51:48 -07:00
Guti
f4f5476121 Merge branch 'master' into weapon-removal 2024-09-18 18:07:43 +02:00
Kashargul
8a90ae6523 only missing alt titles 2024-09-12 22:48:14 +02:00
Guti
409aaba802 Remove 2024-09-09 02:36:53 +02:00