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

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

View File

@@ -100,7 +100,7 @@ namespace Content.Server.Botany.Systems
{
if (!_botanySystem.TryGetSeed(seeds, out var seed))
return ;
_popupSystem.PopupCursor(Loc.GetString("plant-holder-component-plant-success-message",
("seedName", seed.Name),
("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",
("name", Comp<MetaDataComponent>(uid).EntityName)), Filter.Entities(args.User));
_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();
}
else

View File

@@ -1,7 +1,7 @@
- type: entity
id: StasisBed
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.
components:
- type: StasisBed

View File

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