Arthur
|
a5fa8904ec
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
# Content.Server/Speech/EntitySystems/MobsterAccentSystem.cs
|
2022-06-24 04:58:34 +03:00 |
|
metalgearsloth
|
8905996cfc
|
Make raiselocalevent not broadcast by default (#8998)
|
2022-06-22 09:53:41 +10:00 |
|
Arthur
|
5b9ec5ce3e
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
# Content.Shared/Interaction/SharedInteractionSystem.cs
|
2022-06-18 07:08:37 +03:00 |
|
wrexbe
|
63d607f26a
|
Clean up door remote (#8829)
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
|
2022-06-16 23:36:36 +10:00 |
|
Arthur
|
fee8678a41
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
# Resources/Maps/infiltrator.yml
# Resources/Prototypes/Maps/game.yml
|
2022-06-04 03:08:27 +03:00 |
|
wrexbe
|
1e0babbd50
|
Make AdminLogsSystem an IoC manager (#8492)
* Make log not entity system
* Fixes
|
2022-05-28 23:41:17 -07:00 |
|
Arthur
|
2f7cc32485
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
# README.md
|
2022-05-29 08:59:07 +03:00 |
|
Leon Friedrich
|
d3844fdf7a
|
Allow ghosts to ignore obstructions (#8397)
|
2022-05-27 18:46:17 -07:00 |
|
Arthur
|
5aeb1ed4b8
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
|
2022-05-25 02:29:09 +03:00 |
|
metalgearsloth
|
6e94d08b17
|
Gun tweaks (#8320)
|
2022-05-22 12:31:46 +10:00 |
|
Arthur
|
da3072a8b4
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
# Resources/Maps/infiltrator.yml
# Resources/manifest.yml
|
2022-05-19 20:03:31 +03:00 |
|
Kara
|
033efef5f5
|
Make combat feel 100x better with this one simple trick (#8231)
|
2022-05-17 02:57:28 -07:00 |
|
Arthur
|
82c0b1c8e7
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
|
2022-05-15 16:38:40 +03:00 |
|
Jacob Tong
|
f3d7543d68
|
Fix interaction and add comments to CollisionGroup (#8149)
|
2022-05-14 12:54:37 +10:00 |
|
wrexbe
|
bc68ac96dd
|
Cleanup the namespaces (#8132)
|
2022-05-13 17:59:03 +10:00 |
|
wrexbe
|
089e40a061
|
Convert suicide to ecs (#8091)
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
|
2022-05-12 22:05:16 +10:00 |
|
Arthur
|
a6c1a837ad
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
|
2022-04-24 14:25:19 +03:00 |
|
Rane
|
c022afaec4
|
Remove IInteractHand (#7601)
* Plantholder
* Strap
* Finish him
* Mirror review stuff
|
2022-04-23 13:49:45 +10:00 |
|
Arthur
|
2587c1c71c
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
# Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml
|
2022-04-17 04:50:19 +03:00 |
|
CrzyPotato
|
67b2bfad57
|
Added more animal sound effects needed for pettable animals and gibbed head fix (#7532)
|
2022-04-15 15:56:04 -07:00 |
|
Arthur
|
237bb2dd2b
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
# .github/workflows/publish.yml
|
2022-04-06 07:11:02 +03:00 |
|
Leon Friedrich
|
2884de06b6
|
Fix directional window blocking (#7270)
|
2022-04-02 14:11:16 +11:00 |
|
Arthur
|
cec80e9668
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
# Resources/Prototypes/species.yml
|
2022-04-02 03:45:49 +03:00 |
|
Leon Friedrich
|
4ad36f10e7
|
Fix two interaction prediction issues (#7356)
|
2022-03-31 18:08:30 +11:00 |
|
Arthur
|
8e2d5adb1c
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
# .github/CODEOWNERS
# .github/workflows/build-docfx.yml
# Resources/Prototypes/Entities/Clothing/Head/hats.yml
# Resources/Server Info/Rules.txt
|
2022-03-27 05:57:13 +03:00 |
|
DrSmugleaf
|
e8025a6e17
|
Make InteractionActivate check for hands like UserInteraction (#7277)
|
2022-03-25 14:10:50 -07:00 |
|
Arthur
|
8a4feed815
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
# .github/CODEOWNERS
# Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml
# Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml
# Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
# Resources/Server Info/Rules.txt
# Resources/Textures/Structures/Wallmounts/signs.rsi/direction_evac.png
# Resources/Textures/Structures/Wallmounts/signs.rsi/direction_supply.png
|
2022-03-20 03:34:39 +03:00 |
|
Leon Friedrich
|
bfd95c493b
|
hands ECS (#7081)
|
2022-03-17 18:13:31 +11:00 |
|
Morbo
|
b991333a0d
|
Increast interaction range (#147)
* Increase interaction range to 1.4
* Decrease gravity generator fixture at top
|
2022-03-14 15:33:14 +03:00 |
|
Arthur
|
fb4739aeab
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
# Resources/Prototypes/species.yml
# Resources/Server Info/Rules.txt
# Resources/Textures/Tiles/dark.png
# Resources/Textures/Tiles/steel.png
# Resources/Textures/Tiles/white.png
|
2022-03-13 21:51:12 +03:00 |
|
Leon Friedrich
|
e3ead6a3ba
|
Remove IDropped (#7075)
|
2022-03-13 19:47:28 +11:00 |
|
Leon Friedrich
|
b1e719c70d
|
Remove IUse (#7074)
|
2022-03-12 23:33:23 +11:00 |
|
Leon Friedrich
|
3096ba3040
|
Fix some pop-up spam (#7070)
|
2022-03-12 10:53:42 +11:00 |
|
Leon Friedrich
|
0f435f31c8
|
Predict general interactions. (#6856)
|
2022-03-09 18:12:17 +11:00 |
|
Leon Friedrich
|
17132385d4
|
Make combat check CanInteract (#7046)
|
2022-03-09 17:40:07 +11:00 |
|
Arthur
|
11b1fad3c5
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
# Content.Server/GameTicking/GameTicker.RoundFlow.cs
# Resources/Maps/infiltrator.yml
# Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
|
2022-02-23 15:34:15 +03:00 |
|
Leon Friedrich
|
de8dcb75bf
|
Fix interact using sometimes having target==used (#6847)
|
2022-02-22 21:58:06 -07:00 |
|
Arthur
|
4b537e25f5
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
|
2022-02-20 01:08:22 +03:00 |
|
Rane
|
67661ddbdb
|
Drone Interaction Checks & Cleanup (#6731)
|
2022-02-18 15:57:31 -07:00 |
|
Arthur
|
dc33147e50
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
|
2022-02-17 14:13:31 +03:00 |
|
Leon Friedrich
|
4a00d01ced
|
Remove ignore-inside-blocker (#6692)
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
|
2022-02-16 19:40:03 -07:00 |
|
Arthur
|
0a782deced
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
|
2022-02-17 01:05:48 +03:00 |
|
mirrorcult
|
ec4d4688c7
|
Seal/abstract/virtual everything (#6739)
|
2022-02-16 18:23:23 +11:00 |
|
Leon Friedrich
|
631c0068b9
|
Fix alt click (#6722)
|
2022-02-15 21:40:48 +11:00 |
|
Leon Friedrich
|
ad9ddf1552
|
Reduce action blocker uses and add target entity to CanInteract (#6655)
|
2022-02-15 15:06:52 +11:00 |
|
Leon Friedrich
|
5ab4f4d9c9
|
Fix APC UI interaction. (#6683)
|
2022-02-13 15:34:28 +11:00 |
|
Arthur
|
907e7464ff
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
|
2022-02-10 09:27:57 +03:00 |
|
Leon Friedrich
|
1c9ffdc78c
|
Replace VerbTypes with verb classes (#6525)
|
2022-02-10 13:30:59 +11:00 |
|
Arthur
|
68e47a8ac5
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
# Resources/Server Info/Rules.txt
|
2022-02-09 08:40:52 +03:00 |
|
Leon Friedrich
|
bd930de044
|
Allow a range <= 0 in InRangeUnoccluded (#6440)
|
2022-02-08 11:08:07 -07:00 |
|