Commit Graph

82 Commits

Author SHA1 Message Date
deltanedas
063f75ca29 let animals drink things (#18236)
* thirst .Owner removal

* thirst file scope

* drink update + minor refactor

* drink file scope

* let animals drink things

* dont eat/drink when dont need to

* admeme mouse override

* moo

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-07-25 15:32:10 -06:00
Kara
44657522f0 Puddle drink fixes (#16661) 2023-05-21 13:05:22 +10:00
Kara
9059185efe Puddle drinking (#16373) 2023-05-13 11:32:57 +10: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
metalgearsloth
317a4013eb Puddles & spreader refactor (#15191) 2023-04-10 15:37:03 +10: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
faint
8b6996cbae DNA basics (#14724)
* DNA component

* Commit numba 2

* Added DNA into Station Records Computer

* commit numba 3

* commit numba 4

* Vomit also contain DNA component now

* fixed DNA field not clearing after scanning another item

* commit numba 10
Drinking leaves DNA on an object. Breaking glasses, bottles and beakers leave DNA and leave fingerprints/fibers with 40% chance on glass shards. + lotta fixes

* 11

* 12

* 14

* Added DNA guide entry

* FIX
2023-03-30 22:49:25 -06:00
keronshb
5e8bd137f6 Round 4 of Doafter fixes (#14476) 2023-03-09 01:45:19 -07:00
Jacob Tong
343ea93d75 Fix drink DoAfter (#14437)
Copies missing arguments from FoodSystem
2023-03-05 23:52:10 -08:00
keronshb
eff088189d Another batch of DoAfter fixes (#14351) 2023-03-04 21:26:03 -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
Scribbles0
2018365958 value change (#14189) 2023-02-20 06:29:15 -06:00
Chief-Engineer
41a483113b fix flipped actor and target (#14009) 2023-02-10 08:28:31 +00:00
Visne
c6d3e4f3bd Fix warnings and code cleanup/fixes (#13570) 2023-01-19 13:56:45 +11:00
metalgearsloth
6c9ce79387 Add lava (#13438) 2023-01-17 11:25:32 -07: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
Checkraze
a1e05a0a13 drink cleanup (#13401) 2023-01-10 03:59:43 -08: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
93584f21db Add entity prototype save test (#10274) 2022-08-17 10:47:58 +10:00
Leon Friedrich
ddfa328442 Identity loc string fixes (#10137)
Co-authored-by: Kara <lunarautomaton6@gmail.com>
2022-07-30 20:43:38 -07: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
Leon Friedrich
54ea493bfe Fix drink system double-refunding solutions on failure (#9569) 2022-07-09 01:53:18 -07:00
Kara
f092f478f7 Satiety tweaks (#9519)
* Satiety tweaks

* actually lets do this
2022-07-07 11:21:26 -07:00
themias
d76ff66d3d Show remaining liquid in a drink when you examine it (#8721)
* Show drink volume on examine

* Approximate measurement unless a beaker

* Changed percentage threshold and added subjectivity

* Update default switch case since it can never be 0 here

* Remove int cast from PercentFull method
2022-06-21 21:02:24 -05:00
keronshb
f7b1bda3e5 Reorders Sound Systems signatures to match Popup Systems. (#8728) 2022-06-13 09:45:47 +10:00
wrexbe
1e0babbd50 Make AdminLogsSystem an IoC manager (#8492)
* Make log not entity system

* Fixes
2022-05-28 23:41:17 -07:00
wrexbe
bc68ac96dd Cleanup the namespaces (#8132) 2022-05-13 17:59:03 +10:00
metalgearsloth
d7168fedd1 Allow do_afters to be spammed (#8074) 2022-05-10 19:48:59 +10:00
Saakra
e48366b42a Added ability to drink from context menu (#7732)
Co-authored-by: Saakra <xfallenfighterswolfx@gmail.com>
2022-04-23 16:38:21 -07:00
Alain Siegrist
6c85e1b255 Prevent closed drinks from transferring reagents (#7329)
* Prevent closed drinks from transferring reagents

* Inherit from cancellable event
2022-04-15 14:17:48 -07:00
metalgearsloth
dc85b4bc80 Allow consuming while moving (#7158) 2022-03-17 12:46:18 +11:00
Leon Friedrich
b1e719c70d Remove IUse (#7074) 2022-03-12 23:33:23 +11:00
Leon Friedrich
4a00d01ced Remove ignore-inside-blocker (#6692)
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2022-02-16 19:40:03 -07:00
mirrorcult
ec4d4688c7 Seal/abstract/virtual everything (#6739) 2022-02-16 18:23:23 +11:00
Leon Friedrich
ad9ddf1552 Reduce action blocker uses and add target entity to CanInteract (#6655) 2022-02-15 15:06:52 +11:00