From c919f79c4cdf7a901aaccb52c15572570fd1c14d Mon Sep 17 00:00:00 2001 From: corentt <36075110+corentt@users.noreply.github.com> Date: Thu, 29 Sep 2022 18:46:39 +0200 Subject: [PATCH] Fix wallmount Nanomed (#11601) --- .../Structures/Machines/vending_machines.yml | 155 +++++------------- 1 file changed, 44 insertions(+), 111 deletions(-) diff --git a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml index 8e420aeb89..74ae2c65e6 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml @@ -71,6 +71,8 @@ flavorKind: mechanical - type: StaticPrice price: 200 + - type: Appearance + - type: WiresVisuals - type: entity parent: VendingMachine @@ -96,8 +98,6 @@ shader: unshaded - state: panel map: ["enum.WiresVisualLayers.MaintenancePanel"] - - type: Appearance - - type: WiresVisuals - type: entity parent: VendingMachine @@ -125,8 +125,6 @@ shader: unshaded - state: panel map: ["enum.WiresVisualLayers.MaintenancePanel"] - - type: Appearance - - type: WiresVisuals - type: AccessReader access: [["Bar"]] @@ -153,8 +151,6 @@ shader: unshaded - state: panel map: ["enum.WiresVisualLayers.MaintenancePanel"] - - type: Appearance - - type: WiresVisuals - type: PointLight radius: 1 energy: 1.3 @@ -190,8 +186,6 @@ shader: unshaded - state: panel map: ["enum.WiresVisualLayers.MaintenancePanel"] - - type: Appearance - - type: WiresVisuals - type: entity parent: VendingMachine @@ -221,8 +215,6 @@ shader: unshaded - state: panel map: ["enum.WiresVisualLayers.MaintenancePanel"] - - type: Appearance - - type: WiresVisuals - type: PointLight radius: 1.8 energy: 1.6 @@ -262,8 +254,6 @@ shader: unshaded - state: panel map: ["enum.WiresVisualLayers.MaintenancePanel"] - - type: Appearance - - type: WiresVisuals - type: PointLight radius: 1.5 energy: 1.3 @@ -298,8 +288,6 @@ shader: unshaded - state: panel map: ["enum.WiresVisualLayers.MaintenancePanel"] - - type: Appearance - - type: WiresVisuals - type: PointLight radius: 1.5 energy: 1.6 @@ -329,8 +317,6 @@ shader: unshaded - state: panel map: ["enum.WiresVisualLayers.MaintenancePanel"] - - type: Appearance - - type: WiresVisuals - type: AccessReader access: [["Service"]] - type: PointLight @@ -361,8 +347,6 @@ shader: unshaded - state: panel map: ["enum.WiresVisualLayers.MaintenancePanel"] - - type: Appearance - - type: WiresVisuals - type: PointLight radius: 1.5 energy: 1.6 @@ -394,8 +378,6 @@ shader: unshaded - texture: Structures/Machines/VendingMachines/maintenance_panel.png map: ["enum.WiresVisualLayers.MaintenancePanel"] - - type: Appearance - - type: WiresVisuals - type: PointLight radius: 1.5 energy: 1.6 @@ -424,8 +406,6 @@ shader: unshaded - state: panel map: ["enum.WiresVisualLayers.MaintenancePanel"] - - type: Appearance - - type: WiresVisuals - type: AccessReader access: [["Engineering"]] - type: PointLight @@ -459,8 +439,6 @@ shader: unshaded - state: panel map: ["enum.WiresVisualLayers.MaintenancePanel"] - - type: Appearance - - type: WiresVisuals - type: AccessReader access: [["Medical"]] - type: PointLight @@ -493,8 +471,6 @@ shader: unshaded - state: panel map: ["enum.WiresVisualLayers.MaintenancePanel"] - - type: Appearance - - type: WiresVisuals - type: AccessReader access: [["Hydroponics"]] - type: PointLight @@ -527,8 +503,6 @@ shader: unshaded - state: panel map: ["enum.WiresVisualLayers.MaintenancePanel"] - - type: Appearance - - type: WiresVisuals - type: AccessReader access: [["Security"]] - type: PointLight @@ -562,8 +536,6 @@ shader: unshaded - state: panel map: ["enum.WiresVisualLayers.MaintenancePanel"] - - type: Appearance - - type: WiresVisuals - type: PointLight radius: 1.5 energy: 1.6 @@ -607,8 +579,6 @@ shader: unshaded - state: panel map: ["enum.WiresVisualLayers.MaintenancePanel"] - - type: Appearance - - type: WiresVisuals - type: PointLight radius: 1.5 energy: 1.6 @@ -642,8 +612,6 @@ shader: unshaded - state: panel map: ["enum.WiresVisualLayers.MaintenancePanel"] - - type: Appearance - - type: WiresVisuals - type: PointLight radius: 1.5 energy: 1.6 @@ -677,8 +645,6 @@ shader: unshaded - state: panel map: ["enum.WiresVisualLayers.MaintenancePanel"] - - type: Appearance - - type: WiresVisuals - type: PointLight radius: 1.5 energy: 1.6 @@ -714,8 +680,6 @@ - state: "screen" map: ["enum.VendingMachineVisualLayers.Screen"] shader: unshaded - - type: Appearance - - type: WiresVisuals - type: PointLight radius: 1.5 energy: 1.6 @@ -750,40 +714,11 @@ shader: unshaded - state: panel map: ["enum.WiresVisualLayers.MaintenancePanel"] - - type: Appearance - - type: WiresVisuals - type: PointLight radius: 1.5 energy: 1.6 color: "#9dc5c9" -- type: entity - parent: VendingMachine - id: VendingMachineWallMedical - name: NanoMed - description: "It's a wall-mounted medical equipment dispenser. Natural chemicals only!" - components: - - type: VendingMachine - pack: NanoMedInventory - offState: off - brokenState: broken - normalState: normal-unshaded - denyState: deny-unshaded - - type: Sprite - sprite: Structures/Machines/VendingMachines/wallmed.rsi - layers: - - state: "off" - map: ["enum.VendingMachineVisualLayers.Base"] - - state: "off" - map: ["enum.VendingMachineVisualLayers.BaseUnshaded"] - shader: unshaded - - texture: Structures/Machines/VendingMachines/maintenance_panel.png - map: ["enum.WiresVisualLayers.MaintenancePanel"] - - type: Appearance - - type: WiresVisuals - - type: AccessReader - access: [["Medical"]] - - type: entity parent: VendingMachine id: VendingMachineYouTool @@ -807,8 +742,6 @@ shader: unshaded - state: panel map: ["enum.WiresVisualLayers.MaintenancePanel"] - - type: Appearance - - type: WiresVisuals - type: PointLight radius: 1.5 energy: 1.6 @@ -842,8 +775,6 @@ shader: unshaded - state: panel map: ["enum.WiresVisualLayers.MaintenancePanel"] - - type: Appearance - - type: WiresVisuals - type: PointLight radius: 1.5 energy: 1.6 @@ -875,8 +806,6 @@ shader: unshaded - state: panel map: ["enum.WiresVisualLayers.MaintenancePanel"] - - type: Appearance - - type: WiresVisuals - type: PointLight radius: 1.5 energy: 1.6 @@ -904,8 +833,6 @@ shader: unshaded - state: panel map: ["enum.WiresVisualLayers.MaintenancePanel"] - - type: Appearance - - type: WiresVisuals - type: PointLight radius: 1.5 energy: 1.6 @@ -939,13 +866,53 @@ shader: unshaded - state: panel map: ["enum.WiresVisualLayers.MaintenancePanel"] - - type: Appearance - - type: WiresVisuals - type: PointLight radius: 1.5 energy: 1.6 color: "#d4ab33" +# wallmounted machines + +- type: entity + id: VendingMachineWallmount + parent: VendingMachine + name: vending machine + abstract: true + components: + - type: Sprite + drawdepth: WallMountedItems + netsync: false + snapCardinals: false + - type: WallMount + arc: 180 + - type: Transform + noRot: false + +- type: entity + parent: VendingMachineWallmount + id: VendingMachineWallMedical + name: NanoMed + description: "It's a wall-mounted medical equipment dispenser. Natural chemicals only!" + components: + - type: VendingMachine + pack: NanoMedInventory + offState: off + brokenState: broken + normalState: normal-unshaded + denyState: deny-unshaded + - type: Sprite + sprite: Structures/Machines/VendingMachines/wallmed.rsi + layers: + - state: "off" + map: ["enum.VendingMachineVisualLayers.Base"] + - state: "off" + map: ["enum.VendingMachineVisualLayers.BaseUnshaded"] + shader: unshaded + - texture: Structures/Machines/VendingMachines/maintenance_panel.png + map: ["enum.WiresVisualLayers.MaintenancePanel"] + - type: AccessReader + access: [["Medical"]] + # job clothing - type: entity @@ -971,8 +938,6 @@ shader: unshaded - state: panel map: ["enum.WiresVisualLayers.MaintenancePanel"] - - type: Appearance - - type: WiresVisuals - type: AccessReader access: [["Hydroponics"]] @@ -999,8 +964,6 @@ shader: unshaded - state: panel map: ["enum.WiresVisualLayers.MaintenancePanel"] - - type: Appearance - - type: WiresVisuals - type: AccessReader access: [["Brig"]] @@ -1027,8 +990,6 @@ shader: unshaded - state: panel map: ["enum.WiresVisualLayers.MaintenancePanel"] - - type: Appearance - - type: WiresVisuals - type: AccessReader access: [["Security"]] @@ -1055,8 +1016,6 @@ shader: unshaded - state: panel map: ["enum.WiresVisualLayers.MaintenancePanel"] - - type: Appearance - - type: WiresVisuals - type: AccessReader access: [["Bar"]] @@ -1083,8 +1042,6 @@ map: ["enum.WiresVisualLayers.MaintenancePanel"] - type: AccessReader access: [["Chapel"]] - - type: Appearance - - type: WiresVisuals - type: PointLight radius: 1.5 energy: 1.6 @@ -1113,8 +1070,6 @@ shader: unshaded - state: panel map: ["enum.WiresVisualLayers.MaintenancePanel"] - - type: Appearance - - type: WiresVisuals - type: AccessReader access: [["Cargo"]] @@ -1141,8 +1096,6 @@ shader: unshaded - state: panel map: ["enum.WiresVisualLayers.MaintenancePanel"] - - type: Appearance - - type: WiresVisuals - type: AccessReader access: [["Medical"]] @@ -1169,8 +1122,6 @@ shader: unshaded - state: panel map: ["enum.WiresVisualLayers.MaintenancePanel"] - - type: Appearance - - type: WiresVisuals - type: AccessReader access: [["Chemistry"]] @@ -1197,8 +1148,6 @@ shader: unshaded - state: panel map: ["enum.WiresVisualLayers.MaintenancePanel"] - - type: Appearance - - type: WiresVisuals - type: AccessReader access: [["Engineering"]] @@ -1225,8 +1174,6 @@ shader: unshaded - state: panel map: ["enum.WiresVisualLayers.MaintenancePanel"] - - type: Appearance - - type: WiresVisuals - type: AccessReader access: [["Engineering"]] @@ -1253,8 +1200,6 @@ shader: unshaded - state: panel map: ["enum.WiresVisualLayers.MaintenancePanel"] - - type: Appearance - - type: WiresVisuals - type: AccessReader access: [["Kitchen"]] @@ -1281,8 +1226,6 @@ shader: unshaded - state: panel map: ["enum.WiresVisualLayers.MaintenancePanel"] - - type: Appearance - - type: WiresVisuals - type: AccessReader access: [["Security"]] @@ -1309,8 +1252,6 @@ shader: unshaded - state: panel map: ["enum.WiresVisualLayers.MaintenancePanel"] - - type: Appearance - - type: WiresVisuals - type: AccessReader access: [["Janitor"]] @@ -1337,8 +1278,6 @@ shader: unshaded - state: panel map: ["enum.WiresVisualLayers.MaintenancePanel"] - - type: Appearance - - type: WiresVisuals - type: AccessReader access: [["Research"]] @@ -1365,8 +1304,6 @@ shader: unshaded - state: panel map: ["enum.WiresVisualLayers.MaintenancePanel"] - - type: Appearance - - type: WiresVisuals - type: AccessReader access: [["Research"]] @@ -1393,8 +1330,6 @@ shader: unshaded - state: panel map: ["enum.WiresVisualLayers.MaintenancePanel"] - - type: Appearance - - type: WiresVisuals - type: AccessReader access: [["Medical"]] @@ -1421,8 +1356,6 @@ shader: unshaded - state: panel map: ["enum.WiresVisualLayers.MaintenancePanel"] - - type: Appearance - - type: WiresVisuals - type: AccessReader access: [["Medical"]]