Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Many stuff (#555)

Browse Source 
* Drone bucket

* Weird insuls

* Not too strong

* No cult door bolts

* Emergency shuttle after round end fix

* Fix spiders
This commit is contained in:
Aviu00
2023-11-12 23:19:49 +09:00
committed by Aviu00
parent 0bd5b16c4b
commit 90792c52ce
3 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs
View File

@@ -96,8 +96,10 @@ public sealed partial class EmergencyShuttleSystem : EntitySystem
private void OnRoundStart(RoundStartingEvent ev) private void OnRoundStart(RoundStartingEvent ev)
{ {
CleanupEmergencyConsole(); // WD EDIT START
_roundEndCancelToken?.Cancel(); _roundEndCancelToken?.Cancel();
CleanupEmergencyConsole();
// WD EDIT END
_roundEndCancelToken = new CancellationTokenSource(); _roundEndCancelToken = new CancellationTokenSource();
} }

2
Content.Shared/Storage/EntitySystems/SharedEntityStorageSystem.cs
View File

@@ -215,7 +215,7 @@ public abstract class SharedEntityStorageSystem : EntitySystem
{ {
if (EntityManager.IsQueuedForDeletion(uid)) // WD if (EntityManager.IsQueuedForDeletion(uid)) // WD
return; return;
if (!ResolveStorage(uid, ref component)) if (!ResolveStorage(uid, ref component))
return; return;

12
Resources/Prototypes/Entities/Clothing/Hands/colored.yml
View File

@@ -184,9 +184,9 @@
- 0.5 - 0.5
- 0.5 - 0.5
- 0.75 - 0.75
- 1.25 - 0.75
- 1.25 - 0.75
- 1.5 - 1
- 1.5 - 1
- 1.5 - 1
- 1.5 - 1