RavmorganButOnCocaine
|
026ab3b445
|
Automatic changelog update
|
2024-04-21 20:45:12 +00:00 |
|
RavmorganButOnCocaine
|
0d761e07d7
|
Automatic changelog update
|
2024-04-21 15:08:31 +00:00 |
|
RavmorganButOnCocaine
|
5cb393e630
|
Automatic changelog update
|
2024-04-20 11:26:20 +00:00 |
|
Remuchi
|
e2b6002076
|
Merge remote-tracking branch 'origin/master' into upstream
# Conflicts:
# Content.Server/Antag/AntagSelectionSystem.cs
# Content.Server/Changeling/ChangelingRuleSystem.cs
# Content.Server/Changeling/ChangelingSystem.Abilities.cs
# Content.Server/Doors/Systems/DoorSystem.cs
# Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
# Content.Server/GameTicking/Rules/RevolutionaryRuleSystem.cs
# Content.Server/GameTicking/Rules/TraitorRuleSystem.cs
# Content.Server/GameTicking/Rules/ZombieRuleSystem.cs
# Content.Server/Holosign/HolosignSystem.cs
# Content.Server/Revenant/EntitySystems/RevenantSystem.Abilities.cs
# Content.Server/_White/Cult/GameRule/CultRuleComponent.cs
# Content.Server/_White/Cult/GameRule/CultRuleSystem.cs
# Content.Server/_White/Cult/Runes/Systems/CultSystem.Rune.cs
# Content.Server/_White/Keyhole/KeyholeSystem.cs
# Content.Server/_White/MeatyOre/MeatyOreStoreSystem.cs
# Content.Shared/Projectiles/SharedProjectileSystem.cs
# Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
# Content.Shared/_White/Keyhole/Components/KeyBaseComponent.cs
# Resources/Locale/ru-RU/White/stuff.ftl/runes-entities.ftl
# Resources/Locale/ru-RU/_white/cult/blood-spear.ftl
# Resources/Locale/ru-RU/_white/cult/bolt-barrage.ftl
# Resources/Locale/ru-RU/_white/cult/cult.ftl
# Resources/Locale/ru-RU/_white/cult/gui.ftl
# Resources/Locale/ru-RU/cult/cult-structure.ftl
# Resources/Locale/ru-RU/cult/pylon.ftl
# Resources/Maps/White/Scoupidia.yml
# Resources/Maps/White/Void.yml
# Resources/Maps/White/WonderBox.yml
# Resources/Prototypes/Actions/types.yml
# Resources/Prototypes/Atmospherics/gases.yml
# Resources/Prototypes/Catalog/Cargo/cargo_atmospherics.yml
# Resources/Prototypes/Catalog/Cargo/cargo_vending.yml
# Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml
# Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
# Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
# Resources/Prototypes/Catalog/uplink_catalog.yml
# Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml
# Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml
# Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml
# Resources/Prototypes/Entities/Objects/Weapons/Melee/sledgehammer.yml
# Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
# Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_assembly.yml
# Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml
# Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml
# Resources/Prototypes/Entities/Structures/Doors/Firelocks/frame.yml
# Resources/Prototypes/Entities/Structures/Doors/SecretDoor/secret_door.yml
# Resources/Prototypes/Entities/Structures/Doors/Windoors/assembly.yml
# Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml
# Resources/Prototypes/Entities/Structures/Furniture/dresser.yml
# Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml
# Resources/Prototypes/Entities/Structures/Power/cable_terminal.yml
# Resources/Prototypes/Entities/Structures/Walls/grille.yml
# Resources/Prototypes/Entities/Structures/Walls/walls.yml
# Resources/Prototypes/Entities/Structures/stairs.yml
# Resources/Prototypes/_White/Entities/Objects/Misc/books.yml
|
2024-04-13 13:59:00 +07:00 |
|
Remuchi
|
d2d501dbc0
|
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
|
2024-04-13 11:29:33 +07:00 |
|
RavmorganButOnCocaine
|
98a84a5549
|
Automatic changelog update
|
2024-04-12 14:09:30 +00:00 |
|
RavmorganButOnCocaine
|
6abfa020a2
|
Automatic changelog update
|
2024-04-11 16:54:28 +00:00 |
|
PJBot
|
28e5db7be5
|
Automatic changelog update
|
2024-04-09 22:22:02 +00:00 |
|
PJBot
|
3ae4b5884b
|
Automatic changelog update
|
2024-04-09 22:19:13 +00:00 |
|
PJBot
|
862f820708
|
Automatic changelog update
|
2024-04-09 15:26:27 +00:00 |
|
PJBot
|
694ae001fd
|
Automatic changelog update
|
2024-04-09 08:05:58 +00:00 |
|
PJBot
|
14866173c0
|
Automatic changelog update
|
2024-04-08 15:35:41 +00:00 |
|
PJBot
|
7f56ba0155
|
Automatic changelog update
|
2024-04-08 15:12:04 +00:00 |
|
PJBot
|
2bbae3ecc8
|
Automatic changelog update
|
2024-04-08 15:07:04 +00:00 |
|
PJBot
|
5e2f1e735d
|
Automatic changelog update
|
2024-04-08 03:18:35 +00:00 |
|
PJBot
|
9811173a1a
|
Automatic changelog update
|
2024-04-08 03:17:18 +00:00 |
|
RavmorganButOnCocaine
|
c2b6fd3c24
|
Automatic changelog update
|
2024-04-07 18:23:52 +00:00 |
|
PJBot
|
637526773f
|
Automatic changelog update
|
2024-04-07 00:00:03 +00:00 |
|
PJBot
|
98d3ee293c
|
Automatic changelog update
|
2024-04-06 22:28:22 +00:00 |
|
PJBot
|
53de870407
|
Automatic changelog update
|
2024-04-06 20:17:54 +00:00 |
|
RavmorganButOnCocaine
|
b37810fcd3
|
Automatic changelog update
|
2024-04-06 12:32:12 +00:00 |
|
PJBot
|
813a0b7b7f
|
Automatic changelog update
|
2024-04-06 04:50:20 +00:00 |
|
PJBot
|
47d4a0a411
|
Automatic changelog update
|
2024-04-06 04:42:29 +00:00 |
|
PJBot
|
5e20c18cb8
|
Automatic changelog update
|
2024-04-06 01:56:37 +00:00 |
|
PJBot
|
34980efdb5
|
Automatic changelog update
|
2024-04-05 21:07:17 +00:00 |
|
PJBot
|
d94eba8c52
|
Automatic changelog update
|
2024-04-05 20:36:38 +00:00 |
|
PJBot
|
e0ac00b256
|
Automatic changelog update
|
2024-04-05 17:30:27 +00:00 |
|
PJBot
|
ec77a161d9
|
Automatic changelog update
|
2024-04-05 15:43:18 +00:00 |
|
PJBot
|
0afb3337b0
|
Automatic changelog update
|
2024-04-05 07:20:48 +00:00 |
|
PJBot
|
3d88b8ced2
|
Automatic changelog update
|
2024-04-05 03:16:07 +00:00 |
|
PJBot
|
38f9c1c316
|
Automatic changelog update
|
2024-04-04 23:06:07 +00:00 |
|
PJBot
|
6e2ab06edd
|
Automatic changelog update
|
2024-04-04 19:31:18 +00:00 |
|
RavmorganButOnCocaine
|
e9e07a23cd
|
Automatic changelog update
|
2024-04-04 13:46:07 +00:00 |
|
PJBot
|
8dc53346d3
|
Automatic changelog update
|
2024-04-04 08:41:00 +00:00 |
|
PJBot
|
827cd0f6e5
|
Automatic changelog update
|
2024-04-04 08:36:50 +00:00 |
|
PJBot
|
b331228d1c
|
Automatic changelog update
|
2024-04-04 07:21:11 +00:00 |
|
PJBot
|
d8af6a0d14
|
Automatic changelog update
|
2024-04-04 06:29:39 +00:00 |
|
PJBot
|
705f029424
|
Automatic changelog update
|
2024-04-04 06:26:59 +00:00 |
|
PJBot
|
ab3e46a32a
|
Automatic changelog update
|
2024-04-04 05:29:37 +00:00 |
|
RavmorganButOnCocaine
|
543bbe0c94
|
Automatic changelog update
|
2024-04-03 17:05:12 +00:00 |
|
PJBot
|
35134fcda6
|
Automatic changelog update
|
2024-04-03 13:42:29 +00:00 |
|
PJBot
|
70ec12f4f7
|
Automatic changelog update
|
2024-04-03 05:33:04 +00:00 |
|
PJBot
|
e6a090419c
|
Automatic changelog update
|
2024-04-03 03:17:03 +00:00 |
|
PJBot
|
c5fe41c119
|
Automatic changelog update
|
2024-04-03 02:13:53 +00:00 |
|
RavmorganButOnCocaine
|
5cb81d990c
|
Automatic changelog update
|
2024-04-02 14:20:38 +00:00 |
|
RavmorganButOnCocaine
|
ade61ac06d
|
Automatic changelog update
|
2024-04-02 14:19:10 +00:00 |
|
PJBot
|
bd5031fd9e
|
Automatic changelog update
|
2024-04-02 05:19:43 +00:00 |
|
PJBot
|
c9374969b1
|
Automatic changelog update
|
2024-04-02 05:18:38 +00:00 |
|
PJBot
|
a4d46091e0
|
Automatic changelog update
|
2024-04-02 00:51:49 +00:00 |
|
PJBot
|
144798ba75
|
Automatic changelog update
|
2024-04-01 21:01:16 +00:00 |
|