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

Fix crate deconstruction deleting all of its contents as well.

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-12-17 01:24:54 +01:00
parent dd274c392c
commit 22d1e8a427
6 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Content.Server/Storage/Components/EntityStorageComponent.cs
View File

@@ -2,6 +2,8 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;
using Content.Server.Construction;
using Content.Server.Construction.Components;
using Content.Server.Ghost.Components; using Content.Server.Ghost.Components;
using Content.Server.Tools; using Content.Server.Tools;
using Content.Shared.Acts; using Content.Shared.Acts;
@@ -150,6 +152,9 @@ namespace Content.Server.Storage.Components
Contents.ShowContents = _showContents; Contents.ShowContents = _showContents;
Contents.OccludesLight = _occludesLight; Contents.OccludesLight = _occludesLight;
if(_entMan.TryGetComponent(Owner, out ConstructionComponent? construction))
EntitySystem.Get<ConstructionSystem>().AddContainer(Owner, Contents.ID, construction);
if (_entMan.TryGetComponent<PlaceableSurfaceComponent?>(Owner, out var surface)) if (_entMan.TryGetComponent<PlaceableSurfaceComponent?>(Owner, out var surface))
{ {
EntitySystem.Get<PlaceableSurfaceSystem>().SetPlaceable(Owner, Open, surface); EntitySystem.Get<PlaceableSurfaceSystem>().SetPlaceable(Owner, Open, surface);

4
Resources/Changelog/Parts/crate.yml Normal file
View File

@@ -0,0 +1,4 @@
author: Zumorica
changes:
- type: Fix # One of the following: Add, Remove, Tweak, Fix
message: Crate deconstruction no longer deletes all of its contents.

5
Resources/Prototypes/Recipes/Crafting/Graphs/storage/crategenericsteel.yml
View File

@@ -10,7 +10,7 @@
amount: 5 amount: 5
doAfter: 5 doAfter: 5
- node: crategenericsteel - node: crategenericsteel
entity: CrateGenericSteel entity: CrateGenericSteel
edges: edges:
@@ -25,4 +25,5 @@
- !type:SpawnPrototype - !type:SpawnPrototype
prototype: SheetSteel1 prototype: SheetSteel1
amount: 5 amount: 5
- !type:DeleteEntity {} - !type:EmptyAllContainers
- !type:DeleteEntity

5
Resources/Prototypes/Recipes/Crafting/Graphs/storage/cratelivestock.yml
View File

@@ -10,7 +10,7 @@
amount: 5 amount: 5
doAfter: 5 doAfter: 5
- node: cratelivestock - node: cratelivestock
entity: CrateLivestock entity: CrateLivestock
edges: edges:
@@ -22,4 +22,5 @@
- !type:SpawnPrototype - !type:SpawnPrototype
prototype: MaterialWoodPlank1 prototype: MaterialWoodPlank1
amount: 5 amount: 5
- !type:DeleteEntity {} - !type:EmptyAllContainers
- !type:DeleteEntity

5
Resources/Prototypes/Recipes/Crafting/Graphs/storage/crateplastic.yml
View File

@@ -10,7 +10,7 @@
amount: 5 amount: 5
doAfter: 5 doAfter: 5
- node: crateplastic - node: crateplastic
entity: CratePlastic entity: CratePlastic
edges: edges:
@@ -25,4 +25,5 @@
- !type:SpawnPrototype - !type:SpawnPrototype
prototype: SheetPlastic1 prototype: SheetPlastic1
amount: 5 amount: 5
- !type:DeleteEntity {} - !type:EmptyAllContainers
- !type:DeleteEntity

9
Resources/Prototypes/Recipes/Crafting/Graphs/storage/cratesecure.yml
View File

@@ -1,5 +1,5 @@
- type: constructionGraph - type: constructionGraph
id: CrateSecure id: CrateSecure
start: start start: start
graph: graph:
- node: start - node: start
@@ -10,7 +10,7 @@
amount: 5 amount: 5
doAfter: 5 doAfter: 5
- node: cratesecure - node: cratesecure
entity: CrateSecure entity: CrateSecure
edges: edges:
@@ -22,9 +22,10 @@
- !type:StorageWelded - !type:StorageWelded
welded: false welded: false
- !type:Locked - !type:Locked
locked: false locked: false
completed: completed:
- !type:SpawnPrototype - !type:SpawnPrototype
prototype: SheetSteel1 prototype: SheetSteel1
amount: 5 amount: 5
- !type:DeleteEntity {} - !type:EmptyAllContainers
- !type:DeleteEntity