juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/upstream/master' into ed-13-05-2024-upstream

Browse Source 
# Conflicts:
#	Content.Shared/Lock/LockSystem.cs
#	Resources/Prototypes/Maps/oasis.yml
This commit is contained in:
Ed
2024-05-13 18:32:59 +03:00
parent 50c4fd3a58 1f03111ff8
commit dda8ea2b09
624 changed files with 43352 additions and 25174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Resources/ServerInfo/Guidebook/Antagonist/Revolutionaries.xml
View File

@@ -4,13 +4,13 @@
- Revolutionaries are antagonists that are sponsored by the Syndicate to take over the station.
## Head Revolutionaries
<Box>
<GuideEntityEmbed Entity="Flash" Caption="Flash"/>
<GuideEntityEmbed Entity="ClothingEyesGlassesSunglasses" Caption="Sunglasses"/>
</Box>
[color=#5e9cff]Head Revolutionaries[/color] are chosen at the start of the shift and are tasked with taking over the station by killing or exiling all of the Command staff. Head Revolutionaries will be given a [color=#a4885c]Flash[/color] and a pair of [color=#a4885c]Sunglasses[/color] to aid them.
[color=#5e9cff]Head Revolutionaries[/color] are chosen at the start of the shift and are tasked with taking over the station by killing, exiling or cuffing all of the Command staff. Head Revolutionaries will be given a [color=#a4885c]Flash[/color] and a pair of [color=#a4885c]Sunglasses[/color] to aid them.
## Conversion
@@ -41,7 +41,7 @@
## Objectives
You must eliminate or exile all of the following Command staff on station in no particular order.
You must eliminate, exile or arrest all of the following Command staff on station in no particular order.
- Captain
- Head of Personnel
- Chief Engineer

2
Resources/ServerInfo/Guidebook/Engineering/TEG.xml
View File

@@ -31,7 +31,7 @@
As stated above, there are many different layouts one can follow to heat up (or cool down) gases; this part of the guide will cover 2 common methods one will often see for the hot loop when the TEG is setup: [color=#a4885c]The Pipe Burn[/color], and [color=red]the Burn Chamber[/color].
Side note: Plasma fires burn relatively cool compared to, for example, Tritium fires. It may be viable to extract Tritium from an extraction setup (using a 97/3 ratio of O2/Plasma) and react it with Oxygen to get truly hellish temperatures for power. Although, this is just a recommendation; I'm not ya mum.
Side note: Plasma fires burn relatively cool compared to, for example, Tritium fires. It may be viable to extract Tritium from an extraction setup (using a 96/4 ratio of O2/Plasma) and react it with Oxygen to get truly hellish temperatures for power. Although, this is just a recommendation; I'm not ya mum.
## The Pipe Burn

4
Resources/ServerInfo/Guidebook/Medical/Cryogenics.xml
View File

@@ -43,8 +43,12 @@ Once things have been set up, you're going to require a specific medication, Cry
The standard pressure for a gas pump is 100.325 kpa. Cryoxadone works at under 170K, but it is standard practice to set the freezer to 100K for faster freezing.
<GuideReagentEmbed Reagent="Aloxadone"/>
<GuideReagentEmbed Reagent="Cryoxadone"/>
<GuideReagentEmbed Reagent="Doxarubixadone"/>
<GuideReagentEmbed Reagent="Dexalin"/>
<GuideReagentEmbed Reagent="Leporazine"/>
<GuideReagentEmbed Reagent="Necrosol"/>
<GuideReagentEmbed Reagent="Opporozidone"/>
</Document>