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

Fix some bugs and tweak Rane's PRs that were merged yesterday (#7600)

Browse Source
This commit is contained in:
Rane
2022-04-16 19:04:16 -04:00
committed by GitHub
parent 88549da309
commit b5b6da018d
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Server/Botany/Systems/PlantHolderSystem.cs
View File

@@ -100,7 +100,7 @@ namespace Content.Server.Botany.Systems
{ {
if (!_botanySystem.TryGetSeed(seeds, out var seed)) if (!_botanySystem.TryGetSeed(seeds, out var seed))
return ; return ;
_popupSystem.PopupCursor(Loc.GetString("plant-holder-component-plant-success-message", _popupSystem.PopupCursor(Loc.GetString("plant-holder-component-plant-success-message",
("seedName", seed.Name), ("seedName", seed.Name),
("seedNoun", seed.Noun)), Filter.Entities(args.User)); ("seedNoun", seed.Noun)), Filter.Entities(args.User));
@@ -150,7 +150,7 @@ namespace Content.Server.Botany.Systems
_popupSystem.PopupCursor(Loc.GetString("plant-holder-component-remove-plant-message", _popupSystem.PopupCursor(Loc.GetString("plant-holder-component-remove-plant-message",
("name", Comp<MetaDataComponent>(uid).EntityName)), Filter.Entities(args.User)); ("name", Comp<MetaDataComponent>(uid).EntityName)), Filter.Entities(args.User));
_popupSystem.PopupEntity(Loc.GetString("plant-holder-component-remove-plant-others-message", _popupSystem.PopupEntity(Loc.GetString("plant-holder-component-remove-plant-others-message",
("otherName", Comp<MetaDataComponent>(args.User).EntityName)), uid, Filter.Pvs(args.User).RemoveWhereAttachedEntity(puid => puid == args.User)); ("name", Comp<MetaDataComponent>(args.User).EntityName)), uid, Filter.Pvs(args.User).RemoveWhereAttachedEntity(puid => puid == args.User));
component.RemovePlant(); component.RemovePlant();
} }
else else

2
Resources/Prototypes/Entities/Structures/Machines/stasisbed.yml
View File

@@ -1,7 +1,7 @@
- type: entity - type: entity
id: StasisBed id: StasisBed
name: stasis bed name: stasis bed
parent: BaseStructure parent: BaseMachinePowered
description: A bed that massively slows down the patient's metabolism, allowing more time to administer a proper treatment for stabilization. description: A bed that massively slows down the patient's metabolism, allowing more time to administer a proper treatment for stabilization.
components: components:
- type: StasisBed - type: StasisBed

6
Resources/Prototypes/Recipes/Construction/Graphs/furniture/bed.yml
View File

@@ -13,6 +13,9 @@
- material: Steel - material: Steel
amount: 2 amount: 2
doAfter: 1 doAfter: 1
- material: Cloth
amount: 2
doAfter: 1
- to: dogbed - to: dogbed
completed: completed:
- !type:SnapToGrid { } - !type:SnapToGrid { }
@@ -27,6 +30,9 @@
- material: Plasteel - material: Plasteel
amount: 2 amount: 2
doAfter: 1 doAfter: 1
- material: Durathread
amount: 2
doAfter: 1
- node: bed - node: bed
entity: Bed entity: Bed
edges: edges: