VigersRay 67c8ba2471 Merge remote-tracking branch 'refs/remotes/wizards/master' ... # Conflicts: # Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTab.xaml.cs # Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTabEntry.xaml # Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTabEntry.xaml.cs # Content.IntegrationTests/Tests/PostMapInitTest.cs # Content.Server/Chat/Systems/ChatSystem.cs # Content.Server/Clothing/Components/GloveHeatResistanceComponent.cs # Content.Server/Light/EntitySystems/PoweredLightSystem.cs # Content.Server/Medical/HealthAnalyzerSystem.cs # Content.Server/Medical/SuitSensors/SuitSensorComponent.cs # Content.Server/StationEvents/Events/MeteorSwarmSystem.cs # Content.Server/StationEvents/Events/StationEventSystem.cs # Content.Shared/Actions/SharedActionsSystem.cs # Content.Shared/Interaction/SharedInteractionSystem.cs # Resources/Prototypes/AlertLevels/alert_levels.yml # Resources/Prototypes/Catalog/Fills/Lockers/heads.yml # Resources/Prototypes/Catalog/Fills/Lockers/misc.yml # Resources/Prototypes/Catalog/VendingMachines/Inventories/engivend.yml # Resources/Prototypes/Datasets/Names/fortunes.yml # Resources/Prototypes/Datasets/ion_storm.yml # Resources/Prototypes/Entities/Clothing/Neck/mantles.yml # Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml # Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml # Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml # Resources/Prototypes/Entities/Objects/Fun/pai.yml # Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml # Resources/Prototypes/Entities/Objects/Specific/Medical/handheld_crew_monitor.yml # Resources/Prototypes/Entities/Structures/Machines/lathe.yml # Resources/Prototypes/GameRules/events.yml # Resources/Prototypes/Loadouts/Jobs/Science/research_director.yml # Resources/Prototypes/Recipes/Lathes/clothing.yml # Resources/Prototypes/game_presets.yml # Resources/Prototypes/secret_weights.yml # Resources/ServerInfo/Guidebook/Engineering/Singularity.xml # Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET-vox.png # Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET.png # Resources/Textures/Clothing/Head/Helmets/security.rsi/icon.png # Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-left.png # Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-right.png # Resources/Textures/Clothing/Head/Helmets/security.rsi/meta.json # Resources/Textures/Clothing/Mask/ert.rsi/meta.json # Resources/Textures/Clothing/Mask/joy.rsi/meta.json # Resources/Textures/Clothing/Mask/squadron.rsi/meta.json # Resources/Textures/Clothing/Neck/Cloaks/cmo.rsi/equipped-NECK.png # Resources/Textures/Clothing/Neck/Cloaks/cmo.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/equipped-OUTERCLOTHING.png # Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/icon.png # Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/inhand-left.png # Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/inhand-right.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/produce.png # Resources/Textures/Objects/Specific/Hydroponics/apple.rsi/produce.png # Resources/Textures/Objects/Specific/Hydroponics/cannabis.rsi/produce.png # Resources/Textures/Objects/Tools/crowbar.rsi/meta.json # Resources/Textures/Objects/Tools/crowbar.rsi/red-icon.png # Resources/Textures/Objects/Tools/crowbar.rsi/red-storage.png # Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/base.png # Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/broken.png # Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/burned.png # Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/empty.png # Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/glow.png # Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/meta.json # Resources/migration.yml		2024-08-14 19:55:44 +03:00
..
antagonist.yml	Говнокрад (#268)	2024-08-08 09:28:44 +03:00
cargo.yml	Guidebook Updates for the Amateur Spessman (#28603)	2024-06-09 01:00:43 +02:00
chemicals.yml	Changes in chemicals page in guidebook (#25831)	2024-04-01 07:20:37 +00:00
command.yml	Guidebook Updates for the Amateur Spessman (#28603)	2024-06-09 01:00:43 +02:00
engineering.yml	Add guidebook page for the RTG (#25040)	2024-02-20 23:38:29 -07:00
medical.yml	Give jobs & antags prototypes a guide field (#28614)	2024-06-06 05:05:58 -07:00
newplayer.yml	Guidebook Updates for the Amateur Spessman (#28603)	2024-06-09 01:00:43 +02:00
references.yml	enable search filters on drinks guidebook (#28815)	2024-06-10 09:20:58 -04:00
rules.yml	Update space law for contraband upate (#30937)	2024-08-12 04:58:20 -05:00
science.yml	SS14-26480 Roll Traversal Distorter into regular Artifact Analyzers (#26545)	2024-04-21 12:09:26 -04:00
security.yml	Fixed the guidebook listing every single rule (#28680)	2024-06-07 06:28:55 -05:00
service.yml	Guidebook Updates for the Amateur Spessman (#28603)	2024-06-09 01:00:43 +02:00
shiftandcrew.yml	Guidebook Updates for the Amateur Spessman (#28603)	2024-06-09 01:00:43 +02:00
species.yml	Vox guidebook entry (#29713)	2024-07-09 10:28:33 +10:00
station.yml	Open the guidebook when people with less than an hour playing join the round (#28774)	2024-06-09 12:26:48 -04:00