Commit Graph

93 Commits

Author SHA1 Message Date
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
Chief-Engineer 9da3be09e0
Improve ingestion logging (#12839) 2022-12-02 17:19:44 -08:00
DrSmugleaf f323fb7644
ECS and cleanup body system, merge body templates and presets into body prototypes (#11991)
Co-authored-by: Jezithyr <Jezithyr@gmail.com>
2022-10-22 15:46:28 -07:00
Flipp Syder b5b5e18a87
Flavors on DoAfter, instead of after (#11251) 2022-09-14 12:36:19 +10:00
Flipp Syder 3cfa00e91c
Flavor profiles (#10991)
* flavor profiles

TODO: every single flavor! yeah!!!

* adds basic localization, and flavors/lastFlavor values for when you get the flavor profile message

* multiple and single flavor messages

* start on flavor localization, multiple flavors in localized flavors

* flavor prototypes

* a few more flavors, descriptions on what each section of the flavor file should be doing

* localization for flavor profiles in drink/food system

* adds an event that allows a flavor profile list to be transformed base on the user entity

* raises it on the food entity too

* changes a field in flavor, adds some more flavors, starts adding flavor prototypes

* adds basic flavors to several entities, and consumable drinks, renames flavor field to 'flavors'

* changes call ordering in flavorprofile, adds flavor to ignored components server-side

flavor is really just a popup message, and those are all processed server-side

* fixes where food tried to get the flavor of the user instead of the food

* single flavors will now get the localized string

* getting the flavor message now ensures that flavors are deduplicated

* makes flavor processing more strictly unique bu making everything hashsets

* yeah, that could just not have distinctby now

* adds flavorprofile directly to food base instead for generic food taste

* FlavorProfileModificationEvent now passes a hashset of strings and not flavorprototypes

* flavorprofilesystem now broadcasts the flavor profile modification event

* adds more flavors to the flavor profile loc file

* skips a flavor, if the flavor string is null/empty

* adds some more flavors, adds generic medicine flavor to medicinal chemicals

* more food flavors, adds flavors to swallowing

* adds some cocktails to the set of flavor profiles

* regenerates flavor prototypes

* adds flavor type to all flavors, adds whitespace between variants

* adds more flavors, adds flavors to several chemicals and food items

this is the part that took the longest

* changes backup flavor message

* spelling mistake

* more flavors, and flavors on food

* readds all the type fields, whoops

* fixes localization strings for forcefeeding food/drink

* fixes multiple flavor profile

* adds flavor limit for flavors

* makes that fetch the cvardef instead
2022-09-08 18:14:49 -05:00
Leon Friedrich ddfa328442
Identity loc string fixes (#10137)
Co-authored-by: Kara <lunarautomaton6@gmail.com>
2022-07-30 20:43:38 -07:00
Leon Friedrich c7ad6b709e
Audio System Rejig (#9635) 2022-07-29 12:13:12 +10:00
Nemanja 97d131f5d7
thresholds (#9960) 2022-07-24 21:33:52 +10:00
Kara 2d5ec7f85c
Id[entity] 2.0 (real) (#9612)
* starter API

* network ID cards

* Port more stuff from old identity

* Re-implement identity representation + name updating

* move

* proper name returning for `IdentityName`

* move everything important to server, give in to  temptation

* shared / server / client split sadly. move ensure to shared and spawn to server

* identity update queueing + identityblocker

* fixes

* and just like that it's usable for admins

* huge identity pass

* pass dos

* jesus christ

* figs :D

* fuck u

* fix bad merge.

Co-authored-by: Moony <moonheart08@users.noreply.github.com>
2022-07-10 20:36:53 -05:00