Merge remote-tracking branch 'upstream/master' into upstream
# Conflicts: # Content.Client/Access/AccessOverlay.cs # Content.Client/Access/UI/IdCardConsoleBoundUserInterface.cs # Content.Client/Access/UI/IdCardConsoleWindow.xaml # Content.Client/Access/UI/IdCardConsoleWindow.xaml.cs # Content.Client/Chemistry/UI/InjectorStatusControl.cs # Content.Client/StatusIcon/StatusIconOverlay.cs # Content.Client/Stylesheets/StyleNano.cs # Content.Client/UserInterface/Systems/Chat/ChatUIController.cs # Content.Client/UserInterface/Systems/Chat/Widgets/ChatBox.xaml # Content.Server/Access/Systems/IdCardConsoleSystem.cs # Content.Server/Administration/Commands/AGhost.cs # Content.Server/Chemistry/EntitySystems/ReagentDispenserSystem.cs # Content.Server/Connection/ConnectionManager.cs # Content.Server/DeviceLinking/Systems/SignalTimerSystem.cs # Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs # Content.Server/GameTicking/GameTicker.RoundFlow.cs # Content.Server/GameTicking/GameTicker.Spawning.cs # Content.Server/Humanoid/Systems/HumanoidAppearanceSystem.cs # Content.Server/Resist/EscapeInventorySystem.cs # Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs # Content.Shared/Access/Components/IdCardConsoleComponent.cs # Content.Shared/Anomaly/SharedAnomalySystem.cs # Content.Shared/Bed/Sleep/SharedSleepingSystem.cs # Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs # Content.Shared/Lock/LockSystem.cs # Content.Shared/RCD/Systems/RCDSystem.cs # Content.Shared/Roles/JobPrototype.cs # Content.Shared/StatusIcon/StatusIconPrototype.cs # Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs # Resources/Audio/Machines/attributions.yml # Resources/Locale/en-US/rcd/components/rcd-component.ftl # Resources/Maps/reach.yml # Resources/Prototypes/Catalog/Cargo/cargo_vending.yml # Resources/Prototypes/Catalog/Fills/Lockers/heads.yml # Resources/Prototypes/Catalog/Fills/Lockers/security.yml # Resources/Prototypes/Catalog/ReagentDispensers/beverage.yml # Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml # Resources/Prototypes/Catalog/VendingMachines/Inventories/cola.yml # Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml # Resources/Prototypes/Catalog/VendingMachines/Inventories/pwrgame.yml # Resources/Prototypes/Catalog/VendingMachines/Inventories/shamblersjuice.yml # Resources/Prototypes/Catalog/VendingMachines/Inventories/soda.yml # Resources/Prototypes/Catalog/VendingMachines/Inventories/spaceup.yml # Resources/Prototypes/Catalog/VendingMachines/Inventories/starkist.yml # Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml # Resources/Prototypes/DeviceLinking/sink_ports.yml # Resources/Prototypes/Entities/Clothing/Back/duffel.yml # Resources/Prototypes/Entities/Clothing/Belt/base_clothingbelt.yml # Resources/Prototypes/Entities/Clothing/Neck/misc.yml # Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml # Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml # Resources/Prototypes/Entities/Mobs/Customization/Markings/gauze.yml # Resources/Prototypes/Entities/Objects/Devices/Electronics/door.yml # Resources/Prototypes/Entities/Objects/Magic/books.yml # Resources/Prototypes/Entities/Objects/Materials/Sheets/glass.yml # Resources/Prototypes/Entities/Objects/Materials/Sheets/metal.yml # Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml # Resources/Prototypes/Entities/Objects/Misc/tiles.yml # Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml # Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml # Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml # Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml # Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_assembly.yml # Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml # Resources/Prototypes/Entities/Structures/Doors/Airlocks/highsec.yml # Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml # Resources/Prototypes/Entities/Structures/Doors/Firelocks/frame.yml # Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml # Resources/Prototypes/Entities/Structures/Doors/SecretDoor/secret_door.yml # Resources/Prototypes/Entities/Structures/Doors/Windoors/assembly.yml # Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml # Resources/Prototypes/Entities/Structures/Machines/lathe.yml # Resources/Prototypes/Entities/Structures/Power/cable_terminal.yml # Resources/Prototypes/Entities/Structures/Storage/Tanks/base_structuretanks.yml # Resources/Prototypes/Entities/Structures/Walls/grille.yml # Resources/Prototypes/Recipes/Construction/Graphs/structures/shutter.yml # Resources/Prototypes/Recipes/Crafting/Graphs/improvised/flowercrown.yml # Resources/Prototypes/Recipes/Crafting/improvised.yml # Resources/Prototypes/Roles/Jobs/Security/detective.yml # Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml # Resources/Prototypes/Roles/Jobs/Security/security_officer.yml # Resources/Prototypes/Roles/Jobs/Security/warden.yml # Resources/Prototypes/StatusEffects/health.yml # Resources/Prototypes/Voice/speech_emotes.yml # Resources/Prototypes/lobbyscreens.yml # Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertchaplain.rsi/equipped-OUTERCLOTHING-body-slim.png # Resources/Textures/Decals/bricktile.rsi/white_box.png # Resources/Textures/Objects/Misc/books.rsi/meta.json # Resources/migration.yml
This commit is contained in:
@@ -0,0 +1,9 @@
|
||||
<Document>
|
||||
|
||||
# Biological
|
||||
|
||||
These reagents include chemicals that you can get from certain materials and from living things. To get the other chemicals you have to use machines like the electrolyzer and the centrifuge.
|
||||
|
||||
<GuideReagentGroupEmbed Group="Biological"/>
|
||||
|
||||
</Document>
|
||||
14
Resources/ServerInfo/Guidebook/ChemicalTabs/Botany.xml
Normal file
14
Resources/ServerInfo/Guidebook/ChemicalTabs/Botany.xml
Normal file
@@ -0,0 +1,14 @@
|
||||
<Document>
|
||||
|
||||
# Botanical Chemicals
|
||||
|
||||
These chemicals are used by botanists. Some of the chemicals change the properties of the plants.
|
||||
|
||||
<GuideReagentEmbed Reagent="Ammonia"/>
|
||||
<GuideReagentEmbed Reagent="Diethylamine"/>
|
||||
<GuideReagentEmbed Reagent="EZNutrient"/>
|
||||
<GuideReagentEmbed Reagent="Left4Zed"/>
|
||||
<GuideReagentEmbed Reagent="RobustHarvest"/>
|
||||
<GuideReagentEmbed Reagent="UnstableMutagen"/>
|
||||
|
||||
</Document>
|
||||
9
Resources/ServerInfo/Guidebook/ChemicalTabs/Elements.xml
Normal file
9
Resources/ServerInfo/Guidebook/ChemicalTabs/Elements.xml
Normal file
@@ -0,0 +1,9 @@
|
||||
<Document>
|
||||
|
||||
# Elements
|
||||
|
||||
This list contains all the basic reagents used to make other chemicals.
|
||||
|
||||
<GuideReagentGroupEmbed Group="Elements"/>
|
||||
|
||||
</Document>
|
||||
8
Resources/ServerInfo/Guidebook/ChemicalTabs/Foods.xml
Normal file
8
Resources/ServerInfo/Guidebook/ChemicalTabs/Foods.xml
Normal file
@@ -0,0 +1,8 @@
|
||||
<Document>
|
||||
# Foods
|
||||
|
||||
These reagents are mostly used in the kitchen. Very helpful for Chefs and/or Service Workers.
|
||||
|
||||
<GuideReagentGroupEmbed Group="Foods"/>
|
||||
|
||||
</Document>
|
||||
@@ -0,0 +1,5 @@
|
||||
<Document>
|
||||
# Narcotics
|
||||
The reagents listed in this category includes stimulants, hallucinogens and other drug-like effects.
|
||||
<GuideReagentGroupEmbed Group="Narcotics"/>
|
||||
</Document>
|
||||
5
Resources/ServerInfo/Guidebook/ChemicalTabs/Other.xml
Normal file
5
Resources/ServerInfo/Guidebook/ChemicalTabs/Other.xml
Normal file
@@ -0,0 +1,5 @@
|
||||
<Document>
|
||||
# Other
|
||||
These are the other regeants listed in the Chemicals page.
|
||||
<GuideReagentGroupEmbed Group="Unknown"/>
|
||||
</Document>
|
||||
@@ -0,0 +1,5 @@
|
||||
<Document>
|
||||
# Pyrotechnics
|
||||
These chemicals are flammmable and causes hazardous effects when making them (Plasma gas and explosions). It is recommmended to make these chemicals in a safe environment.
|
||||
<GuideReagentGroupEmbed Group="Pyrotechnic"/>
|
||||
</Document>
|
||||
5
Resources/ServerInfo/Guidebook/ChemicalTabs/Toxins.xml
Normal file
5
Resources/ServerInfo/Guidebook/ChemicalTabs/Toxins.xml
Normal file
@@ -0,0 +1,5 @@
|
||||
<Document>
|
||||
# Toxins
|
||||
The chemicals in this list contain toxins that induce certain effects and can cause death. Use responsibly.
|
||||
<GuideReagentGroupEmbed Group="Toxins"/>
|
||||
</Document>
|
||||
Reference in New Issue
Block a user