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
This commit is contained in:
@@ -44,6 +44,8 @@
|
||||
- Trash
|
||||
- BorgArm
|
||||
- BorgLArm
|
||||
- type: Item
|
||||
heldPrefix: borg-arm
|
||||
|
||||
- type: entity
|
||||
id: RightArmBorg
|
||||
@@ -62,6 +64,8 @@
|
||||
- Trash
|
||||
- BorgArm
|
||||
- BorgRArm
|
||||
- type: Item
|
||||
heldPrefix: borg-arm
|
||||
|
||||
- type: entity
|
||||
id: LeftLegBorg
|
||||
@@ -80,6 +84,8 @@
|
||||
- Trash
|
||||
- BorgLeg
|
||||
- BorgLLeg
|
||||
- type: Item
|
||||
heldPrefix: borg-leg
|
||||
|
||||
- type: entity
|
||||
id: RightLegBorg
|
||||
@@ -98,6 +104,8 @@
|
||||
- Trash
|
||||
- BorgLeg
|
||||
- BorgRLeg
|
||||
- type: Item
|
||||
heldPrefix: borg-leg
|
||||
|
||||
- type: entity
|
||||
id: LightHeadBorg
|
||||
@@ -114,6 +122,8 @@
|
||||
tags:
|
||||
- Trash
|
||||
- BorgHead
|
||||
- type: Item
|
||||
heldPrefix: borg-head
|
||||
|
||||
- type: entity
|
||||
id: TorsoBorg
|
||||
@@ -130,3 +140,5 @@
|
||||
tags:
|
||||
- Trash
|
||||
- BorgTorso
|
||||
- type: Item
|
||||
heldPrefix: borg-chest
|
||||
|
||||
Reference in New Issue
Block a user