Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
23,871 Commits 1 Branch 0 Tags
dc64a19475fb7e087ee91c1952ea2b64aee55ae7
Commit Graph

48 Commits

Author SHA1 Message Date
ThereDrD0
9251e909ab Fix popups (#176) 
* fix: fix popups

* fix: fix naming for backstab
 2024-03-04 13:56:23 +07:00
ThereDrD0
be32d673cb Меньше попапов в чат (#143) 
* add: less popups in chat

* fix: less brackets
 2024-02-29 17:36:13 +07:00
Aviu00
22db173b81 Merge branch 'final-version' into upupup 2024-02-05 10:24:33 +03:00
Ed
498ad2d5d7 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>
 2024-02-01 19:45:24 +11:00
Remuchi
3a08b81d53 перенос общих файлов из папки White в _White 2024-01-28 18:37:24 +07:00
Remuchi
1e4ad59270 перенос файлов сервера из папки White в _White 2024-01-28 18:18:54 +07:00
Aviu00
d3cd3c430a Upstream upstream 2024-01-27 09:34:07 +03:00
Aviu00
6bd97b4987 Привязка банковского аккаунта (#506) 
* Sustenance vend price fix

* Account link
 2024-01-25 14:35:44 +03:00
Aviu00
0962aa2978 Твики (#491) 
* Economy additions

* Tweak implant cooldowns

* Cult stuff

* Random appearance aspect nuke ops fix

* Auto shuttle enable on round end

* Holy water threshold
 2024-01-25 08:57:47 +03:00
Aviu00
16c8b95da4 Economy (#403) 
* nasrano

* Add station budget & salary

* Initial balance

* Vending machine UI

* Pricing for vending machines

* Finish economy

* Eftpos

* Finish eftpos

* Put eftpos into lockers

* Vending machine prices

* Small fixes

* Fix atm UI

* Add atms to maps

* fix

* reset

* Add PDA program

* Maps again

---------

Co-authored-by: Mona Hmiza <>
Co-authored-by: rhailrake <49613070+rhailrake@users.noreply.github.com>
 2024-01-24 13:04:22 +03:00
LordCarve
c77eb8691d DamageSpecifier Total => GetTotal (#24160) 
* DamageSpecifier [Obsolete] Total => GetTotal()

* Remove obsolete Total member from DamageSpecifier.
 2024-01-21 18:59:14 -07:00
Pieter-Jan Briers
123a4147de 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
 2024-01-14 18:18:39 +11:00
Tayrtahn
055d62f560 Fix vending machine thank you flag timing (#24049) 
Fix thank you flag timing
 2024-01-14 12:43:05 +11:00
Tayrtahn
be118013a9 Fix fatal error when closing vending machine wire UI (#23815) 
That's a whoops on my part
 2024-01-09 17:05:40 -05:00
Tayrtahn
eb9770efb9 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
 2024-01-08 18:34:47 -07:00
lzk
945a402d10 Make only advertise vendors say thanks for using (#23726) 
* :trollface:

* :trollface: 2
 2024-01-08 11:54:05 +03:00
lzk
59e758ae2a 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>
 2024-01-03 17:21:53 -05:00
metalgearsloth
9f9577acd0 Fix component constraints (#20241) 2023-09-20 10:12:48 +10: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