Ed
|
9d6e023bd0
|
Merge remote-tracking branch 'upstream/stable' into ed-311-03-2025-upstream-2
# Conflicts:
# Content.Client/Administration/AdminNameOverlay.cs
# Content.Client/Administration/UI/Bwoink/BwoinkControl.xaml
# Content.Client/Guidebook/Controls/GuideReagentReaction.xaml
# Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs
# Content.Client/SubFloor/SubFloorHideSystem.cs
# Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs
# Content.Server/Antag/AntagSelectionSystem.cs
# Content.Server/Cloning/CloningSystem.cs
# Content.Server/GameTicking/Rules/Components/ParadoxCloneRuleComponent.cs
# Content.Server/GameTicking/Rules/ParadoxCloneRuleSystem.cs
# Content.Server/Roles/ParadoxCloneRoleComponent.cs
# Content.Shared.Database/LogType.cs
# Content.Shared/CCVar/CCVars.Interface.cs
# Content.Shared/Cloning/CloningEvents.cs
# Content.Shared/Cloning/CloningSettingsPrototype.cs
# Content.Shared/Humanoid/NamingSystem.cs
# Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs
# Content.Shared/Light/Components/SunShadowCycleComponent.cs
# Content.Shared/Storage/StorageComponent.cs
# Resources/Changelog/Admin.yml
# Resources/Changelog/Changelog.yml
# Resources/Credits/GitHub.txt
# Resources/Locale/en-US/paradox-clone/role.ftl
# Resources/Maps/bagel.yml
# Resources/Maps/loop.yml
# Resources/Prototypes/Chemistry/mixing_types.yml
# Resources/Prototypes/Datasets/Names/last.yml
# Resources/Prototypes/Entities/Effects/puddle.yml
# Resources/Prototypes/Entities/Mobs/Player/clone.yml
# Resources/Prototypes/Entities/Mobs/Species/base.yml
# Resources/Prototypes/Entities/Objects/Deliveries/deliveries_tables.yml
# Resources/Prototypes/Entities/Objects/Devices/pda.yml
# Resources/Prototypes/Entities/Objects/Tools/handheld_mass_scanner.yml
# Resources/Prototypes/GameRules/events.yml
# Resources/Prototypes/Maps/Pools/default.yml
# Resources/Prototypes/Objectives/paradoxClone.yml
# Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml
# Resources/Textures/Clothing/Eyes/Glasses/jensen.rsi/equipped-EYES-arachnid.png
|
2025-03-31 12:41:37 +03:00 |
|
Link
|
1448d41e10
|
maybe it works (#1018)
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
|
2025-03-18 09:12:00 +03:00 |
|
beck-thompson
|
15a5cebdcd
|
Chameleon vests now act like winter coats (#34929)
First commit
|
2025-03-17 19:39:04 +01:00 |
|
Ed
|
7328f3449c
|
Merge remote-tracking branch 'upstream/master' into ed-16-02-2025-planet-light-upstream
# Conflicts:
# Content.IntegrationTests/Tests/EntityTest.cs
# Content.IntegrationTests/Tests/PostMapInitTest.cs
# Content.Server/Medical/HealthAnalyzerSystem.cs
# Content.Server/Procedural/DungeonSystem.Rooms.cs
# Content.Server/Procedural/RoomFillComponent.cs
# Content.Server/Procedural/RoomFillSystem.cs
# Content.Shared/Inventory/InventorySystem.Relay.cs
# Content.Shared/Projectiles/SharedProjectileSystem.cs
# Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
# Resources/Prototypes/Maps/Pools/default.yml
# Resources/migration.yml
|
2025-02-16 11:58:47 +03:00 |
|
Ed
|
909dc36158
|
Spells content (#897)
* modifiers
* counter spell, and 2 new spell scrolls
* Update magical_acceleration.yml
* Update T0_counter_spell.yml
|
2025-02-14 11:50:57 +03:00 |
|
Zachary Higgs
|
9d48f66a61
|
Create a Armor CoeffientQuery (#35024)
* Create a Armor CoeffientQuery
- add Armor Coefficent Query Event for InventoryRelay system
* CR - cleanup, comments and fix typos
* CR - Remove Whitespace
* typos
* on't
---------
Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
|
2025-02-10 15:51:44 +01:00 |
|
beck-thompson
|
ee922e37f6
|
Replaced some AddMarkups with AddMarkupOrThrow (#30632)
* First commit
* Silly me
* bruh
|
2024-08-11 13:06:33 +10:00 |
|
Chronophylos
|
3f6c517702
|
localize damage type in armor examine description (#21807)
* localize damage type in armor examine description
* format
* change translation
* add missing strings
|
2023-12-04 07:57:29 -05:00 |
|
Nemanja
|
b052e0f242
|
Predicted armor (#20560)
|
2023-09-28 20:48:50 +10:00 |
|