Commit Graph

50 Commits

Author SHA1 Message Date
Aera Aulin 2261ec8f5f merge master and hope things don't break 2025-03-13 11:28:14 -07:00
ScarKy0 fd77e8d86b Seperate EMAG into EMAG and Authentication Disruptor (#34337) 2025-02-14 16:09:47 +00:00
Niels Huylebroeck 810880d840 Turn off PointLights on VendingMachines when broken or off. (#33513)
The light itself should already turn off due to `LitOnPowered`
component, but the broken state of a VendingMachine did not.

Fixes  #33382
2024-12-07 21:46:52 +00:00
goet 8847889eeb Fix contraband never getting added to vend inventory (#32431)
* fix contraband never getting added to vend inventory

* Revert "fix contraband never getting added to vend inventory"

This reverts commit e7fb3a60c3cb6fcbf41d7f015f13dbc7b1c1901d.

* readd setter method to system

* fix again without reparenting
2024-10-02 11:38:42 +01:00
metalgearsloth 845a04c1d7 Predict vending machine BUI (#32376) 2024-10-02 11:24:27 +01:00
metalgearsloth f8b8ec7994 Power stuff (#31314)
* Power stuff

- Add shared IsPowered
- Add shared ResolveApc
- Move PowerChangedEvent to shared for now
- Add SlimPoweredLight that actually functions how you'd expect a PoweredLight to function it id didn't have a bunch of bloat on it.

* big update

* boing
2024-08-27 01:00:42 +01:00
Robert V 49fd5c2b58
Allow vending machines to be repaired (#28920)
Vending machines can be repaired
2024-07-05 20:34:38 +02:00
Repo ead8267de2
Fix wall vending machines spawning items in walls. (#28279)
* Find spawning of wall vending machines.

* Review fixes
2024-06-01 17:17:43 +02:00
metalgearsloth 1d63b4cfcb
Content update for UI prediction (#27214)
* Content update for UI refactor

* Big update

* Sharing

* Remaining content updates

* First big update

* Prototype updates

* AUGH

* Fix UI comp ref

* Cleanup

- Fix predicted message, fix item slots, fix interaction range check.

* Fix regressions

* Make this predictive

idk why it wasn't.

* Fix slime merge

* Merge conflict

* Fix merge

(cherry picked from commit 5896e6875266b22c565009b5d45f60ceb981d90a)
2024-05-03 00:15:32 +02:00
Tayrtahn fc280ed0c5
Separate "thank you" messages from general ads (#25867)
* Separated "thank you" messages from general ads

* Moved MessagePackPrototype to shared, cleaned up AdvertiseComponent, and actually killed AdvertisementsPackPrototype.
+More suggests changes.

* Rename PackPrototypeID to Pack in both components.

(cherry picked from commit 794a447bb7f0a36abaac802e0fa4d1ce7c8998ef)
2024-04-07 14:10:23 +02:00
LordCarve cd0b4082bd
Unify `Content`'s `EntitySystem` logging (#26216)
Use Log with generated sawmill name rather than explicitly named one for all non rule-based Content EntitySystems.

(cherry picked from commit eeaea6c25b496106eb741e93738f2ab8503949ba)
2024-03-23 23:51:39 +01:00
Ed 25dbae8f9c
Lock Anomaly generator to research access (#24464)
* small patch

* fix

* remove garbage

* fix

* moved to shared events

* fix

* LocId

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
(cherry picked from commit 498ad2d5d714c73d9212bda9d3d89d53b2001e04)
2024-02-08 12:11:07 +01:00
LordCarve 3dfd479199
DamageSpecifier Total => GetTotal (#24160)
* DamageSpecifier [Obsolete] Total => GetTotal()

* Remove obsolete Total member from DamageSpecifier.

(cherry picked from commit c77eb8691dc08d384a88ddaf3b734f7777d741b5)
2024-01-27 23:42:35 +01:00
Pieter-Jan Briers 56fb80ad34
BUI bugfixes / improvements (#23881)
* Fix ActivatableUIRequiresPowerCellComponent stopping power draw when one of two people closes the UI.

Also fixes it to check UiKey properly.

* Remove unnecessary CrewManifestViewer on PDAs

This is for a pop-up crew manifest UI, which the PDA doesn't use.

* Fix BoundUIClosedEvents that didn't check UI key/not correctly at least.

Uses the new helper method in engine.

* Fix drone (cargo shuttle) pilot console UI breaking if two people open it and one person closes it.

* Fixes for disposal router/tagger UI.

Code was badly copy pasted without changing identifiers, never worked.

Also cleaned up some of the logic (text trimming, sounds).

Also removed the "refuse to work if you have something in your active hand" check like why.

* Avoid running most ActivatableUIComponent logic when closing a UI via toggle

Activating the UI while it's already open closes it via toggle. Except it still ran 99% of the "attempting to open" logic which makes no sense.

This probably fixes a bug or some other dumb behavior somewhere.

* Bitch

(cherry picked from commit 123a4147dea2945f6c60fe9e4e0a3aa2da75e1dc)
2024-01-26 22:38:21 +01:00
Tayrtahn 7ff87f4feb
Fix vending machine thank you flag timing (#24049)
Fix thank you flag timing

(cherry picked from commit 055d62f560500765f5893445733423c12b0c3427)
2024-01-26 22:36:38 +01:00
Tayrtahn 95f71103e8
Fix fatal error when closing vending machine wire UI (#23815)
That's a whoops on my part

(cherry picked from commit be118013a949389ca98b3ab8ba3307eb867706af)
2024-01-26 22:21:18 +01:00
Tayrtahn 879e8b2cb3
Reduce vendor thank you message spam and add variety (#23746)
* Moved vendor thank you messages into AdvertisementPack, making them vendor-specific.
Wrote a few example messages.

* Only display thank yous when closing the UI after a purchase.

* Tweaked a few messages

* More custom messages

* Missed one

(cherry picked from commit eb9770efb91fab68696938008fedb5ab1a10f15f)
2024-01-26 22:14:58 +01:00
lzk 20471b116d
Make only advertise vendors say thanks for using (#23726)
* :trollface:

* :trollface: 2

(cherry picked from commit 945a402d109ca5b5f5fd40fa86030da3bd37a787)
2024-01-26 22:12:04 +01:00
lzk 17f4ecbab5
Vendors now will say "Thanks for using!" (#23023)
* comit1

* comit2

* comit 3

* Update Content.Server/VendingMachines/VendingMachineSystem.cs

---------

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
(cherry picked from commit 59e758ae2a889a699e991da090cd7e741cef2ecb)
2024-01-26 21:29:29 +01:00
metalgearsloth d084dd2efb Fix component constraints (#20241) 2023-09-27 21:59:12 +02:00
DrSmugleaf c71f97e3a2
Refactor actions to be entities with components (#19900) 2023-09-08 18:16:05 -07:00
Leon Friedrich af79f369ae
Remove outdated access reader method. (#19765) 2023-09-03 11:05:22 +10:00
metalgearsloth 68480af109
Update content vectors to numerics (#17759) 2023-07-08 14:08:32 +10:00
metalgearsloth f7950d07e2
Revert "Revert "Emp more effects" (#16159)" (#16165)
This reverts commit 0da5a78509.
2023-05-06 11:26:04 -04:00
metalgearsloth 0da5a78509
Revert "Emp more effects" (#16159) 2023-05-06 20:45:49 +10:00
Slava0135 4d47562dde
Emp more effects (#14550)
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2023-05-06 11:38:09 +10: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
metalgearsloth 377f473ced
Change pricingsystem a bit (#14470) 2023-03-24 15:27:55 +11:00
keronshb 9ebb452a3c
DoAfter Refactor (#13225)
Co-authored-by: DrSmugleaf <drsmugleaf@gmail.com>
2023-02-25 01:01:25 +01: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
Nemanja d87d8f2886
predict emag and make blessed record struct events (#13623) 2023-01-22 02:12:45 +11: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
Leon Friedrich 881a2b2ece
PopupSystem public methods rejig (#12830) 2022-12-19 08:41:47 +11:00
Leon Friedrich 6917b0fe17
Misc audio and related changes for replays (#12578) 2022-11-22 11:49:48 +11:00
metalgearsloth 0b38589728
Raise power events by ref and not broadcast (#11923)
Also some other minor stuff.
2022-10-14 23:08:15 -05:00
metalgearsloth ad7a851e27
Cargo economy balance (#11123)
Co-authored-by: Visne <39844191+Visne@users.noreply.github.com>
2022-09-15 11:53:17 +10: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
EmoGarbage404 f5e11102ba
Vending Machine Abuse (#8863)
* piece of shit i'll abuse your vending ass

* placeholder

* Update types.yml

* threshold
2022-06-23 14:52:28 +10:00
keronshb f7b1bda3e5
Reorders Sound Systems signatures to match Popup Systems. (#8728) 2022-06-13 09:45:47 +10:00
keronshb d5620aa833
AccessReader IsAllowed use resolve (#8527) 2022-06-01 08:26:50 -07:00
metalgearsloth 2d873a2cf2
Add static "IsPowered" method (#8434)
* Add static "IsPowered" method

* Use IsPowered in more places

Co-authored-by: wrexbe <wrexbe@protonmail.com>
2022-05-26 17:36:12 -07: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
Alex Evgrashin 50ae467c76
Remove IDestroyAct, IBreakAct (#7876) 2022-05-02 15:43:25 -07:00
Rane 7a6d3e69a8
Emaggable vendors + Familiars for Chaplain (#6961) 2022-04-17 17:16:02 +10:00
Leon Friedrich de190e4e2f
Throw out throw helpers (#7195) 2022-03-24 00:33:01 +11:00
Rane 926e36d81d
Convert almost all IActivate instances that open UIs to ActivatableUI (#7028)
* Chem master

* Drone support for handhelds

* Vending machines, scanners

* Cloners, R&D computers

* make research a little less sussy

* Unfuck wires

* PA control computer

* Unfuck merge

* Clean up git gore for good

* Disposals

* Microwaves

* paper

* Magic mirror

* More vendors for drones

* Solar computer whitelist

* EFR review updates
2022-03-12 11:26:06 -07:00
Fishfish458 b837b186a5
Attempted Small Vending Machine Refactor (#6157)
Co-authored-by: fishfish458 <fishfish458>
2022-01-31 15:16:41 +11:00