diff --git a/Resources/Prototypes/_Starlight/Entities/Objects/Specific/Mechs/Weapons/Gun/Ammunition.yml b/Resources/Prototypes/_Starlight/Entities/Objects/Specific/Mechs/Weapons/Gun/Ammunition.yml index 989eba9fbb..8cc8b90791 100644 --- a/Resources/Prototypes/_Starlight/Entities/Objects/Specific/Mechs/Weapons/Gun/Ammunition.yml +++ b/Resources/Prototypes/_Starlight/Entities/Objects/Specific/Mechs/Weapons/Gun/Ammunition.yml @@ -1,19 +1,25 @@ - type: entity id: MechCartridge abstract: true + +- type: entity + id: ShellShotgunMechIncendiary + parent: [ShellShotgunIncendiary, MechCartridge] components: - type: CartridgeAmmo deleteOnSpawn: true -- type: entity - id: ShellShotgunMechIncendiary - parent: [ShellShotgunIncendiary, MechCartridge] - - type: entity id: ShellShotgunMech parent: [ShellShotgun, MechCartridge] + components: + - type: HitScanCartridgeAmmo + deleteOnSpawn: true - type: entity id: CartridgeHeavyRifleRFMJMech parent: [CartridgeHeavyRifleRFMJ, MechCartridge] + components: + - type: HitScanCartridgeAmmo + deleteOnSpawn: true diff --git a/Resources/Textures/Structures/Machines/VendingMachines/wallmed.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/wallmed.rsi/meta.json index 52f8ffb982..c66507fb78 100644 --- a/Resources/Textures/Structures/Machines/VendingMachines/wallmed.rsi/meta.json +++ b/Resources/Textures/Structures/Machines/VendingMachines/wallmed.rsi/meta.json @@ -17,8 +17,8 @@ "name": "deny-unshaded", "delays": [ [ - 0.1, - 0.1 + 0.4, + 0.4 ] ] }, @@ -26,8 +26,8 @@ "name": "normal-unshaded", "delays": [ [ - 0.1, - 0.1 + 0.4, + 0.4 ] ] }, diff --git a/Resources/Textures/Structures/Machines/VendingMachines/wallmed.rsi/off-civilian.png b/Resources/Textures/Structures/Machines/VendingMachines/wallmed.rsi/off-civilian.png index 22c86d0823..24f04ee98b 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/wallmed.rsi/off-civilian.png and b/Resources/Textures/Structures/Machines/VendingMachines/wallmed.rsi/off-civilian.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/wallmed.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/wallmed.rsi/panel.png index 851c8b7893..ce4567893e 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/wallmed.rsi/panel.png and b/Resources/Textures/Structures/Machines/VendingMachines/wallmed.rsi/panel.png differ