From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Wed, 31 Jan 2024 11:23:49 +0000 (+1100) Subject: Remove handheld crew monitor (#24761) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=bbc6d29d21df618f7aaf51550da5d71d2e31da04;p=space-station-14.git Remove handheld crew monitor (#24761) * Remove handheld crew monitor - It's supposed to be a CMO computer. - It's getting powercrept and added everywhere. * These too * And this --- diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml b/Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml index c08d82bd28..41fe404dc4 100644 --- a/Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml +++ b/Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml @@ -40,8 +40,6 @@ components: - type: StorageFill contents: - - id: SyndiCrewMonitorEmpty - amount: 1 - id: PowerCellHigh amount: 1 - id: ClothingEyesGlassesHiddenSecurity diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml index 2d15ca826c..095698dea5 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml @@ -163,7 +163,6 @@ - id: ClothingHeadHatBeretCmo - id: ClothingOuterHardsuitMedical - id: Hypospray - - id: HandheldCrewMonitor - id: DoorRemoteMedical - id: RubberStampCMO - id: MedicalTechFabCircuitboard @@ -183,7 +182,6 @@ - id: ClothingBackpackDuffelSurgeryFilled - id: ClothingMaskSterile - id: Hypospray - - id: HandheldCrewMonitor - id: DoorRemoteMedical - id: RubberStampCMO - id: MedicalTechFabCircuitboard diff --git a/Resources/Prototypes/Catalog/thief_toolbox_sets.yml b/Resources/Prototypes/Catalog/thief_toolbox_sets.yml index 2c98b0b89d..d0fbd277c8 100644 --- a/Resources/Prototypes/Catalog/thief_toolbox_sets.yml +++ b/Resources/Prototypes/Catalog/thief_toolbox_sets.yml @@ -2,7 +2,7 @@ id: ChameleonSet name: thief-backpack-category-chameleon-name description: thief-backpack-category-chameleon-description - sprite: + sprite: sprite: /Textures/Clothing/OuterClothing/Misc/black_hoodie.rsi state: icon content: @@ -19,7 +19,7 @@ id: ToolsSet name: thief-backpack-category-tools-name description: thief-backpack-category-tools-description - sprite: + sprite: sprite: Objects/Tools/jaws_of_life.rsi state: jaws_pry content: @@ -66,7 +66,7 @@ id: SleeperSet name: thief-backpack-category-sleeper-name description: thief-backpack-category-sleeper-description - sprite: + sprite: sprite: Objects/Tanks/anesthetic.rsi state: icon content: @@ -83,22 +83,21 @@ id: CommunicatorSet name: thief-backpack-category-communicator-name description: thief-backpack-category-communicator-description - sprite: + sprite: sprite: Objects/Tools/spy_device.rsi state: icon content: - EncryptionKeyStationMaster - CyberPen - - SpyCrewMonitor - BriefcaseThiefBribingBundleFilled - ClothingMaskGasVoiceChameleon #- todo Chameleon Stamp - + - type: thiefBackpackSet id: SmugglerSet name: thief-backpack-category-smuggler-name description: thief-backpack-category-smuggler-description - sprite: + sprite: sprite: Clothing/Neck/Cloaks/void.rsi state: icon content: diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/handheld_crew_monitor.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/handheld_crew_monitor.yml deleted file mode 100644 index 486e8b0d8f..0000000000 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/handheld_crew_monitor.yml +++ /dev/null @@ -1,92 +0,0 @@ -- type: entity - name: handheld crew monitor - parent: - - BaseItem - - PowerCellSlotSmallItem - id: HandheldCrewMonitor - description: A hand-held crew monitor displaying the status of suit sensors. - components: - - type: Sprite - sprite: Objects/Specific/Medical/handheldcrewmonitor.rsi - state: scanner - - type: PowerCellDraw - drawRate: 0 - useRate: 20 - - type: ActivatableUIRequiresPowerCell - - type: ActivatableUI - key: enum.CrewMonitoringUIKey.Key - closeOnHandDeselect: false - - type: UserInterface - interfaces: - - key: enum.CrewMonitoringUIKey.Key - type: CrewMonitoringBoundUserInterface - - type: CrewMonitoringConsole - - type: DeviceNetwork - deviceNetId: Wireless - receiveFrequencyId: CrewMonitor - - type: WirelessNetworkConnection - range: 500 - - type: StationLimitedNetwork - - type: StaticPrice - price: 500 - -- type: entity - id: HandheldCrewMonitorEmpty - parent: HandheldCrewMonitor - suffix: Empty - components: - - type: ItemSlots - slots: - cell_slot: - name: power-cell-slot-component-slot-name-default - -- type: entity - id: SpyCrewMonitor - name: spy monitor - description: A spy device capable of connecting to crew monitoring servers. - parent: HandheldCrewMonitor - components: - - type: Sprite - sprite: Objects/Tools/spy_device.rsi - state: icon - - type: Item - sprite: Objects/Tools/spy_device.rsi - - type: PowerCellDraw - useRate: 10 - - type: StaticPrice - price: 750 - -- type: entity - id: SpyCrewMonitorEmpty - parent: SpyCrewMonitor - suffix: Empty - components: - - type: ItemSlots - slots: - cell_slot: - name: power-cell-slot-component-slot-name-default - -- type: entity - id: SyndiCrewMonitor - name: syndicate crew monitor - description: The syndicated version of crew monitor, intercepts information from the server. - parent: HandheldCrewMonitor - components: - - type: Sprite - sprite: Objects/Specific/Medical/syndihandheldcrewmonitor.rsi - state: syndiscanner - - type: Item - sprite: Objects/Specific/Medical/syndihandheldcrewmonitor.rsi - - type: PowerCellDraw - useRate: 40 - -- type: entity - id: SyndiCrewMonitorEmpty - parent: SyndiCrewMonitor - suffix: Empty - components: - - type: ItemSlots - slots: - cell_slot: - name: power-cell-slot-component-slot-name-default - \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index c920d86701..e48d34e19c 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -259,7 +259,6 @@ - AnomalyScanner - AnomalyLocator - AnomalyLocatorWide - - HandheldCrewMonitor - Scalpel - Retractor - Cautery @@ -826,7 +825,6 @@ - MedkitRadiation - MedkitCombat dynamicRecipes: - - HandheldCrewMonitor - ClothingHandsGlovesNitrile - CryostasisBeaker - LargeBeaker diff --git a/Resources/Prototypes/Recipes/Lathes/medical.yml b/Resources/Prototypes/Recipes/Lathes/medical.yml index 51cdf83050..2a3b738782 100644 --- a/Resources/Prototypes/Recipes/Lathes/medical.yml +++ b/Resources/Prototypes/Recipes/Lathes/medical.yml @@ -77,16 +77,6 @@ materials: Cloth: 200 -- type: latheRecipe - id: HandheldCrewMonitor - result: HandheldCrewMonitorEmpty - category: Tools - completetime: 2 - materials: - Glass: 1200 - Steel: 1000 - Plastic: 1400 - - type: latheRecipe id: HandheldHealthAnalyzer result: HandheldHealthAnalyzerEmpty diff --git a/Resources/Prototypes/Research/biochemical.yml b/Resources/Prototypes/Research/biochemical.yml index 14ae362d5e..78deef6abc 100644 --- a/Resources/Prototypes/Research/biochemical.yml +++ b/Resources/Prototypes/Research/biochemical.yml @@ -119,18 +119,6 @@ technologyPrerequisites: - Chemistry -- type: technology - id: CrewMonitoring - name: research-technology-crew-monitoring - icon: - sprite: Objects/Specific/Medical/handheldcrewmonitor.rsi - state: scanner - discipline: Biochemical - tier: 2 - cost: 10000 - recipeUnlocks: - - HandheldCrewMonitor - # Tier 3 - type: technology diff --git a/Resources/Textures/Objects/Specific/Medical/handheldcrewmonitor.rsi/icon.png b/Resources/Textures/Objects/Specific/Medical/handheldcrewmonitor.rsi/icon.png deleted file mode 100644 index 4593188502..0000000000 Binary files a/Resources/Textures/Objects/Specific/Medical/handheldcrewmonitor.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Specific/Medical/handheldcrewmonitor.rsi/meta.json b/Resources/Textures/Objects/Specific/Medical/handheldcrewmonitor.rsi/meta.json deleted file mode 100644 index 93459edf34..0000000000 --- a/Resources/Textures/Objects/Specific/Medical/handheldcrewmonitor.rsi/meta.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation https://github.com/tgstation/tgstation/commit/ab4abf318f293a701754656dd4e9261eb70f8824#diff-9ab5c8a5e47ab7cfaeadd859a23e32b05de1fe839e99ea767fd7e340b6385d67", - "states": [ - { - "name": "scanner", - "directions": 1, - "delays": [ - [ - 0.4, - 0.4 - ] - ] - }, - { - "name": "icon", - "directions": 1 - } - ] -} diff --git a/Resources/Textures/Objects/Specific/Medical/handheldcrewmonitor.rsi/scanner.png b/Resources/Textures/Objects/Specific/Medical/handheldcrewmonitor.rsi/scanner.png deleted file mode 100644 index 2f97a86aba..0000000000 Binary files a/Resources/Textures/Objects/Specific/Medical/handheldcrewmonitor.rsi/scanner.png and /dev/null differ diff --git a/Resources/Textures/Objects/Specific/Medical/syndihandheldcrewmonitor.rsi/meta.json b/Resources/Textures/Objects/Specific/Medical/syndihandheldcrewmonitor.rsi/meta.json deleted file mode 100644 index 8a4d587e3a..0000000000 --- a/Resources/Textures/Objects/Specific/Medical/syndihandheldcrewmonitor.rsi/meta.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation https://github.com/tgstation/tgstation/commit/ab4abf318f293a701754656dd4e9261eb70f8824#diff-9ab5c8a5e47ab7cfaeadd859a23e32b05de1fe839e99ea767fd7e340b6385d67,this sprite made(resprite) by Fazansen(https://github.com/Fazansen)", - "states": [ - { - "name": "syndiscanner", - "directions": 1, - "delays": [ - [ - 0.4, - 0.4 - ] - ] - } - ] -} diff --git a/Resources/Textures/Objects/Specific/Medical/syndihandheldcrewmonitor.rsi/syndiscanner.png b/Resources/Textures/Objects/Specific/Medical/syndihandheldcrewmonitor.rsi/syndiscanner.png deleted file mode 100644 index 9fa8cba94f..0000000000 Binary files a/Resources/Textures/Objects/Specific/Medical/syndihandheldcrewmonitor.rsi/syndiscanner.png and /dev/null differ diff --git a/Resources/migration.yml b/Resources/migration.yml index b295e37b65..6b3161c9ad 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -170,3 +170,11 @@ DefaultStationBeaconTeslaEngine: null ClothingBackpackSecurityFilledDetective: ClothingBackpackFilledDetective ClothingBackpackDuffelSecurityFilledDetective: ClothingBackpackDuffelFilledDetective ClothingBackpackSatchelSecurityFilledDetective: ClothingBackpackSatchelFilledDetective + +# 2024-01-31 +HandheldCrewMonitorEmpty: null +HandheldCrewMonitor: null +SpyCrewMonitor: null +SpyCrewMonitorEmpty: null +SyndiCrewMonitor: null +SyndiCrewMonitorEmpty: null \ No newline at end of file