From b24d36eda036adcbd317d7c0bd7f86842713419f Mon Sep 17 00:00:00 2001 From: peptron1 <57651027+peptron1@users.noreply.github.com> Date: Mon, 28 Sep 2020 14:03:57 -0400 Subject: [PATCH] Add descriptions to a bunch of boxes (#2145) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * added a description for 3 masks * adding descriptions for some boxes * adding descriptions for some boxes * Cleanup (#2111) * Atmos debug helpers (#2108) * Atmos debug overlay * Pressure direction information * Atmos debug overlay: show excited tiles * General tweaks (#2109) * Removes a bunch of old Eris shoes * Changes the jackboots sprite to tgstation's * Prototypes nuked * Removes walk sound from jackboots, it was pretty annoying * Adds wood table icon * Adds wood plank and spawns it on wood table destroy. Also removes tg hand tele sprite. * Removes weird mask png * Removes bad pixel on security backpack * Adds filled utility belt to engineer and ce roles * Update Resources/Prototypes/Entities/Clothing/Shoes/shoes.yml Co-authored-by: Víctor Aguilera Puerto <6766154+Zumorica@users.noreply.github.com> * Fix power grid announcements overlapping power-down sounds (#2096) Both announcements play 3s after startup / shutdown Co-authored-by: Metal Gear Sloth * Replaces old airlock_deny sound effect with vgs airlock_deny (#2031) * Fix missing light mask * Refactors radiation (#2009) * Work on refactoring radiation. * mmmm grayons * fixes * Now you can specify whether the pulse will decay or not * whoops * Move IRadiationAct to shared, make DamageableComponent implement it instead and add metallic resistances to walls * General improvements, send draw and decay with state. Rename DPS to RadsPerSecond * E N T I T Y C O O R D I N A T E S * Entity coordinates goood * Remove unused using statements * resistances: metallicResistances * - type: Breakable moment Co-authored-by: DrSmugleaf * Gives the gas analyzer visual clues that it's open (#2110) * Gives the gas analyzer visual clues that it's open * Read Visualizer states from yaml * Storagefill component refactor (#2093) * refactored storagefill component to allow for random items, amount, and conditional exclusion * i fudged it * yaml for the already deleted filler components * ignoredcomponents & janifill * remainder of toolboxes done * emergencyclosetfill * really makes you think * it DOES really make you think * orGroup * exp111 suggestions * last touches * isNullOrEmpty * Adds new different reaction types. (#2114) * Adds new different reaction types. - Adds touch, injection and ingestion reactions for entities. - Adds tile reactions. - Removes GasSprayerComponent in favor of SprayComponent. - Gives fire extinguishers a safety. - Gives spray puffs a sprite. - Improved spray and fire extinguisher in general. - Fire extinguisher now ACTUALLY puts out fires. Amazing, eh? - Fire extinguisher sprays three 'clouds' at once. - Spraying flammable chemicals at fire makes them worse. Whoops! - Gives spray and fire extinguisher their classic sounds. - Most chemicals now don't make puddles. Too bad! - Space lube now makes a very slippery puddle. Honk. - Spraying water (or using a fire extinguisher) on existing puddles makes them bigger. * Fix solution tests * food base now has solution container with noexamine caps * Fix chemmaster not checking for reactions * Fix saltern's roundstart gas mix * PressureSiphonComponent (#2118) Co-authored-by: py01 * Fix footstep sounds not playing * Fix AI con crashes (#2119) Co-authored-by: Metal Gear Sloth * Adds IThrowCollide, Creaming people with cream pies and tactical stun baton throws (#2122) * Adds FlammableComponent, humans can now catch on fire. (#2115) * Comms console now restarts the round correctly. * Add flammable, creampie and creampied components to IgnoredComponents * Arcade fun - Ports over /vg/s SpaceVillain arcade game (#2125) * arcade fun * stuff * removed unused using statements added sound feedback win check fix reworked ui a bit * description rework * windowopen bug fixed * adds rewards, cool! * for unusualcrow * fixes Co-authored-by: Víctor Aguilera Puerto <6766154+Zumorica@users.noreply.github.com> * Rejuvenate extinguishes people who are on fire * Nukes Iconcomponent (#2102) * pfew * preview_state * ship it * weird stuff * fucked up rebasing * Update submodule Co-authored-by: Pieter-Jan Briers * fix formatting * god I don't understand git Co-authored-by: Swept Co-authored-by: 20kdc Co-authored-by: Víctor Aguilera Puerto <6766154+Zumorica@users.noreply.github.com> Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Co-authored-by: Metal Gear Sloth Co-authored-by: Víctor Aguilera Puerto Co-authored-by: DrSmugleaf Co-authored-by: Exp Co-authored-by: Paul Ritter Co-authored-by: py01 <60152240+collinlunn@users.noreply.github.com> Co-authored-by: py01 Co-authored-by: Pieter-Jan Briers --- .../Prototypes/Entities/Objects/Boxes/boxes_food.yml | 2 +- .../Entities/Objects/Boxes/boxes_general.yml | 12 ++++++------ .../Entities/Objects/Boxes/boxes_medical.yml | 6 +++--- .../Entities/Objects/Boxes/boxes_science.yml | 2 +- .../Entities/Objects/Boxes/boxes_security.yml | 6 +++--- .../Entities/Objects/Consumable/food_containers.yml | 4 ++++ 6 files changed, 18 insertions(+), 14 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Boxes/boxes_food.yml b/Resources/Prototypes/Entities/Objects/Boxes/boxes_food.yml index 63b1cad2e8..d46e1ec1fd 100644 --- a/Resources/Prototypes/Entities/Objects/Boxes/boxes_food.yml +++ b/Resources/Prototypes/Entities/Objects/Boxes/boxes_food.yml @@ -2,7 +2,7 @@ name: donkpocket box parent: BoxBase id: BoxDonkpocket - description: + description: 'Instructions: Heat in microwave. Product will cool if not eaten within seven minutes.' components: - type: StorageFill contents: diff --git a/Resources/Prototypes/Entities/Objects/Boxes/boxes_general.yml b/Resources/Prototypes/Entities/Objects/Boxes/boxes_general.yml index 11140bac18..824c5f345a 100644 --- a/Resources/Prototypes/Entities/Objects/Boxes/boxes_general.yml +++ b/Resources/Prototypes/Entities/Objects/Boxes/boxes_general.yml @@ -2,7 +2,7 @@ name: lightbulb box parent: BoxBase id: BoxLightbulb - description: + description: This box is shaped on the inside so that only light tubes and bulbs fit. components: - type: StorageFill contents: @@ -18,7 +18,7 @@ name: lighttube box parent: BoxBase id: BoxLighttube - description: + description: This box is shaped on the inside so that only light tubes and bulbs fit. components: - type: StorageFill contents: @@ -34,7 +34,7 @@ name: mixed lights box parent: BoxBase id: BoxLightMixed - description: + description: This box is shaped on the inside so that only light tubes and bulbs fit. components: - type: StorageFill contents: @@ -50,7 +50,7 @@ name: pda box parent: BoxBase id: BoxPDA - description: + description: A box of spare PDA microcomputers. components: - type: StorageFill contents: @@ -68,7 +68,7 @@ name: meson box parent: BoxBase id: BoxMesonScanners - description: + description: A box of spare meson goggles. components: - type: StorageFill contents: @@ -86,7 +86,7 @@ name: survival box parent: BoxBase id: BoxSurvival - description: + description: It's box with basic internals inside. components: - type: StorageFill contents: diff --git a/Resources/Prototypes/Entities/Objects/Boxes/boxes_medical.yml b/Resources/Prototypes/Entities/Objects/Boxes/boxes_medical.yml index 8588b3528b..33da1d0990 100644 --- a/Resources/Prototypes/Entities/Objects/Boxes/boxes_medical.yml +++ b/Resources/Prototypes/Entities/Objects/Boxes/boxes_medical.yml @@ -2,7 +2,7 @@ name: syringe box parent: BoxBase id: BoxSyringe - description: + description: A box full of syringes. components: - type: StorageFill contents: @@ -21,7 +21,7 @@ name: sterile box parent: BoxBase id: BoxSterile - description: + description: This box contains sterile medical masks. components: - type: StorageFill contents: @@ -40,7 +40,7 @@ name: latex box parent: BoxBase id: BoxLatex - description: + description: Contains sterile latex gloves. components: - type: StorageFill contents: diff --git a/Resources/Prototypes/Entities/Objects/Boxes/boxes_science.yml b/Resources/Prototypes/Entities/Objects/Boxes/boxes_science.yml index 4ad4fb37b8..d7b39dae2d 100644 --- a/Resources/Prototypes/Entities/Objects/Boxes/boxes_science.yml +++ b/Resources/Prototypes/Entities/Objects/Boxes/boxes_science.yml @@ -2,7 +2,7 @@ name: beaker box parent: BoxBase id: BoxBeaker - description: + description: A box full of beakers. components: - type: StorageFill contents: diff --git a/Resources/Prototypes/Entities/Objects/Boxes/boxes_security.yml b/Resources/Prototypes/Entities/Objects/Boxes/boxes_security.yml index f910882e37..afecee773f 100644 --- a/Resources/Prototypes/Entities/Objects/Boxes/boxes_security.yml +++ b/Resources/Prototypes/Entities/Objects/Boxes/boxes_security.yml @@ -2,7 +2,7 @@ name: handcuff box parent: BoxBase id: BoxHandcuff - description: + description: A box full of handcuffs. components: - type: StorageFill contents: @@ -21,7 +21,7 @@ name: flashbang box parent: BoxBase id: BoxFlashbang - description: + description: 'WARNING: These devices are extremely dangerous and can cause blindness or deafness in repeated use.' components: - type: StorageFill contents: @@ -40,7 +40,7 @@ name: sechud box parent: BoxBase id: BoxSechud - description: + description: A box of security glasses. components: - type: StorageFill contents: diff --git a/Resources/Prototypes/Entities/Objects/Consumable/food_containers.yml b/Resources/Prototypes/Entities/Objects/Consumable/food_containers.yml index 5d7c98fe6b..b7079088ee 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/food_containers.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/food_containers.yml @@ -135,6 +135,7 @@ parent: FoodContainerBase name: donut box id: FoodContainerDonutBox + description: Mmm. Donuts. components: - type: FoodContainer capacity: 6 @@ -155,6 +156,7 @@ parent: FoodContainerBase name: egg box (shut) id: FoodContainerEggBoxShut + description: A carton for containing eggs. It's closed right now. components: - type: FoodContainer capacity: 1 @@ -170,6 +172,7 @@ parent: FoodContainerBase name: egg box id: FoodContainerEggBox + description: A carton for containing eggs. components: - type: FoodContainer capacity: 12 @@ -242,6 +245,7 @@ parent: FoodContainerBase name: monkey cube box id: FoodContainerMonkeyCubeBox + description: Drymate brand monkey cubes. Just add water! components: - type: FoodContainer prototypes: