Commit Graph

14 Commits

Author SHA1 Message Date
metalgearsloth
f7ee0c6c9d Predict vending machine UI (#33412)
(cherry picked from commit a8ebcac5c9e36765671b742a4f587a80cfadf4f3)
2025-09-27 12:21:05 +03:00
ScarKy0
189ebe61ab Seperate EMAG into EMAG and Authentication Disruptor (#34337)
(cherry picked from commit 253a9fbdf1372f80dad65a80dcb8e5d169861804)
2025-09-20 20:34:13 +03:00
DVONIKS
f6175b95ab Revert "[Fix/Tweak] Vendomats and smuggling (#621)" (#668)
This reverts commit 1ff67e0309.
2025-07-24 14:14:34 +10:00
metalgearsloth
7bf98d6616 Predict vending machine BUI (#32376)
(cherry picked from commit dd7884ed40114fab1584852647dbb39c24f091e7)
2025-07-20 15:49:35 +10:00
RedBurningPhoenix
1ff67e0309 [Fix/Tweak] Vendomats and smuggling (#621)
* NoMoreFreeItems

* Okay

* Okak...

* attrib. + markings

* space

* OkakX2
2025-07-05 12:14:22 +10:00
SimpleStation14
1e6a292d8c Mirror: SS14-12462 Nerf food and drink vending machines (#221)
## Mirror of PR #25999: [SS14-12462 Nerf food and drink vending
machines](https://github.com/space-wizards/space-station-14/pull/25999)
from <img src="https://avatars.githubusercontent.com/u/10567778?v=4"
alt="space-wizards" width="22"/>
[space-wizards](https://github.com/space-wizards)/[space-station-14](https://github.com/space-wizards/space-station-14)

###### `41093ab03cc6a643ee7721de3567963b34fe8e54`

PR opened by <img
src="https://avatars.githubusercontent.com/u/732532?v=4" width="16"/><a
href="https://github.com/FairlySadPanda"> FairlySadPanda</a> at
2024-03-11 13:50:33 UTC

---

PR changed 3 files with 39 additions and 9 deletions.

The PR had the following labels:
- Status: Needs Review


---

<details open="true"><summary><h1>Original Body</h1></summary>

> <!-- Please read these guidelines before opening your PR:
https://docs.spacestation14.io/en/getting-started/pr-guideline -->
> <!-- The text between the arrows are comments - they will not be
visible on your PR. -->
> 
> ## About the PR
> Reduces the amount of food in all food and vending machines EXCEPT the
Honk meal one by about half.
> 
> ## Why / Balance
> Vending machines provide too much food (and drink) at the moment to
the crew, robbing the chef/bartender of a reason to exist, and robbing
the janitor of a reason to want to refill vending machines early in the
round.
> 
> ## Technical details
> This PR adds a new "initialStockQuality" field to vending machines and
sets it at 0.33 for almost all food and drink vendors. The intent at the
moment is to drop food and drink vending machine stocks by somewhere
around a half - two thirds of the time, about two-thirds of the stock of
a given item will be missing.
> 
> This number can be tuned to discourage people relying on vending
machines and make round start a bit more variable when hunting noms.
> 
> ## Media
> <!-- 
> PRs which make ingame changes (adding clothing, items, new features,
etc) are required to have media attached that showcase the changes.
> Small fixes/refactors are exempt.
> Any media may be used in SS14 progress reports, with clear credit
given.
> 
> If you're unsure whether your PR will require media, ask a maintainer.
> 
> Check the box below to confirm that you have in fact seen this (put an
X in the brackets, like [X]):
> -->
> 
>
https://github.com/space-wizards/space-station-14/assets/732532/29139d1a-98e4-4b64-9670-cd2ef284d1b1
> 
> 
> - [x] I have added screenshots/videos to this PR showcasing its
changes ingame, **or** this PR does not require an ingame showcase
> 
> ## Breaking changes
> <!--
> List any breaking changes, including namespace, public
class/method/field changes, prototype renames; and provide instructions
for fixing them. This will be pasted in #codebase-changes.
> -->
> 
> **Changelog**
> 🆑
> - tweak: Food and drink stocks in vending machines has been reduced to
encourage people to use the kitchen and bar.
> 


</details>

Co-authored-by: SimpleStation14 <Unknown>
2024-05-09 01:45:03 -04:00
metalgearsloth
b1ee2d48ff Unrevert audio (#21330)
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
2023-12-02 20:16:36 +01:00
Nemanja
7f3846b7c0 Reduce vendor restocking time + some code cleanup (#16025) 2023-05-03 15:38:03 +10:00
Leon Friedrich
19277a2276 More DoAfter Changes (#14609)
* DoAfters

* Compact Clone()

* Fix mice and cuffables

* Try generalize attempt events

* moves climbabledoafter event to shared, fixes issue with climbable target

* Fix merge (cuffing)

* Make all events netserializable

* handful of doafter events moved

* moves the rest of the events to their respective shared folders

* Changes all mentions of server doafter to shared

* stop stripping cancellation

* fix merge errors

* draw paused doafters

* handle unpausing

* missing netserializable ref

* removes break on stun reference

* removes cuffing state reference

* Fix tools

* Fix door prying.

* Fix construction

* Fix dumping

* Fix wielding assert

* fix rev

* Fix test

* more test fixes

---------

Co-authored-by: keronshb <keronshb@live.com>
2023-04-02 21:13:48 -04:00
deltanedas
98b02b3d97 make emagged marker component (fixed version of #13867) (#14096)
* The all-in-one hacking solution
The thinking man's lockpick
The iconic EMAG

* emagged medbay's stasis bed

* left med, emagged sec' apc

* went back to chem, emagged the dispenser

* emagged the fax while i was there

* had a donut while waiting for emag to charge

* i broke into the bridge then announced 'mandatory johnson inspection in medical'

* get system instead of dependency

* feedback

* net suggestion

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>

* use EnsureComp and import NetworkedComponent

---------

Co-authored-by: deltanedas <user@zenith>
Co-authored-by: deltanedas <deltanedas@laptop>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2023-02-18 19:03:06 -06:00
Vordenburg
5553976d70 Add supplies to restock vending machines. (#11506) 2023-01-01 15:42:56 -08:00
Nemanja
faca40b8d5 more component ref removal + combining server/client comps (#13178)
Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
2022-12-25 05:28:21 +01:00
Andreas Kämper
42f3155c85 Clean up vending machines and port their visualizer (#10465) 2022-08-31 05:12:09 -07:00
Leon Friedrich
5449e7875e Vending visualizer update (#9962) 2022-07-26 10:35:36 +10:00