Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upstream Sync #53

Merged
merged 397 commits into from
Feb 19, 2024
Merged
Changes from 1 commit
Commits
Show all changes
397 commits
Select commit Hold shift + click to select a range
1f1c07a
Allow IdentityBlocker partial coverage (#24741)
themias Jan 31, 2024
a06fb74
Automatic changelog update
PJBot Jan 31, 2024
d4f1f1f
Reduce throwing recoil further (#24759)
mirrorcult Jan 31, 2024
aa4c6f9
Automatic changelog update
PJBot Jan 31, 2024
d35e2f3
Roundstart variation game rules (#24397)
mirrorcult Jan 31, 2024
0d3046e
Automatic changelog update
PJBot Jan 31, 2024
36e68d2
Removing the embedding function of pens. (#24760)
marboww Jan 31, 2024
f77099f
Add Secret Extended and Secret Greenshift (#24615)
Pangogie Jan 31, 2024
055ee1e
Automatic changelog update
PJBot Jan 31, 2024
b844de1
Add a few new ways to laugh and cry with emotes (#24585)
Hmeister-real Jan 31, 2024
1444c3b
Automatic changelog update
PJBot Jan 31, 2024
36e28ec
Firestarter fixes (#24647)
metalgearsloth Jan 31, 2024
86a9930
Anomaly bug fix (#24783)
TheShuEd Jan 31, 2024
c876e4d
Automatic changelog update
PJBot Jan 31, 2024
c36c8b5
Removes Syndicate headset from uplink and changes TC prices around to…
UltimateJester Feb 1, 2024
9a83a06
Automatic changelog update
PJBot Feb 1, 2024
4c7c904
Remove vehicles (#24681)
metalgearsloth Feb 1, 2024
931d7ff
Automatic changelog update
PJBot Feb 1, 2024
e934f78
Fix chemical fuel generator division by zero (#24793)
PJB3005 Feb 1, 2024
0b5c8fd
Tweak borg laws (#24698)
Zap527 Feb 1, 2024
106e2e0
Automatic changelog update
PJBot Feb 1, 2024
0d4eb24
Health analyzers now show if somebody is starving (#24789)
PJB3005 Feb 1, 2024
3bd11f2
Automatic changelog update
PJBot Feb 1, 2024
c5050d0
New sprite for the arachnid plushie. (#24747)
PixelTheKermit Feb 1, 2024
f26e119
Automatic changelog update
PJBot Feb 1, 2024
226295b
A beer can and a wine can (#24365)
RumiTiger Feb 1, 2024
9c7adf8
Remove yellow oxygen tank (#24374)
lzk228 Feb 1, 2024
c15e028
Automatic changelog update
PJBot Feb 1, 2024
1d944e4
Adds emote "Buzz" for moth (#24556)
Wertanchik Feb 1, 2024
08840a5
Fix SSD indicator (#24589)
koteq Feb 1, 2024
b900fd9
Automatic changelog update
PJBot Feb 1, 2024
0f483e3
Ghost Role description clarity (#24333)
Skarletto Feb 1, 2024
3d3bd4f
Remove EntityUid from debug context menu (#24660)
metalgearsloth Feb 1, 2024
f6f08bd
Added Warning state for AME (#24699)
GloryOfNight Feb 1, 2024
25dbae8
Lock Anomaly generator to research access (#24464)
TheShuEd Feb 1, 2024
60bb97c
Automatic changelog update
PJBot Feb 1, 2024
4bbeb66
Remove starvation damage (#24790)
PJB3005 Feb 1, 2024
41c0554
Automatic changelog update
PJBot Feb 1, 2024
b9804a6
Airlock assembly prototypes (#23821)
Flareguy Feb 1, 2024
922407e
Client customization late-join spawner priority for arrivals/cryostor…
Krunklehorn Feb 1, 2024
69b3d47
Visitor job (#23972)
SlamBamActionman Feb 1, 2024
dc15297
Automatic changelog update
PJBot Feb 1, 2024
b98e16f
Spacelube slide (#24801)
Arendian Feb 1, 2024
10dc18f
Automatic changelog update
PJBot Feb 1, 2024
dc45972
RD Locker Binary Comms Key and Binary Key Price decrease (#24778)
FungiFellow Feb 1, 2024
85e4e82
Automatic changelog update
PJBot Feb 1, 2024
fa09ecd
Paraplegicn't zombies (#24169)
Arendian Feb 1, 2024
3120f9d
Buff the AME until somebody fixes engineering (#24806)
PJB3005 Feb 1, 2024
c77c6d3
Automatic changelog update
PJBot Feb 1, 2024
b0dcdcb
Newton cradle (#22914)
lzk228 Feb 1, 2024
adddd74
Fix item toggles where no sound exists (#24807)
metalgearsloth Feb 1, 2024
b828d35
Fixes Electrocutions to use available power, not consumed power (#24554)
Varen Feb 1, 2024
ca364e5
Automatic changelog update
PJBot Feb 1, 2024
74e5b79
Fix tests (#24809)
metalgearsloth Feb 1, 2024
8081242
Cleanups PolymorphSystem/Components/Prototypes (#23721)
AJCM-git Feb 1, 2024
abcc75d
Make paper edible (#24755)
SlamBamActionman Feb 1, 2024
db8726c
Remove tiered part crates from expeditions (#24810)
mac6na6na Feb 1, 2024
2c1c62f
Automatic changelog update
PJBot Feb 1, 2024
27895cd
Open some windows non-centered to avoid covering the player (#24767)
mirrorcult Feb 1, 2024
1e90480
Automatic changelog update
PJBot Feb 1, 2024
215d861
make dialog window not evil (#24677)
deltanedas Feb 1, 2024
e10eb32
Make plushies, whoopie cushions, and some toys usable as modular gren…
Tayrtahn Feb 1, 2024
dd000c9
Automatic changelog update
PJBot Feb 1, 2024
f016a07
Fix aHelp relay to detect AFK Admins (#24482)
Titian3 Feb 1, 2024
713b9d0
Automatic changelog update
PJBot Feb 1, 2024
2befc02
Minor bizzaresoft_flipped visual issues. (#24498)
africalimedrop Feb 1, 2024
639d3af
Rev Components are no longer leaked + Rev and Zombie icon visibility …
nikthechampiongr Feb 1, 2024
a08f6f4
add lizard speech bubble (#23365)
lunarcomets Feb 1, 2024
16d77d4
Move grenade components to shared (#22691)
Aexxie Feb 1, 2024
e0a3cfa
Fix clientside storage Whitelists (#24063)
Nopey Feb 1, 2024
5b0d9f7
Automatic changelog update
PJBot Feb 1, 2024
2a839fc
Remove obsolete transform call (#24217)
metalgearsloth Feb 1, 2024
778d037
Update submodule to 209.0.0 (#24819)
metalgearsloth Feb 1, 2024
757c5c9
Remove bad tag (#24820)
metalgearsloth Feb 1, 2024
c795fd0
Update submodule to 209.0.1 (#24822)
metalgearsloth Feb 1, 2024
e3bf59a
Action for closing prs submitted by the submitters master branch (#24…
VasilisThePikachu Feb 1, 2024
92dfc1d
Adds ExaminableSolutionComponent to spray bottles (#24838)
Blazeror Feb 1, 2024
c8456ec
Automatic changelog update
PJBot Feb 1, 2024
90824ea
Fix dylovene OD damage (#24826)
themias Feb 1, 2024
3875e19
Automatic changelog update
PJBot Feb 1, 2024
4ca11a5
Remove gondola donkpocket & change berry box description (#24655)
SlamBamActionman Feb 1, 2024
0b0de4e
spray painter rework (#23287)
deltanedas Feb 1, 2024
22acbfd
Fix cryopod debug assert (#24830)
themias Feb 1, 2024
7113ea3
Add Diona salute sound (#24836)
themias Feb 1, 2024
08bd544
Automatic changelog update
PJBot Feb 1, 2024
0845273
Automatic changelog update
PJBot Feb 1, 2024
1f3659a
Nerf the fridge explosion resistance (#24844)
VasilisThePikachu Feb 1, 2024
203ef20
Automatic changelog update
PJBot Feb 1, 2024
d47df4c
Booze/Soda Dispenser label fix (#24848)
Hanzdegloker Feb 2, 2024
c68e6ea
Fix slipping through fences (#24850)
Arendian Feb 2, 2024
087526a
Automatic changelog update
PJBot Feb 2, 2024
b6a3448
Make popups nullable (#24802)
metalgearsloth Feb 2, 2024
5826739
fix spray paint popup spam on invalid door (#24857)
deltanedas Feb 2, 2024
1376f8f
Add popup message for activating trigger with hand (#24858)
Partmedia Feb 2, 2024
3c2f10a
Screen Shake Intensity Slider in Accessibility Settings (#24749)
Psychpsyo Feb 2, 2024
d53fd5f
Automatic changelog update
PJBot Feb 2, 2024
d5d844d
Fix drug descriptions (#24622)
UbaserB Feb 2, 2024
dcf188f
Fix storage destruction/deletion bug (#24882)
ElectroJr Feb 3, 2024
971502a
MeleeSoundComponent Working With 0 Damage (#24872)
Bixkitts Feb 3, 2024
7678ac3
Fix mob pull issue (#22485)
Anzarot121 Feb 3, 2024
ed2d915
Remove puller from simplemob (#22957)
metalgearsloth Feb 3, 2024
0c0d9cd
Automatic changelog update
PJBot Feb 3, 2024
00586dd
Add puller sanity test (#24885)
metalgearsloth Feb 3, 2024
3de3e13
Add Stonk Pockets (#24876)
Tayrtahn Feb 3, 2024
e967e1c
Automatic changelog update
PJBot Feb 3, 2024
160ec32
freezer prevents nuclear annihilation (#24884)
IProduceWidgets Feb 3, 2024
047b725
Automatic changelog update
PJBot Feb 3, 2024
5c14950
Space-Up flavor quick-fix (#24863)
lapatison Feb 3, 2024
29e65fd
Actually fix round restart audio this time (#24754)
FairlySadPanda Feb 3, 2024
5170774
Make scarfs craftable (#24735)
Adrian16199 Feb 3, 2024
fa9861e
Automatic changelog update
PJBot Feb 3, 2024
b659a3c
Fix pressing shift while held triggering escape (#24878)
Tayrtahn Feb 3, 2024
38bbf2b
Various borg law fixes (#24870)
Zap527 Feb 3, 2024
3818bfa
Automatic changelog update
PJBot Feb 3, 2024
a1e09ff
Update FollowerSystem's fix to use new helper property (#24889)
Tayrtahn Feb 3, 2024
7e7655b
Pulling rework (#20906)
metalgearsloth Feb 3, 2024
e74e88d
Automatic changelog update
PJBot Feb 3, 2024
aded2ef
Remove soapy water (#24301)
lzk228 Feb 3, 2024
49a1b47
Decouple panels and wires (#24840)
EmoGarbage404 Feb 3, 2024
516bd18
Automatic changelog update
PJBot Feb 3, 2024
731da5d
Fixed unable to select None for character spawn priority (#24897)
Krunklehorn Feb 3, 2024
a7579b4
Automatic changelog update
PJBot Feb 3, 2024
c12dacd
Travelling pointing arrows, brains can no longer point (#24864)
Krunklehorn Feb 3, 2024
48bcdcd
Automatic changelog update
PJBot Feb 3, 2024
d6cb163
Fix sliding bug (#24846)
Arendian Feb 3, 2024
1b913a2
Fixed incorrect path to the uranium spear image in the construction m…
shampunj Feb 3, 2024
f409894
Automatic changelog update
PJBot Feb 3, 2024
508568a
Add carp pocket (#24888)
deltanedas Feb 3, 2024
c3629bc
Fix end of round messages looping forever (#24920)
nikthechampiongr Feb 3, 2024
584bfb8
Automatic changelog update
PJBot Feb 3, 2024
3c4421c
chat color change (#24922)
EmoGarbage404 Feb 3, 2024
fb8069c
Automatic changelog update
PJBot Feb 3, 2024
6a9259d
nuke biochem research discipline (#24871)
deltanedas Feb 3, 2024
f216f61
Automatic changelog update
PJBot Feb 3, 2024
070af36
Emergency revert for pulling (#24923)
Jezithyr Feb 3, 2024
2675d7b
Adds a refund button & action upgrades for stores (#24518)
keronshb Feb 4, 2024
85c6961
EMP disables suit sensors (#24869)
themias Feb 4, 2024
f01090c
Automatic changelog update
PJBot Feb 4, 2024
fe0e533
Add face bandanas (#24597)
themias Feb 4, 2024
fbcba23
Automatic changelog update
PJBot Feb 4, 2024
c639a4e
Predicted movement opening lockers (#24937)
metalgearsloth Feb 4, 2024
aa06969
Automatic changelog update
PJBot Feb 4, 2024
c4a5707
Adds navmap beacon for escape pods (#24938)
IamVelcroboy Feb 4, 2024
26a6c4d
Fix quantum dispose (#24772)
koteq Feb 4, 2024
83c1438
Add open/closed/fill states and sprites (#24600)
Tayrtahn Feb 4, 2024
196853a
Automatic changelog update
PJBot Feb 4, 2024
ac1f843
grille is flimsy (#24881)
deltanedas Feb 4, 2024
8b3687a
Automatic changelog update
PJBot Feb 4, 2024
a60a0a3
Auto Attack for Holoparasites (#24944)
Scribbles0 Feb 4, 2024
5a5da1d
Automatic changelog update
PJBot Feb 4, 2024
965e1ca
criminal records revival (#22510)
deltanedas Feb 4, 2024
f3107f7
Fixes bug with criminal records (#24954)
AJCM-git Feb 5, 2024
6bcd38e
criminal records cl (#24953)
deltanedas Feb 5, 2024
4523479
Store Action Upgrade Fix (#24959)
keronshb Feb 5, 2024
7b87d39
Actually fix store action upgrades (#24960)
keronshb Feb 5, 2024
ab73fe3
Sectech Advert Change (#24965)
UltimateJester Feb 5, 2024
31b93e0
Automatic changelog update
PJBot Feb 5, 2024
b456757
move criminal records console component to shared (#24957)
deltanedas Feb 5, 2024
7863210
Update log probe UI for better looking (#24966)
koteq Feb 5, 2024
1ce46c0
Rebalances electrocution damage to a log scale (#24829)
Varen Feb 5, 2024
f89c102
Automatic changelog update
PJBot Feb 5, 2024
378e29e
Adjust drink reagent colors (#24968)
Tayrtahn Feb 5, 2024
ee34807
fix criminal records cl real (#24973)
deltanedas Feb 5, 2024
194fb84
Automatic changelog update
PJBot Feb 5, 2024
b78a964
readd station records locale (#24976)
deltanedas Feb 5, 2024
343d000
Restore Outlaw Glasses full identity blocking coverage (#24971)
themias Feb 5, 2024
2f204d6
Automatic changelog update
PJBot Feb 5, 2024
1fb94bd
Special pens embed again (#24849)
Emisse Feb 5, 2024
05c8122
Automatic changelog update
PJBot Feb 5, 2024
74fc671
Allow opening doors mid-deny animation, if you have the access (#24969)
koteq Feb 5, 2024
f87117f
Minor addition to Cybersun pen description (#24704)
SlamBamActionman Feb 5, 2024
d49acec
Borg Module QoL and Gas Analyzer Module Removal (#24702)
FungiFellow Feb 5, 2024
a7e1876
Automatic changelog update
PJBot Feb 5, 2024
ecf9634
Make Health Analysers UI continuously update (#22449)
Rainfey Feb 6, 2024
40f40ef
Automatic changelog update
PJBot Feb 6, 2024
aebe8d2
Added Monitor Computer Boards to Observation Kit (#24979)
ada-please Feb 6, 2024
97c44c0
Automatic changelog update
PJBot Feb 6, 2024
7cc7dba
Make radiation collector a power supplier (#24978)
Partmedia Feb 6, 2024
0a94997
Fixed glass cargo opened sprite (#25003)
snebl Feb 6, 2024
69007c8
Automatic changelog update
PJBot Feb 6, 2024
cc9b30a
Automatic changelog update
PJBot Feb 7, 2024
aac9564
Disable voting for Sandbox mode (#25027)
Partmedia Feb 7, 2024
de74e0f
Improved output distribution of RoundToLevels (#25026)
Tayrtahn Feb 7, 2024
2d684f3
Fix scram implant's teleportation out of containers (#24827)
koteq Feb 7, 2024
30e03ca
Fixed GluedComponent interactions with metamorphic glasses (#24943)
Krunklehorn Feb 7, 2024
c73f383
predict egg cracking + refactor (#25028)
deltanedas Feb 8, 2024
a4fd13a
Fix current test fails
DebugOk Feb 8, 2024
ef307b7
Fix invalid entry
DebugOk Feb 8, 2024
7ea62e4
Remove soapy water
DebugOk Feb 8, 2024
7290785
Merge remote-tracking branch 'origin/Wizmerge-08/02' into Wizmerge-08/02
DebugOk Feb 8, 2024
0d35118
Resave Hammurabi again
DebugOk Feb 8, 2024
75c21fd
Fix changelog order (again)
DebugOk Feb 8, 2024
2ae246e
PSB tag fix so Reptilian can eat it (#793)
FluffiestFloof Feb 8, 2024
a80edb5
Automatic Changelog Update (#793)
Feb 8, 2024
1abef98
Drop the mics (#791)
IamVelcroboy Feb 8, 2024
7f3b388
Fixes uncloneable description (#780)
Adrian16199 Feb 8, 2024
e230e35
Gives martial artist the same access and time reqs as boxer (#777)
IamVelcroboy Feb 8, 2024
71bcb3e
Automatic Changelog Update (#777)
Feb 8, 2024
bca1d1d
Change Gladiator requirement to match Prisoner (#774)
FluffiestFloof Feb 8, 2024
a4718b2
Fixes felinids not having nom. (#773)
Adrian16199 Feb 8, 2024
e42d139
Re-Re-Add Lean (#760)
IamVelcroboy Feb 8, 2024
bde57bb
Merge pull request #792 from DebugOk/Wizmerge-08/02
DebugOk Feb 8, 2024
d136874
Replace NTES_Box with NTES_Delta (#794)
IamVelcroboy Feb 8, 2024
86883b4
Map Edits: Submarine (#797)
IamVelcroboy Feb 8, 2024
5185ea1
Automatic Changelog Update (#797)
Feb 8, 2024
ca87c21
Delete Resources/Textures/Objects/Tanks/yellow.rsi directory
DebugOk Feb 8, 2024
6aada92
Move/update new salvage map (#798)
IamVelcroboy Feb 8, 2024
1561e96
Fix mantis stamp (#800)
FluffiestFloof Feb 9, 2024
aff33a6
Automatic Changelog Update (#800)
Feb 9, 2024
e1337f7
Update patreon list (#807)
DebugOk Feb 9, 2024
ae2790b
Energy gun sprites + Minor bug fixes (#811)
Tryded Feb 10, 2024
28cc34d
.38 Special mindbreaker fix + ammo techfab (#795)
FluffiestFloof Feb 10, 2024
8179c2f
Automatic Changelog Update (#795)
Feb 10, 2024
61ddd6b
Fix glimmer mite sound being loud (#812)
FluffiestFloof Feb 10, 2024
c74d945
Automatic Changelog Update (#812)
Feb 10, 2024
cc8e8d8
Center glimmer mite sprite (#813)
leonardo-dabepis Feb 11, 2024
8d228a9
Update Credits (#814)
github-actions[bot] Feb 11, 2024
3107457
Update server config (#818)
DebugOk Feb 11, 2024
09b79b3
Refill the DIY Holy Water kit (#819)
FluffiestFloof Feb 11, 2024
40c61f8
Felinid bubble speech. (#808)
Adrian16199 Feb 12, 2024
f1e6147
Automatic Changelog Update (#808)
Feb 12, 2024
d8df432
Fix PseudoItems (#821)
DebugOk Feb 12, 2024
bbd3e76
Automatic Changelog Update (#821)
Feb 12, 2024
0451fc6
Bureaucratic error changes (#532)
Guess-My-Name Feb 12, 2024
9611962
Automatic Changelog Update (#532)
Feb 12, 2024
49d3c45
Felinid changes. (#666)
Adrian16199 Feb 12, 2024
7a5c18c
Automatic Changelog Update (#666)
Feb 12, 2024
3b8c4a4
Make felinids scream in agony when sprayed with water. (#556)
Adrian16199 Feb 12, 2024
c13e538
Automatic Changelog Update (#556)
Feb 12, 2024
1f3128c
Harpy Visual Rework (#677)
VMSolidus Feb 12, 2024
ac1af5b
Automatic Changelog Update (#677)
Feb 12, 2024
7c62f5e
Prevent probers from being unachored by gorilla gauntlets (#824)
DebugOk Feb 13, 2024
0fa44ba
Automatic Changelog Update (#824)
Feb 13, 2024
84bad27
Nerf ear destroyers (#827)
VMSolidus Feb 13, 2024
2db9e9e
Automatic Changelog Update (#827)
Feb 13, 2024
02b1352
Signage For Meee (#799)
rosieposieeee Feb 13, 2024
9985ee9
bring back paradox anomaly (#825)
deltanedas Feb 13, 2024
87d45e4
Automatic Changelog Update (#825)
Feb 13, 2024
6687a31
Prevent action runners from being wasted on DeltaV-Bot (#831)
DebugOk Feb 13, 2024
0798ea3
Shoukou small patch (#816)
Adrian16199 Feb 13, 2024
de09172
Map Edits: Shoukou (#833)
IamVelcroboy Feb 13, 2024
a98b4eb
Vulpkanin's Deuteranopia (#837)
FluffiestFloof Feb 15, 2024
77c4a5a
Automatic Changelog Update (#837)
Feb 15, 2024
330e0e3
*Properly* fix salvage strings (#840)
DebugOk Feb 17, 2024
5ba1e6c
Glimmer Mite change (#845)
Guess-My-Name Feb 17, 2024
9a2f0e6
Glimmer Drain requires 5 crystal again (#838)
FluffiestFloof Feb 17, 2024
e598e90
Automatic Changelog Update (#838)
Feb 17, 2024
87c70a8
Update CODEOWNERS
DebugOk Feb 17, 2024
582b15f
Merge branch 'master' of https://github.com/DeltaV-Station/Delta-v in…
DEATHB4DEFEAT Feb 17, 2024
8b2bb06
submarines are not allowed
DEATHB4DEFEAT Feb 19, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Remove vehicles (#24681)
* Remove wheelchairs

Vehicle code is dogwater and wheelchairs just keeps exposing edgecases. If someone wants it brought it back they can do vehicle refactor.

* Also this one

* Remove vehicles

* goodbye vehicles

* Remove this check

* sasd

* Cronch

* Add sprites back

* jani

(cherry picked from commit d2f20d8955a25a32aa5fb9b3631a41921b464cd4)
metalgearsloth authored and DebugOk committed Feb 8, 2024
commit 4c7c904549ec17f17afa19e360ec53295994b7b5
4 changes: 0 additions & 4 deletions Content.Client/Buckle/BuckleSystem.cs
Original file line number Diff line number Diff line change
@@ -2,7 +2,6 @@
using Content.Shared.Buckle;
using Content.Shared.Buckle.Components;
using Content.Shared.Rotation;
using Content.Shared.Vehicle.Components;
using Robust.Client.GameObjects;

namespace Content.Client.Buckle;
@@ -26,9 +25,6 @@ private void OnBuckleAfterAutoHandleState(EntityUid uid, BuckleComponent compone
if (!TryComp<SpriteComponent>(uid, out var ownerSprite))
return;

if (HasComp<VehicleComponent>(component.LastEntityBuckledTo))
return;

// Adjust draw depth when the chair faces north so that the seat back is drawn over the player.
// Reset the draw depth when rotated in any other direction.
// TODO when ECSing, make this a visualizer
80 changes: 0 additions & 80 deletions Content.Client/Vehicle/VehicleSystem.cs

This file was deleted.

7 changes: 0 additions & 7 deletions Content.Server/Vehicle/VehicleSystem.cs

This file was deleted.

3 changes: 1 addition & 2 deletions Content.Shared/Buckle/Components/StrapComponent.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
using System.Numerics;
using Content.Shared.Alert;
using Content.Shared.Vehicle;
using Content.Shared.Whitelist;
using Robust.Shared.Audio;
using Robust.Shared.GameStates;
@@ -9,7 +8,7 @@
namespace Content.Shared.Buckle.Components;

[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
[Access(typeof(SharedBuckleSystem), typeof(SharedVehicleSystem))]
[Access(typeof(SharedBuckleSystem))]
public sealed partial class StrapComponent : Component
{
/// <summary>
18 changes: 1 addition & 17 deletions Content.Shared/Buckle/SharedBuckleSystem.Buckle.cs
Original file line number Diff line number Diff line change
@@ -16,7 +16,6 @@
using Content.Shared.Storage.Components;
using Content.Shared.Stunnable;
using Content.Shared.Throwing;
using Content.Shared.Vehicle.Components;
using Content.Shared.Verbs;
using Robust.Shared.Physics.Components;
using Robust.Shared.Physics.Events;
@@ -124,16 +123,6 @@ private void OnBuckleDownAttempt(EntityUid uid, BuckleComponent component, DownA

private void OnBuckleStandAttempt(EntityUid uid, BuckleComponent component, StandAttemptEvent args)
{
//Let entities stand back up while on vehicles so that they can be knocked down when slept/stunned
//This prevents an exploit that allowed people to become partially invulnerable to stuns
//while on vehicles

if (component.BuckledTo != null)
{
var buckle = component.BuckledTo;
if (TryComp<VehicleComponent>(buckle, out _))
return;
}
if (component.Buckled)
args.Cancel();
}
@@ -149,8 +138,7 @@ private void OnBuckleUpdateCanMove(EntityUid uid, BuckleComponent component, Upd
if (component.LifeStage > ComponentLifeStage.Running)
return;

if (component.Buckled &&
!HasComp<VehicleComponent>(component.BuckledTo)) // buckle+vehicle shitcode
if (component.Buckled) // buckle shitcode
args.Cancel();
}

@@ -436,10 +424,6 @@ public bool TryUnbuckle(EntityUid buckleUid, EntityUid userUid, bool force = fal
if (HasComp<SleepingComponent>(buckleUid) && buckleUid == userUid)
return false;

// If the strap is a vehicle and the rider is not the person unbuckling, return. Unless the rider is crit or dead.
if (TryComp<VehicleComponent>(strapUid, out var vehicle) && vehicle.Rider != userUid && !_mobState.IsIncapacitated(buckleUid))
return false;

// If the person is crit or dead in any kind of strap, return. This prevents people from unbuckling themselves while incapacitated.
if (_mobState.IsIncapacitated(buckleUid) && userUid == buckleUid)
return false;
4 changes: 2 additions & 2 deletions Content.Shared/Foldable/FoldableComponent.cs
Original file line number Diff line number Diff line change
@@ -4,10 +4,10 @@
namespace Content.Shared.Foldable;

/// <summary>
/// Used to create "foldable structures" that you can pickup like an item when folded. Used for rollerbeds and wheelchairs.
/// Used to create "foldable structures" that you can pickup like an item when folded.
/// </summary>
/// <remarks>
/// Wiill prevent any insertions into containers while this item is unfolded.
/// Will prevent any insertions into containers while this item is unfolded.
/// </remarks>
[RegisterComponent]
[NetworkedComponent]
1 change: 0 additions & 1 deletion Content.Shared/Traits/Assorted/LegsParalyzedComponent.cs
Original file line number Diff line number Diff line change
@@ -4,7 +4,6 @@ namespace Content.Shared.Traits.Assorted;

/// <summary>
/// Set player speed to zero and standing state to down, simulating leg paralysis.
/// Used for Wheelchair bound trait.
/// </summary>
[RegisterComponent, NetworkedComponent, Access(typeof(LegsParalyzedSystem))]
public sealed partial class LegsParalyzedComponent : Component
17 changes: 0 additions & 17 deletions Content.Shared/Vehicle/Components/InVehicleComponent.cs

This file was deleted.

25 changes: 0 additions & 25 deletions Content.Shared/Vehicle/Components/RiderComponent.cs

This file was deleted.

114 changes: 0 additions & 114 deletions Content.Shared/Vehicle/Components/VehicleComponent.cs

This file was deleted.

41 changes: 0 additions & 41 deletions Content.Shared/Vehicle/SharedVehicleSystem.Rider.cs

This file was deleted.

Loading