diff --git a/Resources/Prototypes/Entities/Constructible/Ground/catwalk.yml b/Resources/Prototypes/Entities/Constructible/Ground/catwalk.yml index 34bf08f1ad..70f932672b 100644 --- a/Resources/Prototypes/Entities/Constructible/Ground/catwalk.yml +++ b/Resources/Prototypes/Entities/Constructible/Ground/catwalk.yml @@ -1,6 +1,7 @@ -- type: entity +- type: entity id: Catwalk name: catwalk + description: A catwalk for easier EVA maneuvering and cable placement. components: - type: Clickable - type: InteractionOutline diff --git a/Resources/Prototypes/Entities/Constructible/Ground/furniture.yml b/Resources/Prototypes/Entities/Constructible/Ground/furniture.yml index 13413aa3b4..1ad0119924 100644 --- a/Resources/Prototypes/Entities/Constructible/Ground/furniture.yml +++ b/Resources/Prototypes/Entities/Constructible/Ground/furniture.yml @@ -1,6 +1,7 @@ -- type: entity +- type: entity name: stool id: Stool + description: Apply butt. components: - type: Clickable - type: InteractionOutline @@ -31,6 +32,7 @@ - type: entity name: white office chair id: ChairOfficeLight + description: You sit in this. Either by will or force. components: - type: Rotatable - type: Clickable @@ -50,25 +52,20 @@ - type: entity name: dark office chair id: ChairOfficeDark + parent: ChairOfficeLight components: - - type: Rotatable - - type: Clickable - - type: InteractionOutline - - type: Collidable - type: Sprite sprite: Constructible/Misc/furniture.rsi state: officechair_dark - type: Icon sprite: Constructible/Misc/furniture.rsi state: officechair_dark - - type: Strap - position: Stand - - type: Anchorable - - type: Pullable + - type: entity name: chair id: Chair + description: You sit in this. Either by will or force. components: - type: Clickable - type: InteractionOutline @@ -85,6 +82,20 @@ - type: Anchorable - type: Pullable +- type: entity + parent: Chair + name: comfy chair + id: ComfyChair + description: It looks comfy. + components: + - type: Sprite + sprite: Constructible/Misc/furniture.rsi + state: comfychair_preview + - type: Icon + sprite: Constructible/Misc/furniture.rsi + state: comfychair_preview + + - type: entity name: wooden chair id: ChairWood @@ -101,6 +112,7 @@ - type: entity name: bed id: Bed + description: This is used to lie in, sleep in or strap on. components: - type: Clickable - type: InteractionOutline diff --git a/Resources/Prototypes/Entities/Constructible/Ground/instruments.yml b/Resources/Prototypes/Entities/Constructible/Ground/instruments.yml index 22c23b358d..2b2c34f589 100644 --- a/Resources/Prototypes/Entities/Constructible/Ground/instruments.yml +++ b/Resources/Prototypes/Entities/Constructible/Ground/instruments.yml @@ -44,6 +44,7 @@ name: minimoog parent: BasePlaceableInstrument id: MinimoogInstrument + description: 'This is a minimoog, like a space piano, but more spacey!' components: - type: Instrument program: 81 @@ -73,6 +74,8 @@ name: xylophone parent: BasePlaceableInstrument id: XylophoneInstrument + # could not find the description for this item, so this is just temporary + description: That's a Xylophone components: - type: Instrument program: 13 diff --git a/Resources/Prototypes/Entities/Constructible/Ground/potted_plants.yml b/Resources/Prototypes/Entities/Constructible/Ground/potted_plants.yml index 8ab3e08883..76b48fd3e3 100644 --- a/Resources/Prototypes/Entities/Constructible/Ground/potted_plants.yml +++ b/Resources/Prototypes/Entities/Constructible/Ground/potted_plants.yml @@ -1,4 +1,4 @@ -- type: entity +- type: entity id: PottedPlantBase abstract: true components: diff --git a/Resources/Prototypes/Entities/Constructible/Ground/table.yml b/Resources/Prototypes/Entities/Constructible/Ground/table.yml index 3a3b781e98..6c0c97e2af 100644 --- a/Resources/Prototypes/Entities/Constructible/Ground/table.yml +++ b/Resources/Prototypes/Entities/Constructible/Ground/table.yml @@ -1,6 +1,7 @@ -- type: entity +- type: entity id: Table name: "table" + description: A square piece of metal standing on four metal legs. It can not move. components: - type: Clickable - type: InteractionOutline @@ -32,6 +33,7 @@ id: TableWood parent: Table name: "wood table" + description: Do not apply fire to this. Rumour says it burns easily. components: - type: Sprite sprite: Constructible/Structures/Tables/wood.rsi diff --git a/Resources/Prototypes/Entities/Constructible/Ground/wires.yml b/Resources/Prototypes/Entities/Constructible/Ground/wires.yml index 94dab9b10d..d4625c07c2 100644 --- a/Resources/Prototypes/Entities/Constructible/Ground/wires.yml +++ b/Resources/Prototypes/Entities/Constructible/Ground/wires.yml @@ -1,6 +1,7 @@ - type: entity abstract: true id: WireBase + description: A flexible superconducting cable for heavy-duty power transfer placement: mode: SnapgridCenter components: diff --git a/Resources/Prototypes/Entities/Constructible/Power/computers.yml b/Resources/Prototypes/Entities/Constructible/Power/computers.yml index afe37ff724..e63f0bc0db 100644 --- a/Resources/Prototypes/Entities/Constructible/Power/computers.yml +++ b/Resources/Prototypes/Entities/Constructible/Power/computers.yml @@ -54,6 +54,7 @@ id: ComputerAlert parent: ComputerBase name: alerts computer + description: Used to access the station's automated alert system. components: - type: Appearance visuals: @@ -66,6 +67,7 @@ id: ComputerPowerMonitoring parent: ComputerBase name: power monitoring computer + description: It monitors power levels across the station. components: - type: Appearance visuals: @@ -77,7 +79,8 @@ - type: entity id: ComputerSupplyOrdering parent: ComputerBase - name: cargo ordering computer + name: Cargo ordering computer + description: Used to order supplies, approve requests, and control the shuttle. components: - type: Appearance visuals: @@ -110,6 +113,7 @@ id: ComputerSupplyRequest parent: ComputerSupplyOrdering name: cargo request computer + description: Used to request supplies from cargo. components: - type: Appearance visuals: @@ -123,6 +127,7 @@ id: ComputerMedicalRecords parent: ComputerBase name: medical records computer + description: This can be used to check medical records. components: - type: Appearance visuals: @@ -135,6 +140,7 @@ id: ComputerResearchAndDevelopment parent: ComputerBase name: R&D computer + description: 'A computer used to interface with R&D tools.' components: - type: Appearance visuals: @@ -158,6 +164,7 @@ id: ComputerId parent: ComputerBase name: ID card computer + description: Terminal for programming Nanotrasen employee ID cards to access parts of the station. components: - type: AccessReader access: [["HeadOfPersonnel"]] @@ -176,6 +183,7 @@ id: computerBodyScanner parent: ComputerBase name: body scanner computer + description: That's a body scanner. components: - type: BodyScanner - type: UserInterface @@ -192,6 +200,7 @@ id: ComputerComms parent: ComputerBase name: communications computer + description: This can be used for various important functions. Still under developement. components: - type: Appearance visuals: @@ -208,6 +217,7 @@ id: ComputerSolarControl parent: ComputerBase name: Solar Control Computer + description: A controller for solar panel arrays. components: - type: Appearance visuals: diff --git a/Resources/Prototypes/Entities/Constructible/Power/lathe.yml b/Resources/Prototypes/Entities/Constructible/Power/lathe.yml index 40f7637cdc..87acb38582 100644 --- a/Resources/Prototypes/Entities/Constructible/Power/lathe.yml +++ b/Resources/Prototypes/Entities/Constructible/Power/lathe.yml @@ -33,6 +33,7 @@ parent: BaseLathe id: Autolathe name: "autolathe" + description: It produces items using metal and glass. components: - type: Sprite sprite: Constructible/Power/autolathe.rsi @@ -80,6 +81,7 @@ parent: BaseLathe id: Protolathe name: "protolathe" + description: Converts raw materials into useful objects. components: - type: Sprite sprite: Constructible/Power/protolathe.rsi diff --git a/Resources/Prototypes/Entities/Constructible/Power/research.yml b/Resources/Prototypes/Entities/Constructible/Power/research.yml index ea0676666a..1759254613 100644 --- a/Resources/Prototypes/Entities/Constructible/Power/research.yml +++ b/Resources/Prototypes/Entities/Constructible/Power/research.yml @@ -1,6 +1,7 @@ - type: entity id: ResearchAndDevelopmentServer name: "R&D server" + description: 'Thats a R&D server' components: - type: Sprite sprite: Constructible/Power/server.rsi diff --git a/Resources/Prototypes/Entities/Constructible/Power/turret.yml b/Resources/Prototypes/Entities/Constructible/Power/turret.yml index 0fc0da08e6..b7f7b86492 100644 --- a/Resources/Prototypes/Entities/Constructible/Power/turret.yml +++ b/Resources/Prototypes/Entities/Constructible/Power/turret.yml @@ -1,6 +1,8 @@ -- type: entity +- type: entity id: TurretBase name: turret base + #may have to change later + description: That is a turret components: - type: Clickable - type: InteractionOutline @@ -11,6 +13,8 @@ - type: entity id: TurretTopGun name: turret (gun) + #May change later + description: That is a turret components: - type: Clickable - type: InteractionOutline diff --git a/Resources/Prototypes/Entities/Constructible/Walls/asteroid.yml b/Resources/Prototypes/Entities/Constructible/Walls/asteroid.yml index a621d1b896..448ff223d6 100644 --- a/Resources/Prototypes/Entities/Constructible/Walls/asteroid.yml +++ b/Resources/Prototypes/Entities/Constructible/Walls/asteroid.yml @@ -1,6 +1,7 @@ -- type: entity +- type: entity id: AsteroidRock name: asteroid rock + description: That's an asteroid components: - type: AsteroidRock - type: Clickable diff --git a/Resources/Prototypes/Entities/Constructible/Walls/girder.yml b/Resources/Prototypes/Entities/Constructible/Walls/girder.yml index d4dedfc92d..c19ff0eb6e 100644 --- a/Resources/Prototypes/Entities/Constructible/Walls/girder.yml +++ b/Resources/Prototypes/Entities/Constructible/Walls/girder.yml @@ -1,6 +1,7 @@ - type: entity id: Girder name: girder + description: A large structural assembly made out of metal; It requires a layer of metal before it can be considered a wall. components: - type: Clickable - type: InteractionOutline diff --git a/Resources/Prototypes/Entities/Constructible/Walls/mirror.yml b/Resources/Prototypes/Entities/Constructible/Walls/mirror.yml index 4c9a3fee58..cede1e0c40 100644 --- a/Resources/Prototypes/Entities/Constructible/Walls/mirror.yml +++ b/Resources/Prototypes/Entities/Constructible/Walls/mirror.yml @@ -1,6 +1,7 @@ - type: entity id: Mirror name: mirror + description: 'Mirror mirror on the wall , who''s the most robust of them all?' components: - type: Sprite sprite: Constructible/Misc/mirror.rsi diff --git a/Resources/Prototypes/Entities/Constructible/Walls/windows.yml b/Resources/Prototypes/Entities/Constructible/Walls/windows.yml index bcecaf60cf..dbb604d2ed 100644 --- a/Resources/Prototypes/Entities/Constructible/Walls/windows.yml +++ b/Resources/Prototypes/Entities/Constructible/Walls/windows.yml @@ -1,4 +1,4 @@ -- type: entity +- type: entity id: Window name: window description: Don't smudge up the glass down there. diff --git a/Resources/Prototypes/Entities/Objects/Consumable/drinks.yml b/Resources/Prototypes/Entities/Objects/Consumable/drinks.yml index 538af7dd14..a2f00630a2 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/drinks.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/drinks.yml @@ -1,4 +1,4 @@ -# TODO: Find remaining cans and move to drinks_cans +# TODO: Find remaining cans and move to drinks_cans # TODO: Find empty containers (e.g. mug, pitcher) and move to their own yml # TODO: Move bottles to their own yml - type: entity @@ -1353,7 +1353,7 @@ parent: DrinkGlassBase id: DrinkScrewdriverGlass name: screwdriver glass - description: Vodka, mixed with plain ol' orange juice. The result is surprisingly delicious. + description: "Vodka, mixed with plain ol' orange juice. The result is surprisingly delicious." components: - type: Drink - type: Sprite diff --git a/Resources/Prototypes/Entities/Objects/Consumable/trash_drinks.yml b/Resources/Prototypes/Entities/Objects/Consumable/trash_drinks.yml index 9ea6e8240b..7ea2dc9275 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/trash_drinks.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/trash_drinks.yml @@ -1,9 +1,10 @@ -# These can still be used as containers +# These can still be used as containers - type: entity name: base empty bottle parent: BaseItem abstract: true id: DrinkBottleBaseEmpty + description: That's an empty bottle. components: - type: LoopingSound - type: Sprite diff --git a/Resources/Prototypes/Entities/Objects/Fun/instruments.yml b/Resources/Prototypes/Entities/Objects/Fun/instruments.yml index 4d641f9cb7..97b6d71fd2 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/instruments.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/instruments.yml @@ -1,8 +1,9 @@ -- type: entity +- type: entity name: basehandheldinstrument parent: BaseItem id: BaseHandheldInstrument abstract: true + description: That's a Instrument components: - type: Instrument handheld: true diff --git a/Resources/Prototypes/Entities/Objects/Misc/bedsheets.yml b/Resources/Prototypes/Entities/Objects/Misc/bedsheets.yml index ab6ec92159..bdd598aedc 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/bedsheets.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/bedsheets.yml @@ -1,8 +1,9 @@ -- type: entity +- type: entity parent: BaseItem id: BedsheetBase name: BedsheetBase abstract: true + description: A surprisingly soft linen bedsheet. placement: mode: SnapgridCenter snap: @@ -75,6 +76,7 @@ id: BedsheetCaptain parent: BedsheetBase name: captain's bedsheet + description: It has a Nanotrasen symbol on it, and was woven with a revolutionary new kind of thread guaranteed to have 0.01% permeability for most non-chemical substances, popular among most modern captains. components: - type: Sprite state: sheetcaptain diff --git a/Resources/Prototypes/Entities/Objects/Misc/teleporters.yml b/Resources/Prototypes/Entities/Objects/Misc/teleporters.yml index e929d7e53f..ea1ee9ccb4 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/teleporters.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/teleporters.yml @@ -1,4 +1,4 @@ -- type: entity +- type: entity name: "basehandtele" parent: BaseItem id: BaseHandTele diff --git a/Resources/Prototypes/Entities/Objects/Misc/utensils.yml b/Resources/Prototypes/Entities/Objects/Misc/utensils.yml index c8ac6b3995..9b1a9ccc3e 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/utensils.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/utensils.yml @@ -1,4 +1,4 @@ -- type: entity +- type: entity parent: BaseItem id: UtensilBase abstract: true diff --git a/Resources/Prototypes/Entities/Objects/Power/light_bulb.yml b/Resources/Prototypes/Entities/Objects/Power/light_bulb.yml index f807df3aa3..d0bdeaf883 100644 --- a/Resources/Prototypes/Entities/Objects/Power/light_bulb.yml +++ b/Resources/Prototypes/Entities/Objects/Power/light_bulb.yml @@ -1,7 +1,8 @@ -- type: entity +- type: entity parent: BaseLightbulb name: light bulb id: LightBulb + description: That's a light bulb components: - type: LightBulb bulb: Bulb @@ -26,6 +27,7 @@ parent: BaseLightbulb name: light tube id: LightTube + description: That's a light fixture. components: - type: LightBulb bulb: Tube diff --git a/Resources/Prototypes/Entities/Objects/Tools/tools.yml b/Resources/Prototypes/Entities/Objects/Tools/tools.yml index b3ef7a4d07..ef5191d36c 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/tools.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/tools.yml @@ -70,7 +70,7 @@ name: welding tool parent: BaseItem id: Welder - description: Melts anything as long as it's fueled, don't forget your eye protection! + description: 'Melts anything as long as it''s fueled, don''t forget your eye protection!' components: - type: Sprite sprite: Objects/Tools/welder.rsi