831 Commits
Author SHA1 Message Date
izac112 f3e3905b41 Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate 2024-12-11 20:18:19 +01:00
KashargulandGitHub b6ac55c6b8 fix a potential server crash 2024-12-07 21:42:15 +01:00
izac112 68e5bf9d42 Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate-2 2024-12-04 15:21:21 +01:00
izac112 87ce13b27c Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate-2 2024-12-04 15:17:00 +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
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
izac112 058f219cb9 Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate 2024-11-30 23:30:26 +01:00
Heroman3003andGitHub 96cd99127a Merge pull request #16618 from ShadowLarkens/ui
Kitchen UI Update
2024-11-30 14:41:27 +10:00
Heroman3003andGitHub 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
Heroman3003andGitHub 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
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
Heroman 0b10e7770b Adds a turkey mob and reworks regular Turkey recipe 2024-11-28 05:35:09 +10:00
ShadowLarkens 49d0d773e5 Make the microwave preview what it'll (probably) create 2024-11-26 11:12:56 -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
ShadowLarkens 827b4bcdd0 Add a radial menu to generic appliances (just mixers, I think?) 2024-11-18 07:07:09 -08:00
ShadowLarkens 425c83054c Add selectable output to CookingAppliance UI 2024-11-18 06:30:51 -08:00
ShadowLarkens 9f0a297579 Add power and safety to CookingAppliance UI 2024-11-18 06:18:32 -08:00
Kashargul 32c9f971bc tgui usr to ui.user 2024-11-13 00:49:17 +01:00
GutiandGitHub 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
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
KashargulandGitHub 7be625e0cb some more small things (#16491) 2024-10-18 23:36:19 +02:00
KashargulandGitHub 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
SatinIsleandGitHub 97ad888dfc Mob-food vore fix (#16472)
Fixed AI-controlled simple mobs being able to eat someone with mobvore disabled when in food via food vore.
2024-10-16 19:46:09 +02:00
KashargulandGitHub 1e3f0d5a01 fix improper food greartweaks (#16458)
* fix improper greartweaks

* .
2024-10-12 14:29:44 +02:00
KashargulandGitHub f2292683d7 up ports endless mouseburger fix (#16461) 2024-10-12 14:22:34 +02:00
KashargulandGitHub 4d8a84f70f . 2024-10-04 14:42:31 +02: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 dc7ad02813 Deconf 2024-09-22 15:01:10 +02:00
Guti a3c7599065 Fix 2024-09-18 18:33:15 +02:00
Guti 06a46a237b stuff 2024-09-18 18:12:57 +02:00
Guti f4f5476121 Merge branch 'master' into weapon-removal 2024-09-18 18:07:43 +02:00
ShadowLarkens 62d3e2c776 Fix problems found by fixing validate_files 2024-09-17 20:23:02 -07:00
Kashargul 8a90ae6523 only missing alt titles 2024-09-12 22:48:14 +02:00
Kashargul 4ba7beeb9c up to field medic 2024-09-12 21:20:47 +02:00
Kashargul 8a3520e2e0 move all factions to defines 2024-09-12 20:17:41 +02:00
Kashargul 0425a4e396 up to officer 2024-09-12 00:00:11 +02:00
SatinIsle c5a5893d9e Apparently it needs specific reagents, just the /mega parent type isn't enough 2024-09-09 09:05:08 +01:00
SatinIsle 1443774906 Did it right this time 2024-09-09 08:48:12 +01:00
SatinIsle be90b60ab4 Mega Nukies Disallowed From Vacuum Flask
Removed Mega Nukies from the possible drinks that can start in a vacuum flask. I had simply forgot this was a thing when I made it, and they're supposed to be a tiny bit rare and also are a bit too powerful as a starting item.
2024-09-09 08:44:44 +01:00
Guti 409aaba802 Remove 2024-09-09 02:36:53 +02:00
KashargulandGitHub 2f19f66cc5 default tgui alert input handling (#16241)
* default handling

* do not push that

* fix

* .

* .
2024-09-02 04:27:26 +10:00
KashargulandGitHub cc737be0a0 bunch of to_chat failures 2024-09-01 04:10:55 +02:00
KashargulandGitHub 10637da2f4 ports mind transfer pref from chomp (#16225)
* ports mind transfer pref from chomp

* don't push that

* .
2024-08-31 05:29:49 +10:00
izac112 42b345b3cc Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate 2024-08-28 20:22:38 +02:00
SatinIsleandGitHub 3775663482 Mega nukies (#16110)
* Mega Nukies

Added a variety of Nukies called Mega Nukies that can only rarely be found in maintenance loot. These super caffeinated drinks come with a warning label about health hazards and may have the following effects:

The ability to see in the dark perfectly, with a small risk to your eyes.
Good healing of brute and burn damage at the risk of damaging your heart.
Putting you to sleep until you've processed all of it.
Repairing your NIF and filling you up, but confuses you if you don't have a NIF installed!
Hyperzine speed, way less addictive but may cause modest burns!
Gets you real high.
Slowly shrinks you.
Slowly grows you.

* Unique colours
2024-07-21 19:56:52 +10:00
izac112 04de351a1e Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate 2024-07-17 16:14:16 +02:00
KillianandGitHub 3042f01ce3 alcohol trait refactor (#16053) 2024-06-20 15:19:04 +10:00
SatinIsleandGitHub 2bf38f110e Spin The Bottle (#16054)
* Spin The Bottle

Added a new verb to all drink bottles that allows them to play spin the bottle whilst on the floor.

* Oops, accidentally left it on minitest
2024-06-19 15:43:42 +10:00
KashargulandGitHub 6cabe9f7e6 Undefines local defines and moves global to __define (#16028)
* first set of defines

* some more

* .

* final defines

* del local define
2024-06-09 17:29:20 +10:00