Commit Graph

117 Commits

Author SHA1 Message Date
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
themias
a32c5e543b Add BreakOnDistance to DoAfterEventArgs (#8902)
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2022-07-04 16:56:31 +10:00
keronshb
f7b1bda3e5 Reorders Sound Systems signatures to match Popup Systems. (#8728) 2022-06-13 09:45:47 +10:00
Chris
fdb32b9bb8 Fix seldom seen bug with food trash (#8762) 2022-06-11 20:33:31 +02:00
Leon Friedrich
ca7960382b Missing nullables (#8634) 2022-06-04 17:17:48 +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
mirrorcult
3cc0eb5f33 Mouse content (#7307) 2022-03-28 13:53:20 -07:00
mirrorcult
0eb0a2634f Fix eat verb (#7306) 2022-03-27 15:50:48 -07:00
Vera Aguilera Puerto
ba566ff216 Fix food eat message not having loc argument passed in. 2022-03-23 16:08:44 +01:00
Leon Friedrich
bfd95c493b hands ECS (#7081) 2022-03-17 18:13:31 +11: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
mirrorcult
903dabf0db Jumpsuit butchering and gauze crafting (#6787)
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2022-03-01 14:38:39 +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
Leon Friedrich
ad9ddf1552 Reduce action blocker uses and add target entity to CanInteract (#6655) 2022-02-15 15:06:52 +11:00
Leon Friedrich
1c9ffdc78c Replace VerbTypes with verb classes (#6525) 2022-02-10 13:30:59 +11:00
metalgearsloth
dc38a8a149 Dedupe lots of nutrition and fix usedelay (#6406) 2022-02-07 00:37:38 +11:00
Leon Friedrich
dd61fb46ea Adjust interaction ordering & interaction conditions (#6387) 2022-02-05 13:39:01 +11:00
metalgearsloth
cfd2e28eae ECS usedelay (#6348) 2022-01-31 00:27:29 +11:00
Kara D
2f033ae26f forcefeed collide resolve 2022-01-24 13:06:51 -07:00
Paul Ritter
512d6a38c3 get that crap outta here (completely rewrites inventorysystem) (#5807)
* some work

* equip: done
unequip: todo

* unequipping done & refactored events

* workin

* movin

* reee namespaces

* stun

* mobstate

* fixes

* some work on events

* removes serverside itemcomp & misc fixes

* work

* smol merge fix

* ports template to prototype & finishes ui

* moves relay & adds containerenumerator

* actions & cuffs

* my god what is actioncode

* more fixes

* im loosing my grasp on reality

* more fixes

* more work

* explosions

* yes

* more work

* more fixes

* merge master & misc fixed because i forgot to commit before merging master

* more fixes

* fixes

* moar

* more work

* moar fixes

* suffixmap

* more work on client

* motivation low

* no. no containers

* mirroring client to server

* fixes

* move serverinvcomp

* serverinventorycomponent is dead

* gaming

* only strippable & ai left...

* only ai and richtext left

* fixes ai

* fixes

* fixes sprite layers

* more fixes

* resolves optional

* yes

* stable™️

* fixes

* moar fixes

* moar

* fix some tests

* lmao

* no comment

* good to merge™️

* fixes build but for real

* adresses some reviews

* adresses some more reviews

* nullables, yo

* fixes lobbyscreen

* timid refactor to differentiate actor & target

* adresses more reviews

* more

* my god what a mess

* removed the rest of duplicates

* removed duplicate slotflags and renamed shoes to feet

* removes another unused one

* yes

* fixes lobby & makes tryunequip return unequipped item

* fixes

* some funny renames

* fixes

* misc improvements to attemptevents

* fixes

* merge fixes

Co-authored-by: Paul Ritter <ritter.paul1@gmail.com>
2021-12-30 22:56:10 +01:00
Paul
97e47178d7 Revert "fixes a bunch of warnings"
This reverts commit d4d85b663f.
2021-12-20 15:20:27 +01:00
Paul
d4d85b663f fixes a bunch of warnings 2021-12-20 13:58:30 +01:00
Leon Friedrich
7f81f0b8b8 Add more pretty strings to logs (#5768) 2021-12-13 12:22:58 +01:00
Vera Aguilera Puerto
f6371c6e62 Make all current admin logs use ToPrettyString 2021-12-11 16:00:10 +01:00