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

43 Commits

Author SHA1 Message Date
DrSmugleaf
4b4e83d2bf Add changing the amount of hands on the GUI depending on your body parts (#1406) 
* Multiple hands in gui first pass

* Remove IHandsComponent interface

* Create hand class and more hand textures

* Refactor ServerHandsComponent to use a single list of hands

* Seal SharedHand

* Fix picked up items not showing on top of the hand buttons

* Remove HandsGui buttons and panels dictionaries

* Fix items in hands rendering

* Fix wrong hand container comparison

* Fix not updating the location of duplicate hands

* Change ClientHandsComponent to use a SortedList instead of a dictionary

* More merge conflict fixes

* Change SortedList to List

* Fix hand button order

* Add item tooltip for more than 2 hands and updating when removing hands

* Add add hand and remove hand command

* Merge conflict fixes

* Remove nullable reference type from ContainerSlot

* Fix texture errors

* Fix error when reaching 0 hands

* Fix error when swapping hands with no hands

* Merged remove hand methods

* Fix item panel texture errors

* Merge conflict fixes

* Fix addhand and removehand command descriptions

* Add properly displaying tooltips for 2 hands

* Make hand indexes and locations consistent across the client and server

* Add dropping held entity if a hand is removed

* Change hand location to be calculated by index

* Made different hand gui updates more consistent

* Remove human body yml testing changes

* Sanitize addhand and removehand commands

* Merge conflict fixes

* Remove testing changes

* Revert body system changes

* Add missing imports

* Remove obsolete hands parameter in yml files

* Fix broken import

* Fix startup error and adding and removing hands on the same tick

* Make hand container id use an uint

In case someone gets more than 2 billion hands

* Rename hand component files

* Make hands state use an array
 2020-07-25 15:11:16 +02:00
Acruid
ea94f4a182 Moved interaction interfaces from Server to Shared. 2020-07-18 22:51:56 -07:00
DrSmugleaf
8f685f0541 Merge branch 'master' into buckle-locker-fix-1262 2020-07-07 20:36:43 +02: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
DrSmugleaf
b850ac2437 Merge branch 'master' into buckle-locker-fix-1262 2020-07-07 00:20:07 +02:00
chairbender
b35333d366 Click Drag Functionality + Refactor Interaction Interfaces (#1125) 
Co-authored-by: Víctor Aguilera Puerto <6766154+Zumorica@users.noreply.github.com>
Co-authored-by: ComicIronic <comicironic@gmail.com>
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
 2020-07-06 23:27:03 +02:00
DrSmugleaf
81647d696e Disable interactions for entities in storage 2020-07-03 23:57:19 +02:00
GlassEclipse
610ab8bf50 BodySystem stuff 2: overused boogaloo (#1174) 
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
 2020-07-02 20:51:14 +02:00
py01
23cc6b1d4e Power Rework (#863) 
Co-authored-by: py01 <pyronetics01@gmail.com>
 2020-06-28 17:23:26 +02:00
Leo
acaa63493a Re-adds ISuicideAct to microwave (#1085) 2020-06-07 17:00:05 +02:00
Memory
21c41f28ed Refactor all references to AudioSystem functions now that the old ones are obsolete. (#1081) 
Co-authored-by: FL-OZ <anotherscuffed@gmail.com>
 2020-06-07 15:55:15 +02:00
FL-OZ
470f81fca1 fix microwave deleting entities at will (#1073) 
Co-authored-by: FL-OZ <anotherscuffed@gmail.com>
 2020-06-05 18:46:34 +02:00
Víctor Aguilera Puerto
a9a43f25ce Remove unused IEntitySystemManager dependencies. 2020-05-31 19:58:49 +02:00
FL-OZ
53900b79e9 Rename SoundComponent and refactor its wrong usages. (#1036) 
* Rename `SoundComponent` and refactor its wrong usages.

* Replace verbose IoC grabs with EntitySysetm.Get

* unused depend

Co-authored-by: FL-OZ <anotherscuffed@gmail.com>
Co-authored-by: Víctor Aguilera Puerto <6766154+Zumorica@users.noreply.github.com>
 2020-05-31 19:40:36 +02:00
FL-OZ
aa26bdfcae Rework Drink/Food/FoodContainer entirely (#1009) 
Co-authored-by: FL-OZ <anotherscuffed@gmail.com>
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
 2020-05-29 22:50:23 +02:00
FL-OZ
5b36a0d704 Sweeping changes/improvements to the microwave. (#997) 
Co-authored-by: FL-OZ <anotherscuffed@gmail.com>
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
 2020-05-28 22:28:35 +02:00
Leo
312ec5760c Adds ISuicideAct and support for Held Item and Environmental suicides (#1010) 2020-05-28 01:05:12 +02:00
Clyybber
1ad9a10050 Fix #274 (#927) 2020-05-23 17:23:25 +02:00
chairbender
6a4d78cfac Add interaction checks to all interactions (#923) 2020-05-23 11:27:31 +02:00
FL-OZ
613e1619fa satiates abrahams hunger for microwave fixes 2020-05-22 17:22:42 -05:00
FL-OZ
e1324fff19 Fix RND console keyboard sound being global. (#933) 
* global keyboard

* e

* fixes microwave while im at it

Co-authored-by: FL-OZ <anotherscuffed@gmail.com>
 2020-05-20 19:11:38 +02:00
FL-OZ
f3f7422129 , AudioParams.Default to beep sounds. should fix global but probably doesnt 2020-05-11 16:59:02 -05:00
FL-OZ
40ad366636 Various hotfixes and touchups to the microwave. 
- Stop a debug assertion from TryGetComponent on a deleted entity.
-  Add a dark overlay for when microwave is busy to UI.
 2020-05-06 17:45:45 -05:00
FLOZ
c8e2624390 lol 2020-05-04 19:59:43 -05:00
FLOZ
b803bee2c0 Remove unncessary class dictionary and list. Fix meal prototype properties. 2020-05-04 18:35:36 -05:00
FLOZ
69b34e74ce Seperated Reagent item list and Solid item list to allow for vaporizing particular reagents at will. (also fixes a really nasty null reference exception because they shared the same list before D: ) 2020-05-04 15:16:16 -05:00
FLOZ
108bd36b8c And not a single "ToList()" went home to their family that day..... 2020-05-04 14:39:33 -05:00
FLOZ
4034458d26 Pretty up the microwave menu, add click sounds. Remove some unnecessary ToList() calls. Remove unnecessary IoC resolves. 2020-05-04 13:54:54 -04:00
FL-OZ
d7d0bc71f9 Microwave is done. Added an easter egg recipe and made the cheeseburger recipe more sensible. 2020-05-03 23:58:29 -05:00
FL-OZ
4f7deb8452 Next up timer buttons 2020-05-03 03:09:54 -05:00
FL-OZ
0f61c2fadf Microwave UI + solids implemented. 2020-05-03 01:34:00 -05:00
FL-OZ
dba0949c5b Add (not working) basis for allowing solids (entities) in recipes. 2020-05-02 01:29:20 -05:00
FL-OZ
dd19466578 Microwave interface. 2020-05-01 23:34:04 -05:00
FL-OZ
13fba25edc A shit ton of microwave stuff i can't really explain this. 2020-05-01 17:19:04 -05:00
FL-OZ
a5fa184765 Reformat 'PoweredIdle' to 'Idle' 2020-05-01 03:38:48 -05:00
FL-OZ
b2aca9a686 Add microwave visualizer. Clean up microwave code. 2020-05-01 03:37:21 -05:00
FL-OZ
5d4c0609ec ShadowCommander is MVP. 2020-04-30 23:07:27 -05:00
FL-OZ
93c3e86c9f Unfuck mostly everything. 2020-04-30 18:08:51 -05:00
FL-OZ
8e0185f892 Refactor "output" to "result" for recipes/prototypes. 
Remove a debug recipe from meal_recipes.yml
Add food.yml for food related reagents: sugar, flour, etc.
 2020-04-29 21:04:08 -05:00
FL-OZ
d0f18b2f66 Add Eris microwave RSI. 
Cleaned up  the Microwave component code.
 2020-04-28 19:15:43 -05:00
FL-OZ
24842418c3 Rewrite recipe prototype. 
Fix comparer in microwavecomponent.
 2020-04-27 00:27:25 -05:00
FL-OZ
7e4d4bb1d4 Reformat the way recipe prototypes work to something sensible. 
More work on Microwave component.
 2020-04-26 23:14:02 -05:00
FL-OZ
f76a087e91 Add meal recipe prototype class and yaml file. 
Add bare bones MicrowaveComponent.
 2020-04-26 15:44:20 -05:00