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

37 Commits

Author SHA1 Message Date
Víctor Aguilera Puerto
c3df108b27 Stripping (#1668) 
* Start work on stripping.

* more strippable work

* Stripping works

* Nullable

* MORE NULLABLE

* nullable moment

* life is pain

* Interaction check.

* Update Content.Client/GameObjects/Components/HUD/Inventory/StrippableBoundUserInterface.cs

Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>

* Update Content.Client/GameObjects/Components/HUD/Inventory/StrippableBoundUserInterface.cs

Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>

* Update Content.Server/GameObjects/Components/GUI/HandsComponent.cs

Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>

* Update Content.Server/GameObjects/Components/GUI/HandsComponent.cs

Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>

* Update Content.Server/GameObjects/Components/GUI/HandsComponent.cs

Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>

* Update Content.Server/GameObjects/Components/GUI/StrippableComponent.cs

Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>

* Update Content.Server/GameObjects/Components/GUI/StrippableComponent.cs

Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>

* Update Content.Server/GameObjects/Components/GUI/HandsComponent.cs

Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>

* Update Content.Server/GameObjects/Components/GUI/StrippableComponent.cs

Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>

* Update Content.Server/GameObjects/Components/GUI/StrippableComponent.cs

Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>

* Update Content.Shared/GameObjects/Components/GUI/SharedStrippableComponent.cs

Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>

* Update Content.Server/GameObjects/Components/GUI/StrippableComponent.cs

Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>

* Rename InventoryComponent and HandsComponent's OnChanged event to OnItemChanged

* Apply suggestions from code review

Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>

* Use static EquipmentSlotDefines

* Do not expose ContainerSlot on Inventory or Hands.

Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
 2020-08-15 20:33:42 +02:00
DrSmugleaf
4a8ed41e3a Fix namespaces and optimize imports (#1651) 
* Fix namespaces and optimize imports

* Cleanup fixes

* Merge conflict fixes

* Merge conflict fixes

* Merge conflict fixes
 2020-08-13 14:40:27 +02:00
Moses
8e08c64fcf Show if items can be placed in a slot when hovering (#1480) 
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
 2020-07-26 14:25:38 +02:00
DrSmugleaf
202954efe2 Remove unused imports (#1431) 
We don't support .Net Framework anymore.
 2020-07-19 17:06:51 -07:00
AJCM-git
ae41d03ec6 Re-organizing the Resources folder. Part 1. (#1234) 
* First commit

* Lockers

* Lockers electric boogaloo

* Crates and Lockers

* Almost finishing the Textures folder

* Updating texture paths. Reminder to fix:
* Lockers
* Windows
* Vending Machines
* APC
* Catwalks
* Bedsheets and Cloaks
* Status effects

* dont know what happened here

* Commit before merge

* re-organizing

* Lockers broken

* Commit before merge

* Submodule

* renaming

* Fixing most issues

* forgot these ones

* Updating submodule

* typo

* Fixing some paths

* fixing some paths

* updating submodule

* (hopefully) fixing the submodule
 2020-07-07 19:19:00 +02:00
Swept
7b98f37f9a Adds neck UI slot and rearranges inventory UI. (#1130) 
* UI Icon

* It worked?

* Reorganized UI

* converted the bedsheet/cloak sprites

* backpacks go over cloaks now

* Added a couple more neck clothing

* Milk Ape
 2020-06-21 22:02:18 +02:00
Pieter-Jan Briers
cf9edddf2f Update submodule, UI fixes. 2020-05-05 23:59:31 +02:00
Pieter-Jan Briers
a535567317 Fix inventory buttons going blank when switching mob. 2020-04-25 00:58:23 +02:00
Pieter-Jan Briers
32f66b6f9e Clothing visualization sets RSI and state atomically. 2020-04-23 16:04:23 +02:00
Jackson Lewis
6a22f2629b Update content repo and RobustToolbox 2020-04-20 10:36:02 +01:00
Pieter-Jan Briers
9beb7e48d4 Implement female uniform masking. 2020-01-21 18:11:15 +01:00
Pieter-Jan Briers
75aa9541e0 Equip clothing to preview dummies in the lobby. 2020-01-20 10:30:06 +01:00
ShadowCommander
e0aaab56e3 Implement StorageButton on HandsGUI and click empty hand to swap… (#517) 
Also moved duplicate sprite view code to ItemSlotManager
 2020-01-18 03:41:47 +01:00
ShadowCommander
d03da83fda Inventory Input (#503) 
* Create ItemSlotButton

* Refactor inventory buttons

Refactor so that KeyBind handling of inventory and hands are the same.

* Refactor InventoryInterfaceController to call ItemSlotManager with entities

This change allows HandsGUI and InventoryInterfaceController to just call ItemSlotManager.OnButtonPressed with an entity instead of a slot.

* Add CooldownCircle to ItemSlotButton

This allows Hands and Inventory to have cooldown circles on their ItemSlots.

* Refactor HandsGUI to use ItemSlots

This allows functionality and GUI to be the same between Inventory and Hands.

Added clicking empty hand to switch ActiveHand to clicked hand.

* Implement CooldownCircle in ItemSlotManager

Reorganize files
 2020-01-17 15:43:20 +01:00
Acruid
4773aad40c Added the ID slot of the player inventory to the UI, next to the tool belt. 2019-12-30 11:42:31 -08:00
Pieter-Jan Briers
26da24c3c5 UI Layout v2. (#489) 
* UI Layout v2.

* Lobby fixed.
 2019-12-05 16:00:03 +01:00
Pieter-Jan Briers
e179e89c03 Fix crash on shutting down client. 2019-12-04 01:23:14 +01:00
ShadowCommander
590cb1e85c Fix crash on restart (#463) 
Clears inventory slots before disposal when ClientInventoryComponent is removed.
 2019-11-26 16:26:47 +01:00
ZelteHonor
b2e2aef78d Rider static analysis (#433) 
* Non-accessed local variable

* Merge cast and type checks.

* StringComparison.Ordinal added for better culture support

* Supposed code improvement in launcher. Remove unused code.

* Update ExplosionHelper.cs

Unintentional change.

* Optimized Import

* Add Robust.Shared.Utility import where it was deleted

* Other random suggestion

* Improve my comment
 2019-11-13 23:37:46 +01:00
Pieter-Jan Briers
3a0856505d Correctly clear inventory UI when HumanInventoryInterfaceController detaches. 
Fixes #405
 2019-10-25 11:49:26 +02:00
ShadowCommander
0329150109 Fix OpenStorage button in HumanInventoryWindow (#322) 2019-09-01 22:50:13 +02:00
ShadowCommander
1c81f6097f Merge branch 'master' of https://github.com/space-wizards/space-station-14 2019-08-16 15:46:06 -07:00
DamianX
534af65f7c Fixed inventory button not updating when window was closed (#304) 
* Fixed inventory button not updating when window was closed

* Only add the event handler once

* uhhhh

* UHHHHHH
 2019-08-16 21:52:00 +02:00
Pieter-Jan Briers
6be135a137 Fix human inventory window ID slot using mask texture. 2019-08-14 21:10:56 +02:00
ShadowCommander
b38e780f01 Updates Submodule and updates Inventory Button variables 2019-08-09 15:47:59 -07:00
ShadowCommander
7753ae7c3a Added OpenStorage trigger on ActivateItemInWorld 
When ActivateItemInWorld is pressed when hovering over a InventoryButton and the InventorySlot contains a storage item, it will open the StorageGUI.
 2019-08-07 15:56:22 -07:00
ShadowCommander
151d3a3672 Fixed HandsGui and added an icon to access worn inventories (#279) 
* Fixed HandsGui children so that HandsGui is clickable

* Added TextureButton for opening Storage items

* Update ClientInventoryComponent.cs

Fixed HandleComponentState so that it only updates the inventory when there are changes.

* Implemented storage button on Inventory

Adds a small button on the bottom right of Storage items when inside the inventory. When the button is pressed it opens the Storage UI.
 2019-08-01 01:38:24 +02:00
Pieter-Jan Briers
ceb8cc8421 Use automatic component registration. 2019-07-31 15:07:54 +02:00
Pieter-Jan Briers
1fbb5915aa Better inventory window, inventory buttons on game HUD. 
Part of #272
 2019-07-23 23:24:47 +02:00
Pieter-Jan Briers
4d202a7678 Use new inventory icons for hands. 2019-07-20 16:02:19 +02:00
Pieter-Jan Briers
c675886713 Separate inventory & character UI. 2019-07-20 14:07:11 +02:00
Pieter-Jan Briers
f5d319bc3a Adds explicit inventory window. 2019-07-20 14:07:11 +02:00
Pieter-Jan Briers
1fa63179d1 Fix character UI being broken. 
Also transition everything away from tscn files.
 2019-05-05 23:14:40 +02:00
Silver
a18692bc46 Rename toolbox references from ss14 to robust 2019-04-15 21:11:38 -06:00
Acruid
b1c81ed6e6 Entity Interpolation (#197) 
* Frame interpolation kinda works.

* Added null CurState check because it can be null now.

* Merge remote-tracking branch 'upstream/master' into dev-GameState
 2019-04-13 09:46:27 +02:00
Pieter-Jan Briers
1b3d3debc1 Fix client inventory not inheriting the correct controls. 
Fixes it on Clyde.
 2019-03-16 18:14:23 +01:00
clusterfack
37df61113e Species Component (#130) 
* Fix this
fug
oksure
Creates the initial species component, damage states, and threshold templates and hooks them into the damageable component

* More rebase fixes

* test

* Pre future rebase

* Please

* Lol

* Lol2

* SHADERS

* Update Engine

* yml file

* Fix an initialization issue, injects dependencies

* Fix error in loading shaders

* Makes a master character ui controller component added upon client attachment to entity and remove upon client detachment from entity

* Fixes just about everytrhing

* Address PJB's comments

* geeze

* Make overlays work in worldspace instead of screen space and not cover user interfaces

* update submodule
 2018-12-13 14:47:18 +01:00