From 188c5dbcb59991780411f51d8198ac1d706669d7 Mon Sep 17 00:00:00 2001 From: Pieter-Jan Briers Date: Tue, 23 Feb 2021 22:08:43 +0100 Subject: [PATCH] directional -> norot for bullets. Since we re-enable noRot for the time being. --- Resources/Prototypes/Entities/Effects/animations_test.yml | 2 +- Resources/Prototypes/Entities/Effects/weapon_arc.yml | 2 +- .../Weapons/Guns/Ammunition/AntiMaterial/cartridges.yml | 2 +- .../Objects/Weapons/Guns/Ammunition/ClRifle/cartridges.yml | 2 +- .../Objects/Weapons/Guns/Ammunition/LRifle/cartridges.yml | 2 +- .../Objects/Weapons/Guns/Ammunition/Magnum/cartridges.yml | 2 +- .../Objects/Weapons/Guns/Ammunition/Pistol/cartridges.yml | 2 +- .../Objects/Weapons/Guns/Ammunition/SRifle/cartridges.yml | 2 +- .../Objects/Weapons/Guns/Ammunition/Shotgun/cartridges.yml | 2 +- .../Objects/Weapons/Guns/Ammunition/Toy/cartridges.yml | 2 +- .../Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml | 4 ++-- 11 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Resources/Prototypes/Entities/Effects/animations_test.yml b/Resources/Prototypes/Entities/Effects/animations_test.yml index 7eb21b03ff..ae7b67b2d5 100644 --- a/Resources/Prototypes/Entities/Effects/animations_test.yml +++ b/Resources/Prototypes/Entities/Effects/animations_test.yml @@ -4,6 +4,6 @@ # - type: Sprite # texture: Objects/Toolbox_b.png # offset: 2, 0 -# directional: false +# noRot: false # - type: AnimationPlayer # - type: AnimationsTest diff --git a/Resources/Prototypes/Entities/Effects/weapon_arc.yml b/Resources/Prototypes/Entities/Effects/weapon_arc.yml index dfc0ccaf18..0c67751638 100644 --- a/Resources/Prototypes/Entities/Effects/weapon_arc.yml +++ b/Resources/Prototypes/Entities/Effects/weapon_arc.yml @@ -5,7 +5,7 @@ components: - type: Sprite sprite: Effects/arcs.rsi - directional: false + noRot: false offset: 0, -0.85 drawdepth: Overlays - type: MeleeWeaponArcAnimation diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/AntiMaterial/cartridges.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/AntiMaterial/cartridges.yml index 4e744432ed..8afbe0f536 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/AntiMaterial/cartridges.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/AntiMaterial/cartridges.yml @@ -9,7 +9,7 @@ ammoVelocity: 30 - type: Sprite netsync: false - directional: false + noRot: false sprite: Objects/Weapons/Guns/Ammunition/Casings/large_casing.rsi layers: - state: base diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/ClRifle/cartridges.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/ClRifle/cartridges.yml index 51bdc78ec2..b08e0e5d70 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/ClRifle/cartridges.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/ClRifle/cartridges.yml @@ -8,7 +8,7 @@ caliber: ClRifle - type: Sprite netsync: false - directional: false + noRot: false sprite: Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi layers: - state: base diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/LRifle/cartridges.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/LRifle/cartridges.yml index b1f4c0c90a..e80e00d633 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/LRifle/cartridges.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/LRifle/cartridges.yml @@ -8,7 +8,7 @@ caliber: LRifle - type: Sprite netsync: false - directional: false + noRot: false sprite: Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi layers: - state: base diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magnum/cartridges.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magnum/cartridges.yml index 860c5c5963..6b1b95e63f 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magnum/cartridges.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magnum/cartridges.yml @@ -8,7 +8,7 @@ caliber: Magnum - type: Sprite netsync: false - directional: false + noRot: false sprite: Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi layers: - state: base diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Pistol/cartridges.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Pistol/cartridges.yml index a25265204e..86867c4340 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Pistol/cartridges.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Pistol/cartridges.yml @@ -8,7 +8,7 @@ caliber: Pistol - type: Sprite netsync: false - directional: false + noRot: false sprite: Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi layers: - state: base diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SRifle/cartridges.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SRifle/cartridges.yml index 9b80a637cf..31a97675ed 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SRifle/cartridges.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SRifle/cartridges.yml @@ -8,7 +8,7 @@ caliber: SRifle - type: Sprite netsync: false - directional: false + noRot: false sprite: Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi layers: - state: base diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Shotgun/cartridges.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Shotgun/cartridges.yml index dbe23a0384..723416c80c 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Shotgun/cartridges.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Shotgun/cartridges.yml @@ -10,7 +10,7 @@ soundCollectionEject: ShellEject - type: Sprite netsync: false - directional: false + noRot: false sprite: Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi layers: - state: base diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Toy/cartridges.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Toy/cartridges.yml index df4d93be2f..2e6c5cf3b7 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Toy/cartridges.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Toy/cartridges.yml @@ -8,7 +8,7 @@ caliber: Cap - type: Sprite netsync: false - directional: true + noRot: true sprite: Objects/Consumable/Trash/ash.rsi layers: - state: base diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml index c8d7a6e339..e753cf16a9 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -8,7 +8,7 @@ - type: Clickable - type: Sprite netsync: false - directional: false + noRot: false sprite: Objects/Weapons/Guns/Projectiles/bullet.rsi state: bullet - type: Physics @@ -90,7 +90,7 @@ stunAmount: 5 knockdownAmount: 5 - type: Sprite - directional: false + noRot: false sprite: Objects/Weapons/Guns/Projectiles/spark.rsi color: "#ffff33" layers: