Angelo Fallaria
20a5dd20f3
Fix a funny bug trying to send popup into food instead of target
...
(cherry picked from commit c8093166fa45e67898f234c05579ae77f4c76ab6)
2025-01-20 20:47:45 +03:00
Angelo Fallaria
d55c907c39
add popup for eat success
...
(cherry picked from commit dd5ee5a5be7473f744216903fe1d9fcb83becc45)
2025-01-20 20:47:41 +03:00
Angelo Fallaria
c930b73fe3
increase brain eat delay and show popup when trying to eat brain
...
(cherry picked from commit 558578399f24a1e6c0bb3818d123795e4350662e)
2025-01-20 20:47:36 +03:00
sleepyyapril
885ee5a831
Wizmerge for Station AI ( #1351 )
...
<!--
This is a semi-strict format, you can add/remove sections as needed but
the order/format should be kept the same
Remove these comments before submitting
-->
# Description
the adding AI is now up to y'all because i'm not touching loadout code
for name datasets, but it shouldn't be too bad from here
---------
Signed-off-by: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com >
Signed-off-by: SolStar <44028047+ewokswagger@users.noreply.github.com >
Signed-off-by: deltanedas <39013340+deltanedas@users.noreply.github.com >
Co-authored-by: themias <89101928+themias@users.noreply.github.com >
Co-authored-by: Verm <32827189+Vermidia@users.noreply.github.com >
Co-authored-by: DrSmugleaf <10968691+DrSmugleaf@users.noreply.github.com >
Co-authored-by: Sphiral <145869023+SphiraI@users.noreply.github.com >
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com >
Co-authored-by: Mr. 27 <45323883+Dutch-VanDerLinde@users.noreply.github.com >
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com >
Co-authored-by: Alzore <140123969+Blackern5000@users.noreply.github.com >
Co-authored-by: ravage <142820619+ravage123321@users.noreply.github.com >
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com >
Co-authored-by: Intoxicating-Innocence <188202277+Intoxicating-Innocence@users.noreply.github.com >
Co-authored-by: Saphire <lattice@saphi.re >
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com >
Co-authored-by: Errant <35878406+Errant-4@users.noreply.github.com >
Co-authored-by: Tayrtahn <tayrtahn@gmail.com >
Co-authored-by: CaasGit <87243814+CaasGit@users.noreply.github.com >
Co-authored-by: BramvanZijp <56019239+BramvanZijp@users.noreply.github.com >
Co-authored-by: Boaz1111 <149967078+Boaz1111@users.noreply.github.com >
Co-authored-by: NakataRin <45946146+NakataRin@users.noreply.github.com >
Co-authored-by: Kara <lunarautomaton6@gmail.com >
Co-authored-by: Plykiya <58439124+Plykiya@users.noreply.github.com >
Co-authored-by: SlamBamActionman <slambamactionman@gmail.com >
Co-authored-by: Doomsdrayk <robotdoughnut@comcast.net >
Co-authored-by: Brandon Hu <103440971+Brandon-Huu@users.noreply.github.com >
Co-authored-by: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com >
Co-authored-by: ElectroJr <leonsfriedrich@gmail.com >
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com >
Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com >
Co-authored-by: Julian Giebel <juliangiebel@live.de >
Co-authored-by: nikthechampiongr <32041239+nikthechampiongr@users.noreply.github.com >
Co-authored-by: Repo <47093363+Titian3@users.noreply.github.com >
Co-authored-by: Chief-Engineer <119664036+Chief-Engineer@users.noreply.github.com >
Co-authored-by: icekot8 <93311212+icekot8@users.noreply.github.com >
Co-authored-by: AJCM-git <60196617+AJCM-git@users.noreply.github.com >
Co-authored-by: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com >
Co-authored-by: no <165581243+pissdemon@users.noreply.github.com >
Co-authored-by: Tornado Tech <54727692+Tornado-Technology@users.noreply.github.com >
Co-authored-by: osjarw <62134478+osjarw@users.noreply.github.com >
Co-authored-by: Simon <63975668+Simyon264@users.noreply.github.com >
Co-authored-by: TGRCDev <tgrc@tgrc.dev >
Co-authored-by: Milon <milonpl.git@proton.me >
Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com >
Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com >
Co-authored-by: Fildrance <fildrance@gmail.com >
Co-authored-by: pa.pecherskij <pa.pecherskij@interfax.ru >
Co-authored-by: chavonadelal <156101927+chavonadelal@users.noreply.github.com >
Co-authored-by: SolStar <44028047+ewokswagger@users.noreply.github.com >
Co-authored-by: K-Dynamic <20566341+K-Dynamic@users.noreply.github.com >
Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com >
Co-authored-by: ArchRBX <5040911+ArchRBX@users.noreply.github.com >
Co-authored-by: archrbx <punk.gear5260@fastmail.com >
Co-authored-by: Radezolid <snappednexus@gmail.com >
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com >
Co-authored-by: EmoGarbage404 <retron404@gmail.com >
Co-authored-by: MilenVolf <63782763+MilenVolf@users.noreply.github.com >
Co-authored-by: Velcroboy <107660393+IamVelcroboy@users.noreply.github.com >
Co-authored-by: Velcroboy <velcroboy333@hotmail.com >
Co-authored-by: neuPanda <chriseparton@gmail.com >
Co-authored-by: neuPanda <spainman0@yahoo.com >
Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com >
Co-authored-by: Whatstone <whatston3@gmail.com >
Co-authored-by: VideoKompany <135313844+VlaDOS1408@users.noreply.github.com >
(cherry picked from commit 93ed70acfeda357133a701f637d3faeec02749bb)
2025-01-14 00:13:42 +03:00
Angelo Fallaria
23fc467bd1
New Trait: Voracious ( #668 )
...
# Description
**Voracious** is a 1-point Physical trait that makes you eat and drink
twice as fast.
Inspired by the SS13 trait of the same name. Roughly based on the
Parkstation implementation of Voracious by @DEATHB4DEFEAT.
## Technical Details
The new component `ConsumeDelayModifierComponent` is rather generic, and
can decrease or _increase_ the consumption speed of food and/or drinks.
This gives room to add a negative trait that includes slower
eating/drinking.
## Media

# Changelog
🆑 Skubman
add: Add the Voracious trait, a 1-point trait that makes you eat and
drink twice as fast.
2024-08-04 10:30:31 +01:00
DEATHB4DEFEAT
da20e7ff60
CVar Food/Drink AutoEating ( #571 )
...
<details><summary><h1>Media</h1></summary>
<p>
https://github.com/user-attachments/assets/1276c50a-b50b-45a9-a69f-17bca32c736c
</p>
</details>
---
# Changelog
🆑
- tweak: You no longer eat food like a starving wolf or something
2024-07-20 08:09:59 +01:00
deltanedas
675397503c
scoopable ash and foam, solution transfer prediction ( #25832 )
...
* move SolutionTransfer to shared and predict as much as possible
* fully move OpenableSystem to shared now that SolutionTransfer is
* fix imports for everything
* doc for solution transfer system
* trolling
* add scoopable system
* make ash and foam scoopable
* untroll
* untroll real
* make clickable it work
* troll
* the scooping room
---------
Co-authored-by: deltanedas <@deltanedas:kde.org>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com >
2024-07-11 21:18:00 -07:00
Magnus Larsen
e0a3cfacea
Fix clientside storage Whitelists ( #24063 )
...
* Fix outdated component name in assaultbelt whitelist
RangedMagazine was replaced with BallisticAmmoProvider in the Gun
refactor (#8301 )
* Move FlashOnTrigger, SmokeOnTrigger, Flash components to Shared
* Move LightReplacerComponent to Shared
* Move Utensil, Mousetrap components to Shared
* Move SprayPainterComponent to Shared
The PaintableAirlock tag has also been removed, as it was unused &
unnecessary, likely a vestige of spray painter development when the
PaintableAirlock component wasn't in Content.Shared.
* Add trivial Produce and Seed components to Client
This allows the plant bag and botanical belt whitelists to correctly
match produce and seeds on the client, fixing the extraneous "Can't
insert" message that previously appeared.
---------
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com >
(cherry picked from commit 9cd6e4dccdfaa7e273417e3c94d66b5171c7d841)
2024-02-08 12:22:58 +01:00
themias
a626bb6754
fix mice eating ( #23801 )
...
* fix mice eating
* actually just ignore utensils
(cherry picked from commit 3fb0bd9d4b13fe828889b5ce9aea960c89dd5f4d)
2024-01-26 22:19:31 +01:00
GreyMario
22ea3e1656
Checking for used utensils actually happens now ( #23766 )
...
checking for utensils actually happens now
(cherry picked from commit f2647ac8d421642420b53ea5574f654390039d7b)
2024-01-26 22:16:35 +01:00
TemporalOroboros
ce27944275
Revert 'Revert 'Solution Entities'' ( #23168 )
...
(cherry picked from commit d23c8d5c19e56a582b6b12f832bd318efbdac7c7)
2024-01-23 23:00:42 +01:00
Debug
18f0af1f68
Implement gridinv, proper ( #703 )
...
* Implement gridinv, 1500 squashed commits :elp:
* Me when
* Linter errors
* Fix katana belts
2024-01-21 19:58:28 +01:00
metalgearsloth
b1ee2d48ff
Unrevert audio ( #21330 )
...
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com >
2023-12-02 20:16:36 +01:00
deltanedas
9183b2b5b7
moths can eat goat wool ( #21704 )
...
* add Wooly system
* add RequireDead to Food
* minor fix+cleanup and fix repeating
* minor fix+cleanup and fix repeating
* make goat wooly
---------
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-11-19 22:22:01 +01:00
Nemanja
41b8a8960d
fix feeding unremovable items ( #21234 )
2023-10-31 18:45:36 +01:00
TemporalOroboros
8c55d3e5ce
Moves SolutionContainerManagerComponent to Shared. ( #20944 )
2023-10-14 22:07:17 +02:00
DrSmugleaf
4877e2aaf8
Replace string data fields with LocId where relevant ( #20883 )
2023-10-14 22:02:30 +02:00
deltanedas
2e3dada5e1
fix moth z on clothes eating ( #20456 )
2023-09-27 21:59:12 +02:00
deltanedas
06a7aa82a2
Openable refactor ( #19750 )
2023-09-27 21:59:12 +02:00
metalgearsloth
f38f0ab614
Predict StorageComponent ( #19682 )
2023-09-27 21:59:12 +02:00
metalgearsloth
c9648da984
Content update for NetEntities ( #18935 )
2023-09-27 21:59:12 +02:00
Visne
c7b21b631b
Remove unused dependencies ( #19490 )
2023-08-24 09:55:15 -08:00
LankLTE
6b2fef1ac8
small moth changes ( #18810 )
...
* changes
* fix test fail hopefully
* disallow eating containers
* no more eating stored stuff
2023-08-08 22:05:05 -06:00
LankLTE
70545f4873
Moths. ( #18593 )
2023-08-04 15:21:28 +10:00
deltanedas
2bef7bfa38
magic bread wand ( #17044 )
...
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-06-03 12:08:52 -07:00
brainfood1183
c99585c94f
Toy Box filled with toys (ready for merge) ( #16252 )
2023-06-03 13:31:47 +10:00
Leon Friedrich
65088ab7ef
Fix some food mispredicts ( #16183 )
2023-05-07 12:58:20 +10:00
Tunguso4ka
ce867724a7
Uranium is now edible! ( #15952 )
2023-05-06 17:23:05 +10:00
Kara
133cbcbe88
Special digestion & kudzu-eating ( #16061 )
2023-05-04 12:49:25 +10:00
metalgearsloth
ca07522c03
NPC utility queries ( #15843 )
2023-05-01 14:57:11 -04:00
Leon Friedrich
df1f8dd52a
Allow eating and drinking to be cancelled. ( #15434 )
2023-04-23 01:35:57 -04:00
metalgearsloth
ae01618874
Revert "Revert "Replace ResourcePath with ResPath ( #15308 )" (#155… ( #15566 )
2023-04-20 20:16:01 +10:00
metalgearsloth
acf79a8209
Revert "Replace ResourcePath with ResPath ( #15308 )" ( #15551 )
2023-04-20 11:43:54 +10:00
Ygg01
71f358a027
Replace ResourcePath with ResPath ( #15308 )
2023-04-19 23:39:17 +10:00
Leon Friedrich
e81f47dc13
Fix drinking and eating with a mask on ( #15468 )
2023-04-17 17:56:42 +10:00
keronshb
c6aae19a16
Adds repeating DoAfters to Food and Drink ( #15233 )
2023-04-16 08:14:26 +10:00
DrSmugleaf
b947856431
Remove hands component reference ( #15197 )
2023-04-07 11:21:12 -07:00
keronshb
e1cd163344
Multiple uses on Food/Drink won't cancel the do-after anymore ( #15163 )
...
* stops do-afters from cancelling if food/drink is used twice
* Update DrinkSystem.cs
2023-04-05 19:47:20 -07: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
keronshb
5e8bd137f6
Round 4 of Doafter fixes ( #14476 )
2023-03-09 01:45:19 -07:00
keronshb
eff088189d
Another batch of DoAfter fixes ( #14351 )
2023-03-04 21:26:03 -08:00
Mr0maks
1d0e5cca3a
Food system locale fix ( #14365 )
2023-03-02 23:19:55 -08:00
metalgearsloth
44fb8a9e2d
Fix rsi sprite access for verbs ( #14284 )
2023-02-26 18:48:57 +11:00
keronshb
ec739c24da
DoAfter Refactor Fixes ( #14278 )
...
* Doafterfixes
* Injector blocker
2023-02-25 23:33:06 -06:00
keronshb
9ebb452a3c
DoAfter Refactor ( #13225 )
...
Co-authored-by: DrSmugleaf <drsmugleaf@gmail.com >
2023-02-25 01:01:25 +01:00
Chief-Engineer
41a483113b
fix flipped actor and target ( #14009 )
2023-02-10 08:28:31 +00:00
Jezithyr
eeb5b17b34
Mobstate Refactor ( #13389 )
...
Refactors mobstate and moves mob health thresholds to their own component
Co-authored-by: DrSmugleaf <drsmugleaf@gmail.com >
2023-01-13 16:57:10 -08:00
Leon Friedrich
466384b081
Solution rejig ( #12428 )
2023-01-12 14:41:40 +11:00
Jezithyr
5f9b4adf47
Cleaned up obsolete properties from MobStateComponent ( #13097 )
...
Co-authored-by: Jezithyr <Jezithyr@gmail.com >
2022-12-19 21:25:35 -06:00
Leon Friedrich
881a2b2ece
PopupSystem public methods rejig ( #12830 )
2022-12-19 08:41:47 +11:00