NR
|
4e66cc69fa
|
перенос
|
2025-03-21 02:20:37 +05: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 |
|
Aviu00
|
b5cede485d
|
- tweak: Nerf blight. (#263)
* - tweak: Nerf blight.
* - tweak: ... But bible no longer works.
|
2024-04-02 17:18:05 +03:00 |
|
Nemanja
|
d576f5cbbb
|
dynamic alert sprites (#25452)
* dynamic alert sprite
* fix fat cooldowns
|
2024-03-28 17:32:56 +11:00 |
|
deltanedas
|
ab645fb77b
|
revenant emag whitelist (#21849)
* add MalfunctionWhitelist
* whitelist a few things
* locutus of borg
* support blacklist
---------
Co-authored-by: deltanedas <@deltanedas:kde.org>
|
2023-11-27 14:39:29 -07:00 |
|
Leon Friedrich
|
684b334806
|
Action container rejig (#20260)
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
|
2023-09-23 18:49:39 +10:00 |
|
DrSmugleaf
|
a88e747a0b
|
Refactor serialization copying to use source generators (#19412)
|
2023-08-22 18:14:33 -07:00 |
|
metalgearsloth
|
68480af109
|
Update content vectors to numerics (#17759)
|
2023-07-08 14:08:32 +10:00 |
|
Chief-Engineer
|
485a2fd432
|
Add GHOST GANG! (#13734)
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
|
2023-05-28 19:21:06 +10:00 |
|
metalgearsloth
|
0e81cb4319
|
Remove diseases (#15684)
|
2023-05-07 17:50:37 +10:00 |
|
keronshb
|
9ebb452a3c
|
DoAfter Refactor (#13225)
Co-authored-by: DrSmugleaf <drsmugleaf@gmail.com>
|
2023-02-25 01:01:25 +01:00 |
|
DrSmugleaf
|
7fbc2608e8
|
Remove redundant read-only VV from datafields (#12626)
|
2022-11-16 20:22:11 +01:00 |
|
Nemanja
|
3c3ee60dd2
|
Revenant 2: Electric Boogaloo (#11510)
* revenant 2: electric boogaloo
* revevent
* oversights
* Update RevenantSystem.Abilities.cs
* names
* no shoote stouhg walls
|
2022-09-28 21:30:48 -05:00 |
|