Merge remote-tracking branch 'origin/20-06-24-movement-prediction' into 20-06-24-movement-prediction

This commit is contained in:
Pieter-Jan Briers
2020-06-24 17:56:54 +02:00

View File

@@ -41,7 +41,7 @@
description: A rather traditionally made L6 SAW with a pleasantly lacquered wooden pistol grip. This one is unmarked. description: A rather traditionally made L6 SAW with a pleasantly lacquered wooden pistol grip. This one is unmarked.
components: components:
- type: Sprite - type: Sprite
sprite: Objects/Guns/Lmgs/l6.rsi sprite: Objects/Guns/LMGs/l6.rsi
layers: layers:
- state: base - state: base
map: ["enum.RangedBarrelVisualLayers.Base"] map: ["enum.RangedBarrelVisualLayers.Base"]
@@ -76,7 +76,7 @@
description: Kalashnikov's Machinegun, a well preserved and maintained antique weapon of war. description: Kalashnikov's Machinegun, a well preserved and maintained antique weapon of war.
components: components:
- type: Sprite - type: Sprite
sprite: Objects/Guns/Lmgs/pk.rsi sprite: Objects/Guns/LMGs/pk.rsi
layers: layers:
- state: base - state: base
map: ["enum.RangedBarrelVisualLayers.Base"] map: ["enum.RangedBarrelVisualLayers.Base"]