From 64371f46ee5d8d11367a416a96edd18dd85318aa Mon Sep 17 00:00:00 2001 From: Dvir Date: Mon, 16 Oct 2023 02:11:03 +0300 Subject: [PATCH 1/2] Range fixing --- .../Objects/Misc/subdermal_implants.yml | 25 ++++++++++--------- .../Machines/crew_monitor_server.yml | 2 +- .../Machines/wireless_surveillance_camera.yml | 4 +-- .../Objects/Misc/subdermal_implants.yml | 24 +++++++++--------- 4 files changed, 28 insertions(+), 27 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml b/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml index d1ac9003d47..b4a4aa2cec9 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml @@ -77,24 +77,25 @@ parent: BaseSubdermalImplant id: TrackingImplant name: tracking implant - description: This implant has a tracking device attached to the suit sensor network, as well as a condition monitor for the Security radio channel. + description: This implant has a tracking device monitor for the Security radio channel. noSpawn: true components: - type: SubdermalImplant - - type: SuitSensor - randomMode: false - controlsLocked: true - mode: SensorCords - activationContainer: "implant" - - type: DeviceNetwork - deviceNetId: Wireless - transmitFrequencyId: SuitSensor - - type: StationLimitedNetwork - - type: WirelessNetworkConnection - range: 10000 +# - type: SuitSensor +# randomMode: false +# controlsLocked: true +# mode: SensorCords +# activationContainer: "implant" +# - type: DeviceNetwork +# deviceNetId: Wireless +# transmitFrequencyId: SuitSensor +# - type: StationLimitedNetwork +# - type: WirelessNetworkConnection +# range: 500 - type: TriggerOnMobstateChange mobState: - Critical + - Dead - type: Rattle radioChannel: "Security" diff --git a/Resources/Prototypes/Entities/Structures/Machines/crew_monitor_server.yml b/Resources/Prototypes/Entities/Structures/Machines/crew_monitor_server.yml index 637f07bcf6a..403fed9dd88 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/crew_monitor_server.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/crew_monitor_server.yml @@ -28,7 +28,7 @@ receiveFrequencyId: SuitSensor autoConnect: false - type: WirelessNetworkConnection - range: 10000 + range: 500 - type: StationLimitedNetwork - type: ApcPowerReceiver powerLoad: 200 diff --git a/Resources/Prototypes/Entities/Structures/Machines/wireless_surveillance_camera.yml b/Resources/Prototypes/Entities/Structures/Machines/wireless_surveillance_camera.yml index 5f06591d791..26f18f26275 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/wireless_surveillance_camera.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/wireless_surveillance_camera.yml @@ -7,8 +7,8 @@ components: - type: InteractionOutline - type: Eye - - type: WirelessNetworkConnection - range: 10000 +# - type: WirelessNetworkConnection +# range: 200 - type: Damageable damageContainer: Inorganic damageModifierSet: Metallic diff --git a/Resources/Prototypes/_NF/Entities/Objects/Misc/subdermal_implants.yml b/Resources/Prototypes/_NF/Entities/Objects/Misc/subdermal_implants.yml index ed024b64248..7f7b7237e29 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Misc/subdermal_implants.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Misc/subdermal_implants.yml @@ -4,21 +4,21 @@ parent: BaseSubdermalImplant id: MedicalTrackingImplant name: medical insurance tracking implant - description: This implant has a tracking device attached to the suit sensor network, as well as a condition monitor for the Medical radio channel. + description: This implant has a tracking device monitor for the Medical radio channel. noSpawn: true components: - type: SubdermalImplant - - type: SuitSensor - randomMode: false - controlsLocked: true - mode: SensorCords - activationContainer: "implant" - - type: DeviceNetwork - deviceNetId: Wireless - transmitFrequencyId: SuitSensor - - type: StationLimitedNetwork - - type: WirelessNetworkConnection - range: 10000 +# - type: SuitSensor +# randomMode: false +# controlsLocked: true +# mode: SensorCords +# activationContainer: "implant" +# - type: DeviceNetwork +# deviceNetId: Wireless +# transmitFrequencyId: SuitSensor +# - type: StationLimitedNetwork +# - type: WirelessNetworkConnection +# range: 500 - type: TriggerOnMobstateChange mobState: - Critical From ad9305771a861a92da46009e7706141b87e61838 Mon Sep 17 00:00:00 2001 From: Dvir Date: Mon, 16 Oct 2023 02:53:52 +0300 Subject: [PATCH 2/2] Range Tests --- .../Clothing/Uniforms/base_clothinguniforms.yml | 6 +++--- .../Prototypes/Entities/Objects/Devices/pda.yml | 4 ++-- .../Structures/Machines/Computers/computers.yml | 12 ++++++------ .../Structures/Machines/crew_monitor_server.yml | 6 +++--- .../Machines/surveillance_camera_routers.yml | 4 ++-- .../Structures/Wallmounts/monitors_televisions.yml | 4 ++-- .../Prototypes/Entities/Structures/cargo_telepad.yml | 4 ++-- 7 files changed, 20 insertions(+), 20 deletions(-) diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml index 0329f82b5b1..19807d035a0 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml @@ -47,9 +47,9 @@ - type: DeviceNetwork deviceNetId: Wireless transmitFrequencyId: SuitSensor - - type: WirelessNetworkConnection - range: 1200 - - type: StationLimitedNetwork +# - type: WirelessNetworkConnection +# range: 1200 +# - type: StationLimitedNetwork - type: entity abstract: true diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml index c96ba2c0dc7..a33ce283f37 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml @@ -61,8 +61,8 @@ deviceNetId: Wireless receiveFrequencyId: PDA prefix: device-address-prefix-console - - type: WirelessNetworkConnection - range: 500 +# - type: WirelessNetworkConnection +# range: 500 - type: CartridgeLoader uiKey: enum.PdaUiKey.Key preinstalled: diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml index 7c28fda5029..4bbd953f601 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml @@ -353,8 +353,8 @@ - type: DeviceNetwork deviceNetId: Wireless receiveFrequencyId: CrewMonitor - - type: WirelessNetworkConnection - range: 1200 +# - type: WirelessNetworkConnection +# range: 1200 - type: entity parent: BaseComputer @@ -738,8 +738,8 @@ - type: DeviceNetwork deviceNetId: Wireless receiveFrequencyId: BasicDevice - - type: WirelessNetworkConnection - range: 200 +# - type: WirelessNetworkConnection +# range: 200 - type: DeviceLinkSource range: 200 ports: @@ -936,8 +936,8 @@ deviceNetId: Wireless receiveFrequencyId: SurveillanceCamera transmitFrequencyId: SurveillanceCamera - - type: WirelessNetworkConnection - range: 200 +# - type: WirelessNetworkConnection +# range: 200 - type: DeviceNetworkRequiresPower - type: Speech speechVerb: Robotic diff --git a/Resources/Prototypes/Entities/Structures/Machines/crew_monitor_server.yml b/Resources/Prototypes/Entities/Structures/Machines/crew_monitor_server.yml index 403fed9dd88..e275b6fa92e 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/crew_monitor_server.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/crew_monitor_server.yml @@ -27,9 +27,9 @@ transmitFrequencyId: CrewMonitor receiveFrequencyId: SuitSensor autoConnect: false - - type: WirelessNetworkConnection - range: 500 - - type: StationLimitedNetwork +# - type: WirelessNetworkConnection +# range: 500 +# - type: StationLimitedNetwork - type: ApcPowerReceiver powerLoad: 200 priority: Low diff --git a/Resources/Prototypes/Entities/Structures/Machines/surveillance_camera_routers.yml b/Resources/Prototypes/Entities/Structures/Machines/surveillance_camera_routers.yml index 1eeaec9b7c6..d5c4ba30688 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/surveillance_camera_routers.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/surveillance_camera_routers.yml @@ -113,8 +113,8 @@ deviceNetId: Wireless receiveFrequencyId: SurveillanceCamera transmitFrequencyId: SurveillanceCamera - - type: WirelessNetworkConnection - range: 200 +# - type: WirelessNetworkConnection +# range: 200 - type: DeviceNetworkRequiresPower - type: UserInterface interfaces: diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/monitors_televisions.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/monitors_televisions.yml index 5b8e4a32f42..f8ad48df4c1 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/monitors_televisions.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/monitors_televisions.yml @@ -157,8 +157,8 @@ deviceNetId: Wireless receiveFrequencyId: SurveillanceCamera transmitFrequencyId: SurveillanceCamera - - type: WirelessNetworkConnection - range: 200 +# - type: WirelessNetworkConnection +# range: 200 - type: DeviceNetworkRequiresPower - type: Speech - type: SurveillanceCameraSpeaker diff --git a/Resources/Prototypes/Entities/Structures/cargo_telepad.yml b/Resources/Prototypes/Entities/Structures/cargo_telepad.yml index 819b9b155d0..78fbf2feb62 100644 --- a/Resources/Prototypes/Entities/Structures/cargo_telepad.yml +++ b/Resources/Prototypes/Entities/Structures/cargo_telepad.yml @@ -35,8 +35,8 @@ - type: DeviceNetwork deviceNetId: Wireless receiveFrequencyId: BasicDevice - - type: WirelessNetworkConnection - range: 200 +# - type: WirelessNetworkConnection +# range: 200 - type: DeviceLinkSink ports: - OrderReceiver