diff --git a/Content.Server/_DV/CosmicCult/CosmicCultSystem.Finale.cs b/Content.Server/_DV/CosmicCult/CosmicCultSystem.Finale.cs index bb6ae0ad07..a8e689b910 100644 --- a/Content.Server/_DV/CosmicCult/CosmicCultSystem.Finale.cs +++ b/Content.Server/_DV/CosmicCult/CosmicCultSystem.Finale.cs @@ -104,7 +104,7 @@ public sealed partial class CosmicCultSystem : SharedCosmicCultSystem Dirty(uid, monument); _ui.SetUiState(uid.Owner, MonumentKey.Key, new MonumentBuiState(monument)); - if (!_evac.EmergencyShuttleArrived && _roundEnd.IsRoundEndRequested()) _roundEnd.CancelRoundEndCountdown(checkCooldown: false); + if (!_evac.EmergencyShuttleArrived && _roundEnd.IsRoundEndRequested()) _roundEnd.CancelRoundEndCountdown(forceRecall: false); var query = EntityQueryEnumerator(); while (query.MoveNext(out var cultist, out var cultComp)) { diff --git a/Resources/Locale/en-US/_DV/storage/components/magnet-pickup-components.ftl b/Resources/Locale/en-US/_DV/storage/components/magnet-pickup-components.ftl new file mode 100644 index 0000000000..48da2e4ffc --- /dev/null +++ b/Resources/Locale/en-US/_DV/storage/components/magnet-pickup-components.ftl @@ -0,0 +1,2 @@ +magnet-pickup-component-magnet-xenoborg-on = The magnet appears to be [color=darkgreen]on[/color]. +magnet-pickup-component-magnet-xenoborg-off = The magnet appears to be [color=darkred]off[/color]. diff --git a/Resources/Prototypes/Entities/Clothing/Back/specific.yml b/Resources/Prototypes/Entities/Clothing/Back/specific.yml index c440fe9a66..08bdc35d7f 100644 --- a/Resources/Prototypes/Entities/Clothing/Back/specific.yml +++ b/Resources/Prototypes/Entities/Clothing/Back/specific.yml @@ -133,6 +133,16 @@ sprite: Objects/Specific/Robotics/silicon_storage_cube.rsi state: xenoborg - type: MagnetPickup + - type: ItemToggle # DeltaV - Allow Toggle + onUse: false + soundActivate: &soundActivate + collection: sparks + params: + variation: 0.25 + soundDeactivate: *soundActivate + - type: ItemToggleExamine # DeltaV - Allow Toggle + on: magnet-pickup-component-magnet-xenoborg-on + off: magnet-pickup-component-magnet-xenoborg-off - type: Dumpable - type: Storage grid: diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml index c562fb3270..4272c9d30a 100644 --- a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml +++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml @@ -582,13 +582,8 @@ - Robotics - Xenoborgs - type: Access - enabled: false # DeltaV - comment to prevent upstream removing, borg id chips tags: - Xenoborg - - type: ContainerFill # DeltaV - borg id chips - containers: - borg_id_chip: - - IdChipXenoborg - type: AccessReader access: [["Xenoborg"]] - type: ShowJobIcons # not sure if it is needed diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/xenoborgs.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/xenoborgs.yml index 0f967c679f..45a9d99f40 100644 --- a/Resources/Prototypes/Entities/Mobs/Cyborgs/xenoborgs.yml +++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/xenoborgs.yml @@ -35,8 +35,6 @@ containers: borg_brain: - MMIFilled - borg_id_chip: # DeltaV - - IdChipXenoborg borg_module: - XenoborgModuleBasic - BorgModuleAdvancedTool @@ -49,6 +47,7 @@ - type: ShowHealthBars damageContainers: - Inorganic + - HumanoidSilicon # DeltaV - IPC - Silicon - type: ItemSlots slots: @@ -196,8 +195,6 @@ containers: borg_brain: - MMIFilled - borg_id_chip: # DeltaV - - IdChipXenoborg borg_module: - XenoborgModuleBasic - XenoborgModuleTool @@ -251,8 +248,6 @@ containers: borg_brain: - MMIFilled - borg_id_chip: # DeltaV - - IdChipXenoborg borg_module: - XenoborgModuleBasic - XenoborgModuleTool @@ -276,8 +271,6 @@ containers: borg_brain: - MMI - borg_id_chip: # DeltaV - - IdChipXenoborg borg_module: - XenoborgModuleBasic - BorgModuleAdvancedTool diff --git a/Resources/Prototypes/Entities/Mobs/Player/mothershipcore.yml b/Resources/Prototypes/Entities/Mobs/Player/mothershipcore.yml index c66caff638..4d8f2ae891 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/mothershipcore.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/mothershipcore.yml @@ -172,6 +172,20 @@ showInHands: false disableExplosionRecursion: true canBeStripped: false + hands: # Needed because shitmed + hand_right: + location: Right + blacklist: + components: + - ChameleonProjector + hand_left: + location: Left + blacklist: + components: + - ChameleonProjector + sortedHands: # Needed because shitmed + - hand_right + - hand_left - type: BorgChassis canOpenSelfUi: true maxModules: 2 @@ -236,6 +250,9 @@ - type: ShowElectrocutionHUD - type: PowerMonitoringCableNetworks - type: RadarConsole + - type: MaterialStorageMagnetPickup # DeltaV - Allow the core to suck up materials + magnetEnabled: true + range: 1 - type: entity parent: BaseAGhostAction