Commit Graph

27 Commits

Author SHA1 Message Date
Spatison
bad6a07728 some wizmerge fix 2025-07-12 01:38:01 +10:00
Pieter-Jan Briers
fd996dea9c Fix ChemVend jugs again (#31398)
This re-introduces the dummy entity naming code, originally introduced in #29178 and randomly removed by #30064 with no technical justification given.

Fixes #31373

(cherry picked from commit d15869f6007b2c772380c023153bfbfd264a328a)
2025-07-12 01:13:21 +10:00
Winkarst
835eda62af Make vending machine use EntityPrototypeView (#30064)
* Make vendor machines use EntityPrototypeView

* Update

* 1

* Kill me

* For the love of god!!!

(cherry picked from commit 588661465a2ede2610bed4dbb440131122e74a6f)
2025-07-12 01:12:55 +10:00
Tayrtahn
88408b1637 Fix unlabeled jugs in ChemVend (#29178)
* Spawn dummy entities on client for vending machine UI

* Asked sloth, and we kinda need this pr

---------

Co-authored-by: Vasilis <vasilis@pikachu.systems>

(cherry picked from commit ac1bdd2c840a126b9f5114440b6b26c08c7ea0c4)
2025-07-12 01:12:52 +10:00
NeLepus
1dd823f071 Label Rendering For Vending Machines and Item Preferences Menus (#1538)
# Description

This PR removes label duplicates from item names in order to make actual
labels work properly and make them visible in vending machines' menus as
well as loadout preferences.

As we can see in Fig 1, the aluminium jug is not only labelled as
"aluminium 10u" but contains "(aluminium 10u)" in the item name, which
drives chemists homicidal when it comes to labelling the jugs.
This issue also appears with other labelled items such as pill canisters
in item preferences (see Fig 2), which led to a row of nameless pill
canisters being present in our server's menu.

My solution is to fetch the item's LabelComponent in the menu so this
redundancy is no more needed.
See Fig 3 for an example.

The VendingMachineMenu.xaml.cs code fetches and localizes the text from
the LabelComponent from the prototype the same way it fetches sprites,
and in the LoadoutPreferenceSelector.xaml.cs the task is pretty
straightforward since the item is spawned in the Nullspace anyway.

---

- [x] Added label rendering for VendingMachineMenu.xaml.cs
- [x] Stripped reagent jugs' names off their fake labels
- [x] Added label rendering for LoadoutPreferenceSelector.xaml.cs
- [x] Stripped pill canisters' names off their fake labels
- [x] Reformatted pills *that do not have explicit descriptions* to
match "pill (label)" format

---

<!--
This is default collapsed, readers click to expand it and see all your
media
The PR media section can get very large at times, so this is a good way
to keep it clean
The title is written using HTML tags
The title must be within the <summary> tags or you won't see it
-->

<details><summary><h1>Media</h1></summary>
<p>

Fig 1, the issue with ChemVend's reagent jugs:
![Fig
1](https://github.com/user-attachments/assets/05983f8d-1bc6-4352-b13c-194a6ea172e9)

Fig 2, the issue with pill canisters:
![Fig
2](https://github.com/user-attachments/assets/5afec42f-ef55-4b9d-af2f-2cef6174225d)

Fig 3, demonstration of the solution:
![Fig
3](https://github.com/user-attachments/assets/bbc2d1b3-e773-4654-a32a-ab5d7205e0e9)

</p>
</details>

---

# Changelog

🆑 NeLepus
- add: Added label rendering for vending machines & item preferences
- tweak: Formatted pill without descriptions to follow  "pill (label)"
- remove: Fake label duplicates in reagent jugs and pill canisters

(cherry picked from commit f0f9512b491fefa2416f661e8f6b20fab215fa2f)
2025-01-15 23:56:04 +03:00
James Simonson
d5c65dd4d6 Vending UI facelift (#25377)
* Convert to fancy window + added footer + add list spacing

* margin add

(cherry picked from commit 99aa72e30dd79ed2388a449de41a2b3f70491356)
2024-02-21 03:58:07 +01:00
themias
8166740cba Remove need to toggle vending machine button (#21543) 2023-11-12 20:50:57 +01:00
Nemanja
d046e39f0e fix searching on vending machines (#21233) 2023-10-31 18:45:37 +01:00
ike709
7586be1ddf Adds a search bar to vending machines (#20326)
* Adds a search bar to vending machines

* fix indentation

* whitespace again

---------

Co-authored-by: ike709 <ike709@github.com>
2023-09-27 21:59:12 +02:00
metalgearsloth
21fdea5e5a Remove lights compref (#19531) 2023-09-27 21:59:12 +02:00
metalgearsloth
68480af109 Update content vectors to numerics (#17759) 2023-07-08 14:08:32 +10:00
metalgearsloth
600c0e3255 Fix a few warnings (#11576) 2022-10-04 14:24:19 +11:00
Andreas Kämper
42f3155c85 Clean up vending machines and port their visualizer (#10465) 2022-08-31 05:12:09 -07:00
Visne
58769634c7 Fix a bunch of compiler warnings (#10518) 2022-08-13 22:28:34 -07:00
Leon Friedrich
5449e7875e Vending visualizer update (#9962) 2022-07-26 10:35:36 +10:00
Flipp Syder
8f223586d4 Vending machine changes (#8060)
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2022-05-10 12:22:58 +10:00
mirrorcult
ec4d4688c7 Seal/abstract/virtual everything (#6739) 2022-02-16 18:23:23 +11:00
Fishfish458
b837b186a5 Attempted Small Vending Machine Refactor (#6157)
Co-authored-by: fishfish458 <fishfish458>
2022-01-31 15:16:41 +11:00
wrexbe
cea1b21832 Fixing some warnings (#6250)
Co-authored-by: Paul Ritter <ritter.paul1@googlemail.com>
2022-01-21 10:38:35 +01:00
Vera Aguilera Puerto
2699540526 Remove useless resolves from a buncha tests. 2021-12-08 12:46:30 +01:00
DrSmugleaf
2a3b7d809d Fix 3000 errors 2021-12-05 18:09:01 +01:00
Vera Aguilera Puerto
5cd42c9ad6 Inline UID 2021-12-03 15:53:09 +01:00
Vera Aguilera Puerto
0feebbff00 Inline HasComponent entirely 2021-12-03 12:23:18 +01:00
Vera Aguilera Puerto
b835bea086 Inline GetComponent 2021-12-03 11:55:25 +01:00
Vera Aguilera Puerto
f64df117be Inline AddComponent 2021-12-03 11:33:40 +01:00
Swept
8e802b4305 Refactors Vending Menu to XAML-UI (#4614)
* Initial

* Some web-edit reviews

* Keep VV

* Applied Reviews
2021-09-19 17:21:05 +00:00
DrSmugleaf
ff1a2d97ea Re-organize all projects (#4166) 2021-06-09 22:19:39 +02:00