tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
30,691 Commits 3 Branches 5 Tags
bb864f2b5693d1cd1f7be99e381036f1deac901b
Commit Graph

84 Commits

Author SHA1 Message Date
Brandon Li
26194e2f41 Fix ItemSlotSystem popup Logic (#28856) 
* move popup call out of `CanInsert` into `OnInteractUsing`

* im stupid and `reason` is completely unnecessary

Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>

* return early when `itemSlots.Slots.Count == 0`

* tweak logic for triggering popups

* change popup logic again

* Consolidate whitelist check

* Get any popup message not just last failed slot

* Apply suggestions from code review

Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>

* yoink

Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>

---------

Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>
Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>
 2024-11-01 20:33:26 -05:00
ShadowCommander
7ceb2d2507 Add a method to get the first available ItemSlot (#29846) 
* Add a method to get the first available ItemSlot

* Make TryInsertEmpty use TryGetAvailableSlot

* Add param doc comments
 2024-09-19 09:55:53 +10:00
metalgearsloth
c0a07614c0 ItemToggle + slots stuff (#31312) 
* ItemToggle + slots stuff

- Add component for itemslot locks to match LockComponent (surprised this didn't exist).
- Add thing for pointlight to match itemtoggle. In future should be used for PDAs and stuff but need to fix some other stuff first.

* Also this

* grill
 2024-08-25 22:30:28 +10:00
Plykiya
d6ba166d3b Replace obsolete EntityWhitelist IsValid usages (#28465) 
* Replace obsolete whitelist is valid with whitelist system

* Consistency

* Fix logic

* Bork

* I figured out how to get whitelists on the client lol

* test fail

* woops

* HELP ME FUNCTIONS

* Fix errors

* simplify

---------

Co-authored-by: plykiya <plykiya@protonmail.com>
 2024-06-01 23:10:24 -04:00
DrSmugleaf
0e0f50f3d1 Prioritize empty item slots when inserting (#28203) 
* Prioritize empty item slots when inserting

* Revert "Prioritize empty item slots when inserting"

This reverts commit 4272a65cba5fc18df801812b0af20123aec08409.

* Prioritize empty item slots when inserting

* Try drop

* Check for any can insert before dropping
 2024-05-23 14:16:14 +10:00
metalgearsloth
5896e68752 Content update for UI prediction (#27214) 
* Content update for UI refactor

* Big update

* Sharing

* Remaining content updates

* First big update

* Prototype updates

* AUGH

* Fix UI comp ref

* Cleanup

- Fix predicted message, fix item slots, fix interaction range check.

* Fix regressions

* Make this predictive

idk why it wasn't.

* Fix slime merge

* Merge conflict

* Fix merge
 2024-04-26 18:16:24 +10:00
metalgearsloth
fc4389f2d7 Fix itemslots swapping (#25634) 
Fix itemslots prediction
 2024-03-30 14:31:47 +11:00
Tayrtahn
4a83c36585 Code cleanup: Dirty(Comp) (#26238) 
* Replaced uses of Dirty(Component) with Dirty(Uid, Component)
Modified some systems (notably pulling-related) to use uids.

* Missed a few

* Revert changes to pulling

* No
 2024-03-19 23:27:02 -04:00
LordCarve
06d755a860 Make ItemSlots more verbose + AME proof of concept (#25779) 
* Make itemslots more verbose with AME proof of concept.

* Remove unnecessary [DataField] strings and use null coalescing in whitelist checks.

* Change optional popup fields into LocId.
 2024-03-03 16:37:34 +11:00
Krunklehorn
6485dd4f4d Revert "Fix ItemSlots prediction" (#25610) 
Revert "Fix ItemSlots prediction (#25552)"

This reverts commit ad29dbe302.
 2024-02-27 23:32:16 +11:00
metalgearsloth
ad29dbe302 Fix ItemSlots prediction (#25552) 
IDK what this arg is for but seems okay with guns. Without it it always thinks the insertion can work.
 2024-02-25 12:22:43 -08:00
Nemanja
58d518a2a0 Fix small logic issue in item slot swapping (#23378) 
fix swapping item slots sometimes failing
 2024-01-03 17:16:37 +11:00
TemporalOroboros
7a77d6d5dd Content ecs containers (#22484) 2023-12-28 01:30:03 -04:00
Kara
fdf718e586 Reimplement smart equipping (#22815) 
* Reimplement smart equipping

* inv prediction fix

* oops
 2023-12-22 01:17:09 +11:00
metalgearsloth
269c93245d Unrevert audio (#21330) 
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
 2023-11-27 22:12:34 +11:00
metalgearsloth
64343c289d Revert Arch testmerge 2 (#21901) 2023-11-26 14:20:07 +11:00
metalgearsloth
855ab4d129 Update submodule to 182.1.0 (#21900) 2023-11-26 13:53:54 +11:00
metalgearsloth
d4bed09cdc Revert the other arch changes (#21871) 2023-11-24 11:19:46 +11:00
metalgearsloth
93bd9972f1 Content arch (#20107) 
Co-authored-by: DrSmugleaf <drsmugleaf@gmail.com>
 2023-11-23 14:34:37 +11:00
metalgearsloth
5b8f3c48c4 Revert "Update submodule to 175.0.0 (#21318)" (#21319) 2023-10-29 15:29:30 +11:00
metalgearsloth
9b1b3e03ed Content audio (#20862) 2023-10-29 14:58:23 +11:00
Doru991
6b04aaf964 Potato battery update + potato AI (#21142) 
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
 2023-10-26 00:52:49 +11:00
DrSmugleaf
f560f88eb5 Remove 700 usages of Component.Owner (#21100) 2023-10-19 12:34:31 -07:00
metalgearsloth
5a0fc68be2 Content update for NetEntities (#18935) 2023-09-11 09:42:41 +10:00
metalgearsloth
4d1c3ae66a Revert "Remove IContainer and move functions to the container system.… (#19975) 2023-09-10 21:46:36 +10:00
deltanedas
24810d916b ninja 2 electric boogaloo (#15534) 
Co-authored-by: deltanedas <@deltanedas:kde.org>
 2023-09-10 16:20:27 +10:00
Leon Friedrich
b45e53603d Remove IContainer and move functions to the container system. (#19834) 2023-09-10 12:16:37 +10:00
Nemanja
98fa00a21f Borgs (#18136) 
* Laws

* positronic brain and PAI rewrite

* MMI

* MMI pt. 2

* borg brain transfer

* Roleban support, Borg job (WIP), the end of mind shenaniganry

* battery drain, item slot cleanup, alerts

* visuals

* fix this pt1

* fix this pt2

* Modules, Lingering Stacks, Better borg flashlight

* Start on UI, fix battery alerts, expand activation/deactivation, low movement speed on no power.

* sprotes

* no zombie borgs

* oh fuck yeah i love a good relay

* charger

* fix the tiniest of sprite issues

* adjustable names

* a functional UI????

* foobar

* more modules

* this shit for some reason

* upstream

* genericize selectable borg modules

* upstream again

* holy fucking shit

* i love christ

* proper construction

* da job

* AA borgs

* and boom more shit

* admin logs

* laws redux

* ok just do this rq

* oh boy that looks like modules

* oh shit research

* testos passo

* so much shit holy fuck

* fuckit we SHIP

* last minute snags

* should've gotten me on a better day
 2023-08-12 16:39:58 -05:00
metalgearsloth
83e3d614f0 Fix ItemSlots compiler warnings (#18226) 2023-07-23 14:48:00 +10:00
themias
4990eee312 Fix duplicate verbs on janitor trolley (#16087) 2023-05-04 11:45:14 -07: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
DrSmugleaf
b947856431 Remove hands component reference (#15197) 2023-04-07 11:21:12 -07:00
ShadowCommander
1c55904cd2 Add Alt-click insertion to ItemSlots (#15094) 2023-04-06 16:49:27 -06:00
metalgearsloth
44fb8a9e2d Fix rsi sprite access for verbs (#14284) 2023-02-26 18:48:57 +11:00
Leon Friedrich
e0dd65983e Don't remove item slots when terminating. (#14042) 2023-02-12 01:14:02 +00:00
Rane
16525082d2 ejectOnBreak ejects locked slots too (#12933) 2023-01-05 05:40:32 +11:00
Chief-Engineer
1db51e93b1 add item slot logs (#13184) 2022-12-27 18:00:48 +01:00
Leon Friedrich
881a2b2ece PopupSystem public methods rejig (#12830) 2022-12-19 08:41:47 +11:00
Mervill
15a772fb96 Cleanup for ChargerComponent (#11907) 2022-10-16 21:21:54 +11:00
Mervill
c11c11bace Unhardcode some logic related to objects with battery slots. Minor fix to fire helmets. (#11734) 2022-10-15 13:15:39 -07:00
Leon Friedrich
581a805063 Replace ItemSlotChangedEvent with EntInsertedIntoContainerMessage (#11934) 2022-10-15 13:03:37 -07:00
0x6273
0c24f8b69b ReagentDispenser ECS (#11418) 2022-10-03 17:57:32 -07:00
metalgearsloth
cd29f475b9 Fix item slot mispredict (#11134) 
On master it replays it every tick so it gets spammed. The server also plays it to the client as well so you get a duplicate.
 2022-09-10 02:39:22 +12:00
Leon Friedrich
c7ad6b709e Audio System Rejig (#9635) 2022-07-29 12:13:12 +10:00
metalgearsloth
b9e876ca92 The real movement refactor (#9645) 
* The real movement refactor

* ref events

* Jetpack cleanup

* a

* Vehicles partially working

* Balance tweaks

* Restore some shitcode

* AAAAAAAA

* Even more prediction

* ECS compstate trying to fix this

* yml

* vehicles kill me

* Don't lock keys

* a

* Fix problem

* Fix sounds

* shuttle inputs

* Shuttle controls

* space brakes

* Keybinds

* Fix merge

* Handle shutdown

* Fix keys

* Bump friction

* fix buckle offset

* Fix relay and friction

* Fix jetpack turning

* contexts amirite
 2022-07-16 13:51:52 +10:00
Leon Friedrich
86f70994bf Network item slots (#9199) 2022-06-27 16:29:14 +10:00
metalgearsloth
8905996cfc Make raiselocalevent not broadcast by default (#8998) 2022-06-22 09:53:41 +10:00
keronshb
f7b1bda3e5 Reorders Sound Systems signatures to match Popup Systems. (#8728) 2022-06-13 09:45:47 +10:00