Commit Graph

36638 Commits

Author SHA1 Message Date
Víctor Aguilera Puerto 271945e1a5 Cleanup flashbangs. Fixes #1305 2020-07-08 00:51:08 +02:00
Víctor Aguilera Puerto 1616b0d867 Remix flash.ogg down to mono 2020-07-08 00:50:24 +02:00
Víctor Aguilera Puerto 50562d77e6 Flashable is a word 2020-07-08 00:50:09 +02:00
Víctor Aguilera Puerto f0892c20f1 Make xeno mob clickable, fixes #1310 2020-07-08 00:26:54 +02:00
Víctor Aguilera Puerto e27e4ed2b1 Fix overlays not being applied after reentering an entity 2020-07-07 23:31:36 +02:00
Víctor Aguilera Puerto a7565b7651 Fix stunbaton issues 2020-07-07 23:12:12 +02:00
DrSmugleaf e2a96ac717 Merge branch 'master' into buckle-locker-fix-1262 2020-07-07 22:58:33 +02:00
Víctor Aguilera Puerto 75f92da8ac Fix tests 2020-07-07 22:41:33 +02:00
Víctor Aguilera Puerto 3833d1af5f Fix overlays applying EVERY overlay of EVERY overlay component
Cluster moment
2020-07-07 22:34:20 +02:00
Víctor Aguilera Puerto 830d7bc02d Fixes MsgSelectCharacter not being registered 2020-07-07 21:27:32 +02:00
AJCM-git e7847d1555
fixing lobby (#1297) 2020-07-07 21:04:27 +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
Víctor Aguilera Puerto 39290cffaa Update submodule 2020-07-07 19:16:04 +02:00
Víctor Aguilera Puerto bcc3bd3897 Update submodule 2020-07-07 19:06:49 +02:00
metalgearsloth 0ecaba1727
Minor AI system fixes (#1292)
* Add test to check all LogicNames in prototypes
* Change CreateProcessor to AiLogicProcessor (I thought I'd already done this as I remember PJB telling me to do this but apparently I'm an idiot)
* Temporarily remove invalid AiControllers

Co-authored-by: Metal Gear Sloth <metalgearsloth@gmail.com>
2020-07-07 18:56:38 +02:00
Víctor Aguilera Puerto cddfa62980 Fix MsgSandboxRespawn not being registered client-side. 2020-07-07 18:10:35 +02:00
DrSmugleaf e0f888344e Add more interaction checks 2020-07-07 01:40:08 +02:00
DrSmugleaf 2fd93091c7 Allow interaction if targeting the containing entity 2020-07-07 01:10:21 +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
Pieter-Jan Briers cf400da4b6
Update submodule 2020-07-06 23:43:04 +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
ike709 c019d428a7
Antag preferences and antag prototype (#1264)
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
2020-07-06 23:24:29 +02:00
Pieter-Jan Briers cee8aaa84c
Fix cases of net messages not being registered before being sent. 2020-07-06 22:57:01 +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
ike709 3bab2fd803
Focus OOC hotkey (#1272) 2020-07-06 15:45:58 +02:00
metalgearsloth 7e4b506aaf
Fix AI not using items in hand (#1273)
I love 1 character commits

Co-authored-by: Metal Gear Sloth <metalgearsloth@gmail.com>
2020-07-05 12:17:17 +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
Pieter-Jan Briers acec640520
Update submodule 2020-07-04 00:50:45 +02:00
DrSmugleaf b00d8310de Remove free hand check from buckle 2020-07-03 23:58:12 +02:00
DrSmugleaf 81647d696e Disable interactions for entities in storage 2020-07-03 23:57:19 +02:00
DrSmugleaf 7f02d46cb4 Replace IsContained with ContainerHelpers.IsInContainer 2020-07-03 23:43:01 +02:00
DrSmugleaf 73eb53da46
Fix a player's mob continuing to move after disconnecting (#1265) 2020-07-03 23:32:41 +02:00
DrSmugleaf 299b2bda6b
Fix sandbox panel not reopening properly after being closed by clicking its X (#1260) 2020-07-03 23:28:17 +02:00
Jackw2As 68a515ee09
Adds Damage on tool interaction component (#1060) (#1102)
Fixed issue with Welding Tool ignoring the tools list.
2020-07-03 23:27:52 +02:00
DrSmugleaf 77368886e9
Fix Urist McHands' constant aspirations to follow in Pablo Picasso's steps (#1259) 2020-07-03 23:26:49 +02:00
DrSmugleaf c1ba2f76c7
Fix crash when reentering a body (#1258) 2020-07-03 23:26:30 +02:00