diff --git a/Resources/Audio/Guns/Gunshots/rpgfire.ogg b/Resources/Audio/Guns/Gunshots/rpgfire.ogg new file mode 100644 index 0000000000..516618fe91 Binary files /dev/null and b/Resources/Audio/Guns/Gunshots/rpgfire.ogg differ diff --git a/Resources/Prototypes/Entities/Weapons/Launchers/launchers.yml b/Resources/Prototypes/Entities/Weapons/Launchers/launchers.yml index 19fa48c80a..a7544c1923 100644 --- a/Resources/Prototypes/Entities/Weapons/Launchers/launchers.yml +++ b/Resources/Prototypes/Entities/Weapons/Launchers/launchers.yml @@ -73,7 +73,7 @@ fireRate: 0.5 capacity: 1 soundEmpty: /Audio/Guns/Empty/empty.ogg - soundGunshot: /Audio/Guns/Gunshots/bang.ogg + soundGunshot: /Audio/Guns/Gunshots/rpgfire.ogg soundInsert: /Audio/Guns/MagIn/batrifle_magin.ogg - type: Appearance visuals: diff --git a/Resources/Prototypes/Entities/Weapons/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Weapons/Projectiles/projectiles.yml index 5fff01fdec..0e89d4e0ad 100644 --- a/Resources/Prototypes/Entities/Weapons/Projectiles/projectiles.yml +++ b/Resources/Prototypes/Entities/Weapons/Projectiles/projectiles.yml @@ -18,7 +18,7 @@ hard: false shapes: - !type:PhysShapeAabb - bounds: "-0.2,-0.2,0.2,0.2" + bounds: "-0.1,-0.1,0.1,0.1" layer: [Clickable] mask: - Impassable @@ -130,10 +130,14 @@ - type: Projectile deleteOnCollide: false - type: Explosive - devastationRange: 3 - heavyImpactRange: 5 - lightImpactRange: 7 + devastationRange: 1 + heavyImpactRange: 2 + lightImpactRange: 4 flashRange: 10 + - type: PointLight + radius: 3.5 + color: orange + energy: 0.5 - type: entity id: BulletGrenadeBaton diff --git a/Resources/Textures/Objects/Guns/Launchers/rocket.rsi/mag-1.png b/Resources/Textures/Objects/Guns/Launchers/rocket.rsi/mag-1.png new file mode 100644 index 0000000000..7ef2a79205 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Launchers/rocket.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Guns/Launchers/rocket.rsi/meta.json b/Resources/Textures/Objects/Guns/Launchers/rocket.rsi/meta.json index cbc9bce33c..69eaa07a35 100644 --- a/Resources/Textures/Objects/Guns/Launchers/rocket.rsi/meta.json +++ b/Resources/Textures/Objects/Guns/Launchers/rocket.rsi/meta.json @@ -19,6 +19,14 @@ "name": "mag-0", "directions": 1 }, + { + "name": "rocket0-inhand-left", + "directions": 4 + }, + { + "name": "rocket0-inhand-right", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 @@ -28,4 +36,4 @@ "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Objects/Guns/Launchers/rocket.rsi/rocket0-inhand-left.png b/Resources/Textures/Objects/Guns/Launchers/rocket.rsi/rocket0-inhand-left.png new file mode 100644 index 0000000000..aa36fdfe14 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Launchers/rocket.rsi/rocket0-inhand-left.png differ diff --git a/Resources/Textures/Objects/Guns/Launchers/rocket.rsi/rocket0-inhand-right.png b/Resources/Textures/Objects/Guns/Launchers/rocket.rsi/rocket0-inhand-right.png new file mode 100644 index 0000000000..c988a13565 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Launchers/rocket.rsi/rocket0-inhand-right.png differ diff --git a/Resources/Textures/Objects/Guns/Projectiles/rocket.rsi/frag.png b/Resources/Textures/Objects/Guns/Projectiles/rocket.rsi/frag.png index 504580ce49..93251cdc2f 100644 Binary files a/Resources/Textures/Objects/Guns/Projectiles/rocket.rsi/frag.png and b/Resources/Textures/Objects/Guns/Projectiles/rocket.rsi/frag.png differ diff --git a/Resources/Textures/Objects/Guns/Projectiles/rocket.rsi/meta.json b/Resources/Textures/Objects/Guns/Projectiles/rocket.rsi/meta.json index 310a348520..cb29fe71ba 100644 --- a/Resources/Textures/Objects/Guns/Projectiles/rocket.rsi/meta.json +++ b/Resources/Textures/Objects/Guns/Projectiles/rocket.rsi/meta.json @@ -10,6 +10,10 @@ { "name": "frag", "directions": 1 + }, + { + "name": "smallfrag", + "directions": 1 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Objects/Guns/Projectiles/rocket.rsi/smallfrag.png b/Resources/Textures/Objects/Guns/Projectiles/rocket.rsi/smallfrag.png new file mode 100644 index 0000000000..504580ce49 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Projectiles/rocket.rsi/smallfrag.png differ