Commit graph

1900 commits

Author SHA1 Message Date
Morbo
8e8c8bbb58
Merge branch 'space-wizards:master' into master 2022-01-05 15:41:57 +03:00
Morbo
7165c5eb80
Revert "[AUTO] Fork Sync" (#28)
* Revert "ECSatize AlertsSystem (#5559)"

This reverts commit 79bcc0791e.

* Revert "Automatic changelog update"

This reverts commit 88ed28bf61.

* Revert "Added briefings to character menu & the traitor briefing (codewords) (#5971)"

This reverts commit 7cfbc39729.

* Revert "Automatic changelog update"

This reverts commit 37ae5fbbc9.

* Revert "Light bulb brightness (and other settings) change clientside PointLights (#5869)"

This reverts commit 6665e7969e.

* Revert "Partial hand ECS (#5634)"

This reverts commit 7f9bf8233d.

* Revert "Automatic changelog update"

This reverts commit 13aacb1bee.

* Revert "Power Cell Refactor (#5943)"

This reverts commit 33f5294e2a.
2022-01-05 15:41:36 +03:00
Acruid
79bcc0791e ECSatize AlertsSystem (#5559) 2022-01-05 15:39:29 +03:00
Rane
7cfbc39729 Added briefings to character menu & the traitor briefing (codewords) (#5971) 2022-01-05 15:39:29 +03:00
Leon Friedrich
7f9bf8233d Partial hand ECS (#5634)
Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
Co-authored-by: Paul Ritter <ritter.paul1@googlemail.com>
Co-authored-by: Paul <ritter.paul1@googlemail.com>
2022-01-05 15:39:29 +03:00
Leon Friedrich
33f5294e2a Power Cell Refactor (#5943)
Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
2022-01-05 15:39:29 +03:00
Acruid
5b1cd2dd96
ECSatize AlertsSystem (#5559) 2022-01-05 19:19:23 +11:00
Rane
8f6192dafa
Added briefings to character menu & the traitor briefing (codewords) (#5971) 2022-01-05 16:46:40 +11:00
Leon Friedrich
adbc4ee5b0
Partial hand ECS (#5634)
Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
Co-authored-by: Paul Ritter <ritter.paul1@googlemail.com>
Co-authored-by: Paul <ritter.paul1@googlemail.com>
2022-01-05 15:53:08 +11:00
Leon Friedrich
0aa4f9efbe
Power Cell Refactor (#5943)
Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
2022-01-05 15:20:25 +11:00
Morbo
33b0ebd504
Merge branch 'space-wizards:master' into master 2022-01-05 04:24:58 +03:00
Paul
11510927d6 work on adminpanel & submodule update 2022-01-04 21:12:34 +01:00
Arthur
6246bc3829 Merge remote-tracking branch 'upstream/master' 2022-01-04 16:04:26 +03:00
Arthur
8a29f90469 Add multiple changelog merging 2022-01-04 16:01:04 +03:00
mirrorcult
5249ea057a
Kill bobby 2.0 (#6023) 2022-01-04 10:17:39 +01:00
ShadowCommander
0a626353ab
Make disconnected players in AdminNameOverlay different from connected players (#5931)
* Set transparency for disconnected players in the AdminNameOverlay

* Change to white instead of transparent
2022-01-03 16:40:45 -08:00
Morbo
7fa5226713
Merge branch 'space-wizards:master' into master 2022-01-03 20:29:11 +03:00
Paul
33572c5cc8 submodule update & fixes the ahelpwindow further 2022-01-03 04:14:10 +01:00
Paul
7e266b41ff removes a bit of jank from bwoinkwindow
sorta fixes sorting
2022-01-03 02:36:25 +01:00
E F R
df9aecb6a0
Administration: Ahelp tabs (#5965) 2022-01-03 01:54:44 +01:00
Morbo
40de02cbb5
Merge branch 'space-wizards:master' into master 2022-01-02 09:10:27 +03:00
Flipp Syder
b1584793bf
Adds fire/air alarms (#5018)
Co-authored-by: Vera Aguilera Puerto <6766154+Zumorica@users.noreply.github.com>
Co-authored-by: E F R <602406+Efruit@users.noreply.github.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2022-01-02 15:56:24 +11:00
Morbo
9509d94bbf
Merge branch 'space-wizards:master' into master 2022-01-02 03:29:23 +03:00
ShadowCommander
007f4c6cbe
Fix inventory UI not showing entities (#5981)
* Update inventory UI on init

* Add resolve pattern

* Update Content.Client/Inventory/ClientInventorySystem.cs

Co-authored-by: Paul Ritter <ritter.paul1@googlemail.com>

* Fix errors

Co-authored-by: Paul Ritter <ritter.paul1@googlemail.com>
2022-01-01 23:35:30 +01:00
Morbo
c29c89fa22
Merge branch 'space-wizards:master' into master 2022-01-02 01:26:00 +03:00
ShadowCommander
9529883db1
Fix player tab opening multiple VV when closed by the X and reopened (#5986) 2022-01-01 23:10:46 +01:00
Morbo
8a991c1ae8
Merge pull request #22 from space-wizards/master
[AUTO] Fork Sync
2022-01-01 18:45:26 +03:00
ShadowCommander
04be14e057
Prevent equipping HandVirtualItems (#5982) 2022-01-02 00:20:32 +11:00
Arthur
8c2e71e0f3 Merge remote-tracking branch 'upstream/master'
# Conflicts:
#	Resources/Changelog/Changelog.yml
#	Resources/Prototypes/Catalog/Cargo/cargo_service.yml
#	Resources/Prototypes/Catalog/Fills/Crates/service.yml
2021-12-31 19:24:05 +03:00
Michael Phillips
89044ea732
Fixed issue with missing value on heldEntity (#5961) 2021-12-31 14:26:12 +11:00
wrexbe
abba1e1c2c
Make held entity nullable (#5923) 2021-12-30 19:27:15 -07:00
Morbo
c1a1c0ef29
Merge branch 'space-wizards:master' into master 2021-12-31 04:04:14 +03:00
ShadowCommander
dc1ca30f7c
Add context menu to AdminMenu PlayerTab entries (#5904)
* XAML PlayerTab entries

* Move command execution to PlayerTab

* Move command logic to the AdminSystem

* Clean up

* Add examine and context menu keybind handling to PlayerTab

* Fix remote admin verbs

* Remove examine for now

* Add server verbs

* Fix requests of verb by non-admins

* Clean up AdminSystem.Menu
2021-12-30 14:11:30 -08:00
Paul Ritter
512d6a38c3
get that crap outta here (completely rewrites inventorysystem) (#5807)
* some work

* equip: done
unequip: todo

* unequipping done & refactored events

* workin

* movin

* reee namespaces

* stun

* mobstate

* fixes

* some work on events

* removes serverside itemcomp & misc fixes

* work

* smol merge fix

* ports template to prototype & finishes ui

* moves relay & adds containerenumerator

* actions & cuffs

* my god what is actioncode

* more fixes

* im loosing my grasp on reality

* more fixes

* more work

* explosions

* yes

* more work

* more fixes

* merge master & misc fixed because i forgot to commit before merging master

* more fixes

* fixes

* moar

* more work

* moar fixes

* suffixmap

* more work on client

* motivation low

* no. no containers

* mirroring client to server

* fixes

* move serverinvcomp

* serverinventorycomponent is dead

* gaming

* only strippable & ai left...

* only ai and richtext left

* fixes ai

* fixes

* fixes sprite layers

* more fixes

* resolves optional

* yes

* stable™️

* fixes

* moar fixes

* moar

* fix some tests

* lmao

* no comment

* good to merge™️

* fixes build but for real

* adresses some reviews

* adresses some more reviews

* nullables, yo

* fixes lobbyscreen

* timid refactor to differentiate actor & target

* adresses more reviews

* more

* my god what a mess

* removed the rest of duplicates

* removed duplicate slotflags and renamed shoes to feet

* removes another unused one

* yes

* fixes lobby & makes tryunequip return unequipped item

* fixes

* some funny renames

* fixes

* misc improvements to attemptevents

* fixes

* merge fixes

Co-authored-by: Paul Ritter <ritter.paul1@gmail.com>
2021-12-30 22:56:10 +01:00
Pieter-Jan Briers
26b1f28f51 AdminSystem uses BaseWindow instead of SS14Window.
Forward compatibility patch for engine SS14Window deprecation.
2021-12-30 17:38:12 +01:00
ShadowCommander
9d70bdde9c
Keep players in the PlayerTab until round end (#5921)
* Rework AdminSystem to keep players in the PlayerTab until round end

* Prevent sending PlayerStatus to deadminned admins

* Change _playerList to non-nullable

* Clean up unused usings

* Consolidate duplicate foreach loop code
2021-12-30 16:12:28 +01:00
Vera Aguilera Puerto
b4808786da Ignore CanHostGuardian on the client. 2021-12-30 13:19:41 +01:00
Morbo
3e01be2fa7
Merge branch 'space-wizards:master' into master 2021-12-30 06:11:11 +03:00
Pieter-Jan Briers
a0af197259 Set outside prediction flags on system/inputs to work without prediction.
This needs to be gone through more thoroughly but it works somewhat.
2021-12-30 03:12:04 +01:00
Morbo
62fca1fe07
Merge branch 'space-wizards:master' into master 2021-12-29 15:27:56 +03:00
ShadowCommander
ca8d673fad
Add ShowRules commmand (#5908) 2021-12-29 18:31:18 +11:00
Alex Evgrashin
1705eae96c
Suit sensor and crew monitoring (#5521)
Co-authored-by: Paul Ritter <ritter.paul1@googlemail.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2021-12-29 16:19:00 +11:00
metalgearsloth
e5e144d99c
Rollerbeds (#5681) 2021-12-29 15:57:20 +11:00
CrudeWax
299c4be328
Guardians (Holoparasites) (#5140)
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Co-authored-by: Metal Gear Sloth <metalgearsloth@gmail.com>
2021-12-29 14:58:48 +11:00
Morbo
6c4752c9b7
Merge branch 'space-wizards:master' into master 2021-12-28 10:21:38 +03:00
ShadowCommander
f83b64bdec Fix AdminSystem not unsubscribing from PlayerTab.OnEntryPressed 2021-12-27 19:35:13 -08:00
Vera Aguilera Puerto
525c38b794
Move Eye Lerping to content and fix/improve it a bunch. (#5900) 2021-12-27 18:50:00 +01:00
ShadowCommander
e51f6ee851
Keep PlayerTab entries until the end of the round (#5910) 2021-12-27 12:46:38 +01:00
metalgearsloth
0705f16898
ECS handheld lights (#5864) 2021-12-27 18:15:16 +11:00
Acruid
b3b171da7f
ECSatize CameraRecoilSystem (#5448)
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2021-12-27 17:50:12 +11:00