Commit Graph

677 Commits

Author SHA1 Message Date
Pieter-Jan Briers 4d9344c733
Fix integration tests. 2020-07-16 17:07:12 +02:00
ike709 203a835264
Emergent Sanitation Gameplay (#1378)
* Emergent Sanitation Gameplay

* Fix the map

* Address review

* Mention if it's slippery in the description
2020-07-11 23:49:54 +02:00
Pieter-Jan Briers bd80b0df7b
Make potted plants use the macro as example. 2020-07-11 15:19:41 +02:00
tentekal 4a772c9e59
Added a check to ensure the door will not change state to 'closed' or 'deny' if a player without access touches a door opened by a user with access. (#1341) 2020-07-10 15:12:34 +02:00
Víctor Aguilera Puerto 8785371563 Makes weapons use GridCoordinates and default to MapCoordinates if grid is invalid 2020-07-10 01:53:36 +02:00
Víctor Aguilera Puerto e54e708cf2 Makes weapons use MapCoordinates instead of GridCoordinates. 2020-07-10 01:19:09 +02:00
Víctor Aguilera Puerto 73f4dba2f6 Fix slippery items not allowing airlocks to close 2020-07-09 17:22:46 +02:00
Víctor Aguilera Puerto 626c8c51a1
Adds slippery items (#1321)
* Start work on Slippery Component

* Slips work

* Add banana peel

* Add required slip speed

* Add slip sound

* Adds soap

* Make soapnt, soapsyndie and soapdeluxe inherit soap

* Adds homemade soap and omega soap

* Fix slipping not taking into account the entity being in a container
2020-07-09 17:00:37 +02:00
DrSmugleaf 749a46de20 Fix dropping an item inside a locker placing it outside 2020-07-09 12:35:18 +02:00
Víctor Aguilera Puerto 6f9736c381
Merge pull request #1323 from DrSmugleaf/thrown-entity-deletion-crash-1286
Fix thrown entity deletion crash
2020-07-09 00:16:43 +02:00
Víctor Aguilera Puerto 7ae114f92c
Merge pull request #1263 from DrSmugleaf/buckle-locker-fix-1262
Fix buckle in general
2020-07-09 00:15:28 +02:00
Pieter-Jan Briers 023fd60054
Fix throwing in space. 2020-07-08 18:29:13 +02:00
DrSmugleaf 1d7928101b Fix change that was lost in disposals translation 2020-07-08 16:44:56 +02:00
DrSmugleaf dc979f87c2 Remove unused using 2020-07-08 16:43:40 +02:00
DrSmugleaf ecb0448250 Fix thrown entity deletion crash 2020-07-08 16:39:05 +02:00
DrSmugleaf 066af63323 Fix not being able to buckle into an entity that is in the same container as you 2020-07-08 16:10:46 +02:00
DrSmugleaf 4ec733577f Fix "You can't reach there!" message being created twice 2020-07-08 16:00:04 +02:00
DrSmugleaf e1f9033a69 Merge branch 'master' into buckle-locker-fix-1262 2020-07-08 15:35:20 +02:00
DrSmugleaf f5a9f91de4 Fix not staying buckled to a strap when both the buckled and the strap go into the same container 2020-07-08 15:30:48 +02:00
DrSmugleaf 8f9af88bb2 Add unbuckling the entity if put into a container 2020-07-08 14:45:25 +02:00
DrSmugleaf d20e4969e2
Add light to lit welders (#1282)
* Add light to lit welders

* Fix null errors

* Make the welder light orange
2020-07-08 13:41:32 +02:00
DrSmugleaf 770d4e72e7 Add 0.25 second delay to unbuckling after recently buckling and more summaries 2020-07-08 13:22:14 +02:00
DrSmugleaf f9a948ace3 Fix wrong buckle status effect icon texture path 2020-07-08 13:02:38 +02:00
DrSmugleaf 39b650da38 Fix "You're already buckled in" not appearing if trying to buckle while already buckled 2020-07-08 13:01:08 +02:00
DrSmugleaf da4b55814a Fix halved buckle range not applying, add range property to strap 2020-07-08 12:54:00 +02:00
bhespiritu df395b9435
Fixed Welding Tool Not Updating (#1314)
* Fix Welding Tool Not Updating

- Added in the ISolutionChange interface so that it dirties the entity any time the amount of welding fuel changes. This applies whether it's lit or unlit.
- I also removed some redundant code.

* Update Content.Server/GameObjects/Components/Interactable/WelderComponent.cs

Co-authored-by: Víctor Aguilera Puerto <6766154+Zumorica@users.noreply.github.com>
2020-07-08 11:46:54 +02:00
Pieter-Jan Briers 5d0b86c659
Hide transfer verbs when right clicking reagent container in active hand.
Fixes #1313
2020-07-08 02:54:54 +02:00
DrSmugleaf e7d756811e
Replace CanBeNull annotations with nullable reference types (#1270)
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
2020-07-08 01:41:20 +02:00
Víctor Aguilera Puerto 271945e1a5 Cleanup flashbangs. Fixes #1305 2020-07-08 00:51:08 +02:00
Víctor Aguilera Puerto a7565b7651 Fix stunbaton issues 2020-07-07 23:12:12 +02: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 5901e6e45f Replace InEntityStorageComponent with in container check 2020-07-07 01:00:29 +02:00
DrSmugleaf 0a292634be Add Shutdown override to EntityStorageComponent 2020-07-07 00:49:14 +02:00
DrSmugleaf e5d78152c8 Replace Has & Add with Ensure 2020-07-07 00:35:38 +02:00
DrSmugleaf 793f843ae8 Fixing these namespaces was a mistake 2020-07-07 00:33:57 +02:00
DrSmugleaf 7cc5a3fb65 Merge conflict fixes 2020-07-07 00:23:41 +02:00
DrSmugleaf b850ac2437 Merge branch 'master' into buckle-locker-fix-1262 2020-07-07 00:20:07 +02:00
DrSmugleaf c78ce3e27a
Add click dragging for buckle (#1290) 2020-07-07 00:04:30 +02:00
Pieter-Jan Briers 5056ded35e
Fix compile 2020-07-06 23:44:29 +02:00
R. Neuser 88f49961d8
OverlayManager refactor and Flash (#1218)
* Flash component, overlay and shader
Add BeginDraw method to Overlay.cs

* Add flash icons, sounds

* Progress

* Multiple overlays without enums

* This is probably the worst way to do this IDK

* Remove nullable reference type

* Add AttackEventArgs as parameter to OnHitEntities
MeleeWeaponComponent.Attack now continues when OnHitEntities returns true (it hit something)
Add OverlayType enum so client and server can agree on overlay ids
Move IConfigurable to its own file
Add AoE flash with shorter duration
Flashing someone slows them down

* Add arc to flash
Set item size to something reasonable
Remove chat log message when flash burns out

* Remove unused interface
2020-07-06 23:37:39 +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
Jackson Lewis 90982d8943
Fix airlock collisions (#1030)
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
2020-07-06 22:00:07 +02:00
py01 137511d8b9
NodeGroup remake deferment (#1268)
* Remove Unnecessary AnchorUpdate() call

* NodeGroupManager

* NodeGroupManager issues NodeGroup remake attempts

* Code cleanup

* NodeGroupManager only stores dirty groups, handles them on next frame

* Removes unused NodeGroupManager dependency

* Prevents OnRemoveNode from iterating over every connector after the first time

* Revert "Prevents OnRemoveNode from iterating over every connector after the first time"

This reverts commit c72af4b18d55192af789514f74bef893cf076fbc.

* Dependancy warning fix

Co-authored-by: py01 <pyronetics01@gmail.com>
2020-07-06 15:48:18 +02:00
DrSmugleaf abfe86be81 Add customizable buckled status effect icon per strap 2020-07-04 14:14:39 +02:00
DrSmugleaf 47118e8301 Fix entering noclip when a locker is closed over a buckled entity and the chair is then deleted 2020-07-04 14:10:37 +02:00
DrSmugleaf 0f16b9b8f1 Replace CanBeNull annotations with question marks 2020-07-04 13:51:14 +02:00
DrSmugleaf 2691d34d5c Fix not standing up after getting off of a bed 2020-07-04 13:44:32 +02:00
DrSmugleaf 45211a2f0b Fix a buckled entity's sprite being drawn over the chair when looking up 2020-07-04 01:28:06 +02:00
DrSmugleaf b00d8310de Remove free hand check from buckle 2020-07-03 23:58:12 +02:00